From cf686f7adb1cbc4efe3e93ae69b040d328b0e23f Mon Sep 17 00:00:00 2001 From: "Torne (Richard Coles)" Date: Wed, 30 Oct 2013 11:53:32 +0000 Subject: 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. Bug: 11426593 --- chromium/Android.mk | 8 ++------ 1 file 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 -- cgit v1.2.3