diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
| commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
| tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/Android.mk | |
| parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) | |
| download | qtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz | |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/Android.mk')
| -rw-r--r-- | chromium/Android.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chromium/Android.mk b/chromium/Android.mk index 4513ef50883..aaeed5ca2d7 100644 --- a/chromium/Android.mk +++ b/chromium/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 |