Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / v8 / Makefile.android

diff --git a/src/v8/Makefile.android b/src/v8/Makefile.android
index d3ed1f4..d46af31 100644 (file)
--- a/src/v8/Makefile.android
+++ b/src/v8/Makefile.android
@@ -51,13 +51,13 @@ ifeq ($(ARCH), android_arm)
   DEFINES += arm_neon=0 arm_version=7
   TOOLCHAIN_ARCH = arm-linux-androideabi
   TOOLCHAIN_PREFIX = $(TOOLCHAIN_ARCH)
-  TOOLCHAIN_VER = 4.6
+  TOOLCHAIN_VER = 4.8
 else
   ifeq ($(ARCH), android_arm64)
-    DEFINES  = target_arch=arm64 v8_target_arch=arm64 android_target_arch=arm64 android_target_platform=20
+    DEFINES  = target_arch=arm64 v8_target_arch=arm64 android_target_arch=arm64 android_target_platform=L
     TOOLCHAIN_ARCH = aarch64-linux-android
     TOOLCHAIN_PREFIX = $(TOOLCHAIN_ARCH)
-    TOOLCHAIN_VER = 4.8
+    TOOLCHAIN_VER = 4.9
   else
     ifeq ($(ARCH), android_mipsel)
       DEFINES  = target_arch=mipsel v8_target_arch=mipsel android_target_platform=14
@@ -98,6 +98,7 @@ endif
 
 # For mksnapshot host generation.
 DEFINES += host_os=${HOST_OS}
+DEFINES += OS=android
 
 .SECONDEXPANSION:
 $(ANDROID_BUILDS): $(OUTDIR)/Makefile.$$@
@@ -119,7 +120,7 @@ $(ANDROID_MAKEFILES):
        GYP_DEFINES="${DEFINES}" \
        CC="${ANDROID_TOOLCHAIN}/bin/${TOOLCHAIN_PREFIX}-gcc" \
        CXX="${ANDROID_TOOLCHAIN}/bin/${TOOLCHAIN_PREFIX}-g++" \
-       PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(PYTHONPATH)" \
+       PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(shell pwd)/build:$(PYTHONPATH)" \
        build/gyp/gyp --generator-output="${OUTDIR}" build/all.gyp \
                      -Ibuild/standalone.gypi --depth=. -Ibuild/android.gypi \
                      -S$(suffix $(basename $@))$(suffix $@) ${GYPFLAGS}