commit c6a57170064e6cb4312701383c848bb13ec3ba2a
author David 'Digit' Turner <digit@android.com> Wed Oct 17 10:46:56 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 17 10:46:56 2012 -0700
tree 3234976a1020f88749d8f0343ea03c5f5eaec843
parent 24baa3eda1fa9d0a56f3347b49cb5c7726fec181
parent c796025f7dc5f8df7c0f9c76bcaee96a7716912d

am c796025f: Merge "Revert "Android ucontext refinements (upstream backport)"."

* commit 'c796025f7dc5f8df7c0f9c76bcaee96a7716912d':
  Revert "Android ucontext refinements (upstream backport)".

Android.d8.mk

diff --git a/Android.v8shell.mk b/Android.d8.mk
similarity index 80%
rename from Android.v8shell.mk
rename to Android.d8.mk
index efe8ddf..0f74eb5 100644
--- a/Android.v8shell.mk
+++ b/Android.d8.mk
@@ -4,8 +4,11 @@
 LOCAL_SHARED_LIBRARIES := libstlport
 include external/stlport/libstlport.mk
 
-LOCAL_SRC_FILES:= samples/shell.cc
-LOCAL_MODULE := v8shell
+LOCAL_SRC_FILES := \
+    src/d8.cc \
+    src/d8-posix.cc
+
+LOCAL_MODULE := d8
 
 LOCAL_CPP_EXTENSION := .cc
 

Android.mk

diff --git a/Android.mk b/Android.mk
index c98c57c..148c60e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -23,10 +23,10 @@
     endif
 endif
 
-# Build libv8 and v8shell
+# Build libv8 and d8
 ifneq ($(filter $(TARGET_ARCH),x86 arm mips),)
     ENABLE_V8_SNAPSHOT = true
     include $(BASE_PATH)/Android.mksnapshot.mk
     include $(BASE_PATH)/Android.libv8.mk
-    include $(BASE_PATH)/Android.v8shell.mk
+    include $(BASE_PATH)/Android.d8.mk
 endif