Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(98)

Unified Diff: Makefile.android

Issue 233163003: Fix android_arm64 target for experimental ndk (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/android.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Makefile.android
diff --git a/Makefile.android b/Makefile.android
index f4e144f280f280b356ce92de02d26229ef408d01..b3a3a152d4faffab9e82ef326e507ac865a79dce 100644
--- a/Makefile.android
+++ b/Makefile.android
@@ -47,20 +47,20 @@ else
endif
ifeq ($(ARCH), android_arm)
- DEFINES = target_arch=arm v8_target_arch=arm android_target_arch=arm
+ DEFINES = target_arch=arm v8_target_arch=arm android_target_arch=arm android_target_platform=9
DEFINES += arm_neon=0 arm_version=7
TOOLCHAIN_ARCH = arm-linux-androideabi
TOOLCHAIN_PREFIX = $(TOOLCHAIN_ARCH)
TOOLCHAIN_VER = 4.6
else
ifeq ($(ARCH), android_arm64)
- DEFINES = target_arch=arm64 v8_target_arch=arm64 android_target_arch=arm64
+ DEFINES = target_arch=arm64 v8_target_arch=arm64 android_target_arch=arm64 android_target_platform=20
TOOLCHAIN_ARCH = aarch64-linux-android
TOOLCHAIN_PREFIX = $(TOOLCHAIN_ARCH)
TOOLCHAIN_VER = 4.8
else
ifeq ($(ARCH), android_mipsel)
- DEFINES = target_arch=mipsel v8_target_arch=mipsel
+ DEFINES = target_arch=mipsel v8_target_arch=mipsel android_target_platform=9
DEFINES += android_target_arch=mips mips_arch_variant=mips32r2
TOOLCHAIN_ARCH = mipsel-linux-android
TOOLCHAIN_PREFIX = $(TOOLCHAIN_ARCH)
@@ -68,7 +68,7 @@ else
else
ifeq ($(ARCH), android_ia32)
- DEFINES = target_arch=ia32 v8_target_arch=ia32 android_target_arch=x86
+ DEFINES = target_arch=ia32 v8_target_arch=ia32 android_target_arch=x86 android_target_platform=9
TOOLCHAIN_ARCH = x86
TOOLCHAIN_PREFIX = i686-linux-android
TOOLCHAIN_VER = 4.6
« no previous file with comments | « no previous file | build/android.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698