Merge tag 'android-5.1.0_r1' into HEAD
Android 5.1.0 release 1
Conflicts:
chromium/java/com/android/webview/chromium/WebViewChromium.java
Change-Id: I622f77972ebd8d30b321c1941a7a0e8e5265af1a
diff --git a/chromium/Android.mk b/chromium/Android.mk
index edcfdb2..25d17fc 100644
--- a/chromium/Android.mk
+++ b/chromium/Android.mk
@@ -18,6 +18,12 @@
LOCAL_PATH := $(call my-dir)
CHROMIUM_PATH := external/chromium_org
+CHROMIUM_BIN_PATH := external/chromium_org-bin
+
+# Compile libwebviewchromium_plat_support and libwebviewchromium_loader.so
+# only on branches on which the chromium binary project is not present.
+
+ifeq (,$(wildcard $(CHROMIUM_BIN_PATH)))
# Native support library (libwebviewchromium_plat_support.so) - does NOT link
# any native chromium code.
@@ -73,6 +79,7 @@
include $(BUILD_SHARED_LIBRARY)
+endif
# Include the makefile for the main package unless we are using a prebuilt.
ifneq ($(PRODUCT_PREBUILT_WEBVIEWCHROMIUM),yes)
diff --git a/chromium/package.mk b/chromium/package.mk
index 47af19b..152d6e9 100644
--- a/chromium/package.mk
+++ b/chromium/package.mk
@@ -61,9 +61,6 @@
LOCAL_MULTILIB := both
-# See Bug 17409149.
-LOCAL_DEX_PREOPT := false
-
# TODO: filter webviewchromium_webkit_strings based on PRODUCT_LOCALES.
LOCAL_REQUIRED_MODULES := \
libwebviewchromium \