commit df482c606f1e0064486455b3c10bc5563a6b548a
author Ben Murdoch <benm@google.com> Fri Jun 08 09:28:17 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jun 08 09:28:17 2012 -0700
tree a9f8997fa662172278aa9a23be1304b1ea1c0139
parent aedeec13588ee14f62728510437f9064cb9ccc11
parent e460692907542433e9ef263e9f61100dbcdead11

am e4606929: am 7d088e4f: Merge V8 at 3.9.24.30

* commit 'e460692907542433e9ef263e9f61100dbcdead11':
  Merge V8 at 3.9.24.30

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 ff42934..ec89b78 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),)
     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