[android] Merge gyp configurations.

The merge makes it possible to reuse variables from the
android configuration in standalone.gypi.

BUG=chromium:502176
LOG=n

Review URL: https://codereview.chromium.org/1196253002

Cr-Commit-Position: refs/heads/master@{#29189}

Makefile

@@ -250,7 +250,7 @@ NACL_ARCHES = nacl_ia32 nacl_x64
 GYPFILES = third_party/icu/icu.gypi third_party/icu/icu.gyp \
 	   build/shim_headers.gypi build/features.gypi build/standalone.gypi \
 	   build/toolchain.gypi build/all.gyp build/mac/asan.gyp \
-	   build/android.gypi test/cctest/cctest.gyp \
+	   test/cctest/cctest.gyp \
 	   test/unittests/unittests.gyp tools/gyp/v8.gyp \
 	   tools/parser-shell.gyp testing/gmock.gyp testing/gtest.gyp \
 	   buildtools/third_party/libc++abi/libc++abi.gyp \
@@ -315,7 +315,7 @@ native: $(OUTDIR)/Makefile.native
 
 $(ANDROID_ARCHES): $(addprefix $$@.,$(MODES))
 
-$(ANDROID_BUILDS): $(GYPFILES) $(ENVFILE) build/android.gypi \
+$(ANDROID_BUILDS): $(GYPFILES) $(ENVFILE) \
                    must-set-ANDROID_NDK_ROOT_OR_TOOLCHAIN Makefile.android
 	@$(MAKE) -f Makefile.android $@ \
 	        ARCH="$(basename $@)" \

Makefile.android

@@ -46,29 +46,29 @@ else
 endif
 
 ifeq ($(ARCH), android_arm)
-  DEFINES  = target_arch=arm v8_target_arch=arm android_target_arch=arm android_target_platform=21
+  DEFINES  = OS=android target_arch=arm v8_target_arch=arm android_target_arch=arm android_target_platform=21
   DEFINES += arm_neon=0 arm_version=7
   TOOLCHAIN_ARCH = arm-linux-androideabi
   TOOLCHAIN_PREFIX = $(TOOLCHAIN_ARCH)
 else ifeq ($(ARCH), android_arm64)
-  DEFINES  = target_arch=arm64 v8_target_arch=arm64 android_target_arch=arm64 android_target_platform=21
+  DEFINES  = OS=android target_arch=arm64 v8_target_arch=arm64 android_target_arch=arm64 android_target_platform=21
   TOOLCHAIN_ARCH = aarch64-linux-android
   TOOLCHAIN_PREFIX = $(TOOLCHAIN_ARCH)
 else ifeq ($(ARCH), android_mipsel)
-  DEFINES  = target_arch=mipsel v8_target_arch=mipsel android_target_platform=21
+  DEFINES  = OS=android target_arch=mipsel v8_target_arch=mipsel android_target_platform=21
   DEFINES += android_target_arch=mips mips_arch_variant=mips32r2
   TOOLCHAIN_ARCH = mipsel-linux-android
   TOOLCHAIN_PREFIX = $(TOOLCHAIN_ARCH)
 else ifeq ($(ARCH), android_ia32)
-  DEFINES = target_arch=ia32 v8_target_arch=ia32 android_target_arch=x86 android_target_platform=21
+  DEFINES = OS=android target_arch=ia32 v8_target_arch=ia32 android_target_arch=x86 android_target_platform=21
   TOOLCHAIN_ARCH = x86
   TOOLCHAIN_PREFIX = i686-linux-android
 else ifeq ($(ARCH), android_x64)
-  DEFINES = target_arch=x64 v8_target_arch=x64 android_target_arch=x86_64 android_target_platform=21
+  DEFINES = OS=android target_arch=x64 v8_target_arch=x64 android_target_arch=x86_64 android_target_platform=21
   TOOLCHAIN_ARCH = x86_64
   TOOLCHAIN_PREFIX = x86_64-linux-android
 else ifeq ($(ARCH), android_x87)
-  DEFINES = target_arch=x87 v8_target_arch=x87 android_target_arch=x86 android_target_platform=21
+  DEFINES = OS=android target_arch=x87 v8_target_arch=x87 android_target_arch=x86 android_target_platform=21
   TOOLCHAIN_ARCH = x86
   TOOLCHAIN_PREFIX = i686-linux-android
 else
@@ -111,5 +111,5 @@ $(ANDROID_MAKEFILES):
 	CXX="${ANDROID_TOOLCHAIN}/bin/${TOOLCHAIN_PREFIX}-g++" \
 	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 \
+	              -Ibuild/standalone.gypi --depth=. \
 	              -S$(suffix $(basename $@))$(suffix $@) ${GYPFLAGS}

build/get_landmines.py

@@ -22,6 +22,7 @@ def main():
   print 'Activating MSVS 2013 again.'
   print 'Clobber after ICU roll.'
   print 'Moar clobbering...'
+  print 'Remove build/android.gypi'
   return 0