Reviewers: ulan, jochen,
Message:
A revert of this CL (patchset #2 id:20001) has been created in
https://codereview.chromium.org/1215593004/ by [email protected].
The reason for reverting is: [Sheriff] Fails runhooks..
Description:
Reland [android] Migrate more configs to gyp.
This reverts commit 3e8892b589f16454d4f592e2ed3f6d4ddf0a0bc6.
BUG=chromium:502176
LOG=n
NOTRY=true
[email protected], [email protected]
Committed: https://crrev.com/c0d70e43c4cbe2a09c8f1bd55fe2be03cd9ba041
Cr-Commit-Position: refs/heads/master@{#29317}
Please review this at https://codereview.chromium.org/1210393003/
Base URL: https://chromium.googlesource.com/v8/v8.git@master
Affected files (+31, -12 lines):
M Makefile.android
M build/standalone.gypi
Index: Makefile.android
diff --git a/Makefile.android b/Makefile.android
index
a550d4253b01e1a430102fa8d2a21029ba6b884c..c49cb85b9b6514d70280d184248a031cf8e4a448
100644
--- a/Makefile.android
+++ b/Makefile.android
@@ -35,28 +35,24 @@ MODES = release debug
ANDROID_BUILDS = $(foreach mode,$(MODES), \
$(addsuffix .$(mode),$(ANDROID_ARCHES)))
-HOST_OS = $(shell uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')
-
ifeq ($(ARCH), android_arm)
- DEFINES = target_arch=arm v8_target_arch=arm android_target_arch=arm
android_target_platform=16
- DEFINES += arm_neon=0 arm_version=7
+ DEFINES = target_arch=arm v8_target_arch=arm
else ifeq ($(ARCH), android_arm64)
- DEFINES = target_arch=arm64 v8_target_arch=arm64
android_target_arch=arm64 android_target_platform=21
+ DEFINES = target_arch=arm64 v8_target_arch=arm64
else ifeq ($(ARCH), android_mipsel)
- DEFINES = target_arch=mipsel v8_target_arch=mipsel
android_target_platform=16
- DEFINES += android_target_arch=mips mips_arch_variant=mips32r2
+ DEFINES = target_arch=mipsel v8_target_arch=mipsel
else ifeq ($(ARCH), android_ia32)
- DEFINES = target_arch=ia32 v8_target_arch=ia32 android_target_arch=x86
android_target_platform=16
+ DEFINES = target_arch=ia32 v8_target_arch=ia32
else ifeq ($(ARCH), android_x64)
- DEFINES = target_arch=x64 v8_target_arch=x64 android_target_arch=x86_64
android_target_platform=21
+ DEFINES = target_arch=x64 v8_target_arch=x64
else ifeq ($(ARCH), android_x87)
- DEFINES = target_arch=x87 v8_target_arch=x87 android_target_arch=x86
android_target_platform=16
+ DEFINES = target_arch=ia32 v8_target_arch=x87
else
$(error Target architecture "${ARCH}" is not supported)
endif
# Common flags.
-DEFINES += host_os=${HOST_OS} OS=android
+DEFINES += OS=android
.SECONDEXPANSION:
$(ANDROID_BUILDS): $(OUTDIR)/Makefile.$$@
Index: build/standalone.gypi
diff --git a/build/standalone.gypi b/build/standalone.gypi
index
7984fb3e6066ec2a3a70835137a4fb3332ebcb8f..e98241e60e19d3644eab3e93d89f4f102b2e1fad
100644
--- a/build/standalone.gypi
+++ b/build/standalone.gypi
@@ -222,31 +222,50 @@
# Copy conditionally-set variables out one scope.
'android_ndk_root%': '<(android_ndk_root)',
+ 'host_os%': '<(host_os)',
'conditions': [
['target_arch == "ia32"', {
'android_toolchain%':
'<(android_ndk_root)/toolchains/x86-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin',
+ 'android_target_arch%': 'x86',
+ 'android_target_platform%': '16',
}],
['target_arch == "x64"', {
'android_toolchain%':
'<(android_ndk_root)/toolchains/x86_64-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin',
+ 'android_target_arch%': 'x86_64',
+ 'android_target_platform%': '21',
}],
['target_arch=="arm"', {
'android_toolchain%':
'<(android_ndk_root)/toolchains/arm-linux-androideabi-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin',
+ 'android_target_arch%': 'arm',
+ 'android_target_platform%': '16',
+ 'arm_version%': 7,
}],
['target_arch == "arm64"', {
'android_toolchain%':
'<(android_ndk_root)/toolchains/aarch64-linux-android-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin',
+ 'android_target_arch%': 'arm64',
+ 'android_target_platform%': '21',
+ 'arm_version%': 'default',
}],
['target_arch == "mipsel"', {
'android_toolchain%':
'<(android_ndk_root)/toolchains/mipsel-linux-android-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin',
+ 'android_target_arch%': 'mips',
+ 'android_target_platform%': '16',
}],
['target_arch == "mips64el"', {
'android_toolchain%':
'<(android_ndk_root)/toolchains/mips64el-linux-android-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin',
+ 'android_target_arch%': 'mips64',
+ 'android_target_platform%': '21',
}],
],
},
# Copy conditionally-set variables out one scope.
+ 'android_target_arch%': '<(android_target_arch)',
+ 'android_target_platform%': '<(android_target_platform)',
'android_toolchain%': '<(android_toolchain)',
+ 'arm_version%': '<(arm_version)',
+ 'host_os%': '<(host_os)',
'conditions': [
['android_ndk_root==""', {
@@ -292,7 +311,6 @@
}],
],
# Default ARM variable settings.
- 'arm_version%': 'default',
'arm_fpu%': 'vfpv3',
'arm_float_abi%': 'default',
'arm_thumb': 'default',
@@ -310,6 +328,11 @@
'target_defaults': {
'variables': {
'v8_code%': '<(v8_code)',
+ 'conditions':[
+ ['OS=="android"', {
+ 'host_os%': '<(host_os)',
+ }],
+ ],
},
'default_configuration': 'Debug',
'configurations': {
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
