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
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 @@
$(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
