diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-10-30 10:20:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-30 10:20:51 -0700 |
| commit | 8009977db575433507a018e0bc903376aac6815d (patch) | |
| tree | aa0afeabac57c1f6cb9287378d438f796de29c8b | |
| parent | 35cba6a3325867f74a277a5baa9cfc4e53db5c29 (diff) | |
| parent | 3ba0b9a13dadcc75e2078c6a6567d8656360b160 (diff) | |
| download | android_frameworks_webview-8009977db575433507a018e0bc903376aac6815d.tar.gz android_frameworks_webview-8009977db575433507a018e0bc903376aac6815d.tar.bz2 android_frameworks_webview-8009977db575433507a018e0bc903376aac6815d.zip | |
am 3ba0b9a1: am cf686f7a: Revert "Support a prebuilt WebView."
* commit '3ba0b9a13dadcc75e2078c6a6567d8656360b160':
Revert "Support a prebuilt WebView."
| -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 |