diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-08-21 14:38:32 +0100 |
|---|---|---|
| committer | Richard Coles <torne@google.com> | 2014-08-29 12:50:36 +0000 |
| commit | 26a06d159074323f26320430edafc5494e909482 (patch) | |
| tree | 322502481eb1608b97ae654ff1af8460ee1e85f6 /chromium/Android.mk | |
| parent | 3688d4e395b6ce345514f15304b9c670ed1ab875 (diff) | |
| download | webview-26a06d159074323f26320430edafc5494e909482.tar.gz | |
Disable building the APK when a prebuilt is in use.
If the product is configured to use a prebuilt webview APK, don't
attempt to build it from source to avoid a duplicate definition.
Bug: 16870861
Change-Id: I689cda55ef75c843bca2aa020df1b4cefd8821dc
(cherry picked from commit c182da21c498c2b3f143e9b775f89a7aeb9be6ce)
Diffstat (limited to 'chromium/Android.mk')
| -rw-r--r-- | chromium/Android.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chromium/Android.mk b/chromium/Android.mk index a624f50..edcfdb2 100644 --- a/chromium/Android.mk +++ b/chromium/Android.mk @@ -74,9 +74,11 @@ LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) -# Include the makefile for the main package. +# Include the makefile for the main package unless we are using a prebuilt. +ifneq ($(PRODUCT_PREBUILT_WEBVIEWCHROMIUM),yes) extra_java_files := include $(LOCAL_PATH)/package.mk +endif # Build other stuff include $(call first-makefiles-under,$(LOCAL_PATH)) |