diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-10-30 11:53:32 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-03-21 10:55:19 +0000 |
| commit | c09906e775b8e8ab1e3cd1c25080a4baa5724f80 (patch) | |
| tree | 4a9ba498a3f8ff7db657c901b4db9b3c2b3991c0 | |
| parent | b3d255b84ff3ae8c3924e349560cfdabdb312145 (diff) | |
| download | android_frameworks_webview-c09906e775b8e8ab1e3cd1c25080a4baa5724f80.tar.gz android_frameworks_webview-c09906e775b8e8ab1e3cd1c25080a4baa5724f80.tar.bz2 android_frameworks_webview-c09906e775b8e8ab1e3cd1c25080a4baa5724f80.zip | |
Revert "Support a prebuilt WebView."
To work around framework resource IDs not being constant, go back to
building webviewchromium.jar from source.
This reverts commit 9c9341f1d2368b4209fe982f3f1c5de384f67fb7.
Orignal Bug: 11426593
Bug: 11324052
(cherry picked from commit cf686f7adb1cbc4efe3e93ae69b040d328b0e23f)
Change-Id: Id4e9d644f832fe3ecee9d2cc31234359857ce8c9
| -rw-r--r-- | chromium/Android.mk | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/chromium/Android.mk b/chromium/Android.mk index bdc5b28..d715221 100644 --- a/chromium/Android.mk +++ b/chromium/Android.mk @@ -19,9 +19,6 @@ LOCAL_PATH := $(call my-dir) CHROMIUM_PATH := external/chromium_org -# Don't include most modules if the product is using a prebuilt webviewchromium. -ifneq ($(PRODUCT_PREBUILT_WEBVIEWCHROMIUM),yes) - # Java glue layer JAR, calls directly into the chromium AwContents Java API. include $(CLEAR_VARS) @@ -117,11 +114,10 @@ $(jar_check_ok): $(full_classes_jarjar_jar) $(LOCAL_PATH)/tools/jar_check.py $(L $(LOCAL_BUILT_MODULE): $(jar_check_ok) endif -endif # PRODUCT_PREBUILT_WEBVIEWCHROMIUM + # Native support library (libwebviewchromium_plat_support.so) - does NOT link -# any native chromium code. This is built from source even if the product has -# a prebuilt webviewchromium to ensure ABI compatibility. +# any native chromium code. include $(CLEAR_VARS) LOCAL_MODULE:= libwebviewchromium_plat_support |