diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-10-30 11:53:32 +0000 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2013-11-05 13:49:25 -0800 |
| commit | a52bf0f6b156d329231509364d303c4102057239 (patch) | |
| tree | 5c39d4cbcd40f0e879c5a38ce90928dadff5b252 | |
| parent | dcd9911315bc6864b61d1d76ca0ff3904227889b (diff) | |
| download | webview-kitkat-cts-release.tar.gz | |
Revert "Support a prebuilt WebView."android-cts-4.4_r4android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1kitkat-releasekitkat-cts-release
To work around framework resource IDs not being constant, go back to
building webviewchromium.jar from source.
This reverts commit 9c9341f1d2368b4209fe982f3f1c5de384f67fb7.
Bug: 11426593
| -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 96e2905..168be05 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 |