Upgrade to 3.29

Update V8 to 3.29.88.17 and update makefiles to support building on
all the relevant platforms.

Bug: 17370214

Change-Id: Ia3407c157fd8d72a93e23d8318ccaf6ecf77fa4e

1 files changed, 40 insertions, 19 deletions

diff --git a/Android.libv8.mk b/Android.libv8.mk
index d83857bb..0a36a7d1 100644
--- a/Android.libv8.mk
+++ b/Android.libv8.mk
@@ -4,7 +4,7 @@ LOCAL_PATH := $(call my-dir)
 # ===================================================
 include $(CLEAR_VARS)
 
-include external/stlport/libstlport.mk
+LOCAL_CXX_STL := libc++
 
 ifeq ($(TARGET_ARCH),mips)
        LOCAL_MIPS_MODE=mips
@@ -15,6 +15,8 @@ LOCAL_MODULE := libv8
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 generated_sources := $(call local-generated-sources-dir)
 
+LOCAL_MULTILIB := both
+
 # Android.v8common.mk defines V8_LOCAL_JS_LIBRARY_FILES, LOCAL_SRC_FILES,
 # LOCAL_CFLAGS, LOCAL_SRC_FILES_arch, and LOCAL_CFLAGS_arch
 V8_LOCAL_JS_LIBRARY_FILES :=
@@ -23,10 +25,11 @@ include $(LOCAL_PATH)/Android.v8common.mk
 
 # Target can only be linux
 LOCAL_SRC_FILES += \
-  src/platform-linux.cc \
-  src/platform-posix.cc
+  src/base/platform/platform-linux.cc \
+  src/base/platform/platform-posix.cc
 
-LOCAL_SRC_FILES_x86 += src/atomicops_internals_x86_gcc.cc
+LOCAL_SRC_FILES_x86 += src/base/atomicops_internals_x86_gcc.cc
+LOCAL_SRC_FILES_x86_64 += src/base/atomicops_internals_x86_gcc.cc
 
 LOCAL_JS_LIBRARY_FILES := $(addprefix $(LOCAL_PATH)/, $(V8_LOCAL_JS_LIBRARY_FILES))
 LOCAL_JS_EXPERIMENTAL_LIBRARY_FILES := $(addprefix $(LOCAL_PATH)/, $(V8_LOCAL_JS_EXPERIMENTAL_LIBRARY_FILES))
@@ -44,7 +47,7 @@ $(GEN1): SCRIPT := $(generated_sources)/js2c.py
 $(GEN1): $(LOCAL_JS_LIBRARY_FILES) $(JS2C_PY)
 	@echo "Generating libraries.cc"
 	@mkdir -p $(dir $@)
-	python $(SCRIPT) $(GEN1) CORE off $(LOCAL_JS_LIBRARY_FILES)
+	python $(SCRIPT) $@ CORE off $(LOCAL_JS_LIBRARY_FILES)
 V8_GENERATED_LIBRARIES := $(generated_sources)/libraries.cc
 
 # Generate experimental-libraries.cc
@@ -53,7 +56,7 @@ $(GEN2): SCRIPT := $(generated_sources)/js2c.py
 $(GEN2): $(LOCAL_JS_EXPERIMENTAL_LIBRARY_FILES) $(JS2C_PY)
 	@echo "Generating experimental-libraries.cc"
 	@mkdir -p $(dir $@)
-	python $(SCRIPT) $(GEN2) EXPERIMENTAL off $(LOCAL_JS_EXPERIMENTAL_LIBRARY_FILES)
+	python $(SCRIPT) $@ EXPERIMENTAL off $(LOCAL_JS_EXPERIMENTAL_LIBRARY_FILES)
 V8_GENERATED_LIBRARIES += $(generated_sources)/experimental-libraries.cc
 
 LOCAL_GENERATED_SOURCES += $(V8_GENERATED_LIBRARIES)
@@ -62,16 +65,16 @@ LOCAL_GENERATED_SOURCES += $(V8_GENERATED_LIBRARIES)
 ifeq ($(ENABLE_V8_SNAPSHOT),true)
 
 SNAP_GEN := $(generated_sources)/snapshot_$(TARGET_ARCH).cc
-MKSNAPSHOT := $(HOST_OUT_EXECUTABLES)/mksnapshot.$(TARGET_ARCH)
-$(SNAP_GEN): PRIVATE_CUSTOM_TOOL = $(MKSNAPSHOT) --logfile $(generated_sources)/v8.log $(SNAP_GEN)
+MKSNAPSHOT := $(HOST_OUT_EXECUTABLES)/v8_mksnapshot.$(TARGET_ARCH)
+$(SNAP_GEN): PRIVATE_CUSTOM_TOOL = $(HOST_OUT_EXECUTABLES)/v8_mksnapshot.$(TARGET_ARCH) --log-snapshot-positions --logfile $(dir $@)/v8-snapshot_$(TARGET_ARCH).log $@
 $(SNAP_GEN): $(MKSNAPSHOT)
 	$(transform-generated-source)
 LOCAL_GENERATED_SOURCES_$(TARGET_ARCH) += $(SNAP_GEN)
 
 ifdef TARGET_2ND_ARCH
 SNAP_GEN := $(generated_sources)/snapshot_$(TARGET_2ND_ARCH).cc
-MKSNAPSHOT := $(HOST_OUT_EXECUTABLES)/mksnapshot.$(TARGET_2ND_ARCH)
-$(SNAP_GEN): PRIVATE_CUSTOM_TOOL = $(MKSNAPSHOT) --logfile $(generated_sources)/v8.log $(SNAP_GEN)
+MKSNAPSHOT := $(HOST_OUT_EXECUTABLES)/v8_mksnapshot.$(TARGET_2ND_ARCH)
+$(SNAP_GEN): PRIVATE_CUSTOM_TOOL = $(HOST_OUT_EXECUTABLES)/v8_mksnapshot.$(TARGET_2ND_ARCH) --log-snapshot-positions --logfile $(dir $@)/v8-snapshot_$(TARGET_2ND_ARCH).log $@
 $(SNAP_GEN): $(MKSNAPSHOT)
 	$(transform-generated-source)
 LOCAL_GENERATED_SOURCES_$(TARGET_2ND_ARCH) += $(SNAP_GEN)
@@ -80,10 +83,10 @@ endif # TARGET_2ND_ARCH
 else
 LOCAL_SRC_FILES += \
   src/snapshot-empty.cc
-endif
+endif # ENABLE_V8_SNAPSHOT
 
 # The -fvisibility=hidden option below prevents exporting of symbols from
-# libv8.a in libwebcore.so.  That reduces size of libwebcore.so by 500k.
+# libv8.a.
 LOCAL_CFLAGS += \
 	-Wno-endif-labels \
 	-Wno-import \
@@ -94,23 +97,41 @@ LOCAL_CFLAGS += \
 	-DENABLE_LOGGING_AND_PROFILING \
 	-DENABLE_VMSTATE_TRACKING \
 	-DV8_NATIVE_REGEXP \
-	-Wno-unused-parameter
+	-Wno-unused-parameter \
+	-std=gnu++0x
 
-LOCAL_CFLAGS_arm += -DARM -DV8_TARGET_ARCH_ARM
+LOCAL_CFLAGS_arm += -DV8_TARGET_ARCH_ARM
+LOCAL_CFLAGS_arm64 += -DV8_TARGET_ARCH_ARM64
 
-LOCAL_CFLAGS_mips += -DV8_TARGET_ARCH_MIPS
-LOCAL_CFLAGS_mips += -Umips
-LOCAL_CFLAGS_mips += -finline-limit=64
-LOCAL_CFLAGS_mips += -fno-strict-aliasing
+LOCAL_CFLAGS_mips += -DV8_TARGET_ARCH_MIPS \
+	-Umips \
+	-finline-limit=64 \
+	-fno-strict-aliasing
+LOCAL_CLFAGS_mips64 += -DV8_TARGET_ARCH_MIPS64 \
+	-Umips \
+	-finline-limit=64 \
+	-fno-strict-aliasing
 
 LOCAL_CFLAGS_x86 += -DV8_TARGET_ARCH_IA32
+LOCAL_CFLAGS_x86_64 += -DV8_TARGET_ARCH_X64
 
 ifeq ($(DEBUG_V8),true)
 	LOCAL_CFLAGS += -DDEBUG -UNDEBUG
 endif
 
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/src
+ifdef TARGET_2ND_ARCH
+LOCAL_SRC_FILES_$(TARGET_2ND_ARCH) += $(v8_local_src_files_$(TARGET_2ND_ARCH))
+endif
+
+LOCAL_SRC_FILES_$(TARGET_ARCH) += $(v8_local_src_files_$(TARGET_ARCH))
+
+LOCAL_C_INCLUDES += \
+	$(LOCAL_PATH)/src \
+	external/icu/icu4c/source/common \
+	external/icu/icu4c/source/i18n
 
 LOCAL_MODULE_TARGET_ARCH_WARN := $(V8_SUPPORTED_ARCH)
 
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
+
 include $(BUILD_STATIC_LIBRARY)