Merge from Chromium at DEPS revision 237746
This commit was generated by merge_to_master.py.
Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
diff --git a/Android.mk b/Android.mk
index 4513ef5..aaeed5c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,6 +14,9 @@
# 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)/android_webview/Android.mk
endif
+endif