summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authortorne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-13 17:59:18 +0000
committertorne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-13 17:59:18 +0000
commit92a1284bd690f5393a544314f7ee1e684a523d19 (patch)
tree036b824dfcc2092897ca7321419f0726d8e90ec5 /Android.mk
parent9080aa1134163ca362f936ebbc46b227d4628768 (diff)
downloadchromium_src-92a1284bd690f5393a544314f7ee1e684a523d19.zip
chromium_src-92a1284bd690f5393a544314f7ee1e684a523d19.tar.gz
chromium_src-92a1284bd690f5393a544314f7ee1e684a523d19.tar.bz2
Android: Support a prebuilt WebView.
When building using the Android platform build system, if the current product sets PRODUCT_PREBUILT_WEBVIEWCHROMIUM, do not attempt to build the WebView from source. BUG= NOTRY=true Review URL: https://codereview.chromium.org/66343006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234848 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 4513ef5..aaeed5c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,6 +14,9 @@ CHROMIUM_DIR := $(call my-dir)
# 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
@@ -22,3 +25,4 @@ include $(CHROMIUM_DIR)/GypAndroid.$(HOST_OS)-$(TARGET_ARCH).mk
include $(CHROMIUM_DIR)/android_webview/Android.mk
endif
+endif