diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-04-03 15:40:12 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-04-03 15:40:12 +0100 |
| commit | 54cd42278ccf1d52996034848086a09b23065a40 (patch) | |
| tree | 2310a8a158adb5490140d3781e9bb22c21aaeac1 /Android.mk | |
| parent | b8fae6f8a934d2ccd1aaca31e8b1381d4768340a (diff) | |
| download | chromium_org-54cd42278ccf1d52996034848086a09b23065a40.tar.gz | |
Build fix for arm64.
Temporarily land part of the multilib makefile changes to fix the 32-bit
webrtc build for arm64 devices.
Change-Id: Id8e11c46cc3538462e264fdc1a3dc5a35b440f9e
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/Android.mk b/Android.mk index aaeed5ca2d..c6417abdc9 100644 --- a/Android.mk +++ b/Android.mk @@ -10,19 +10,25 @@ CHROMIUM_DIR := $(call my-dir) -# Assume that if the gyp autogenerated makefile exists, we are doing the -# WebView build using the Android build system. -ifneq (,$(wildcard $(CHROMIUM_DIR)/GypAndroid.$(HOST_OS)-$(TARGET_ARCH).mk)) - -# Don't include anything if the product is using a prebuilt webviewchromium. -ifneq ($(PRODUCT_PREBUILT_WEBVIEWCHROMIUM),yes) - # We default to release for the Android build system. Developers working on # WebView code can build with "make GYP_CONFIGURATION=Debug". GYP_CONFIGURATION := Release +# Don't include anything if the product is using a prebuilt webviewchromium. +ifneq ($(PRODUCT_PREBUILT_WEBVIEWCHROMIUM),yes) + +# Assume that if the gyp autogenerated makefile exists, we are doing the +# WebView build using the Android build system. +ifneq (,$(wildcard $(CHROMIUM_DIR)/GypAndroid.$(HOST_OS)-$(TARGET_ARCH).mk)) +GYP_VAR_PREFIX := include $(CHROMIUM_DIR)/GypAndroid.$(HOST_OS)-$(TARGET_ARCH).mk -include $(CHROMIUM_DIR)/android_webview/Android.mk +endif +ifneq (,$(wildcard $(CHROMIUM_DIR)/GypAndroid.$(HOST_OS)-$(TARGET_2ND_ARCH).mk)) +GYP_VAR_PREFIX := $(TARGET_2ND_ARCH_VAR_PREFIX) +include $(CHROMIUM_DIR)/GypAndroid.$(HOST_OS)-$(TARGET_2ND_ARCH).mk endif + +include $(CHROMIUM_DIR)/android_webview/Android.mk + endif |