From 05a7888ca30d8f6c60f2900a592cfbaaef0ac236 Mon Sep 17 00:00:00 2001
From: Ignacio Solla <igsolla@google.com>
Date: Thu, 6 Nov 2014 19:51:47 +0000
Subject: [WebView] Start building against the System SDK.

BUG:18152150
Change-Id: I995dd1a5f72bc817bdd71507fa4eee790144846a
(cherry picked from commit 0dd72dc2dac5ee57fd597f172e5015650312a700)
---
 chromium/java/com/android/webview/chromium/WebViewChromium.java      | 2 +-
 .../com/android/webview/chromium/WebViewChromiumFactoryProvider.java | 4 ++--
 .../java/com/android/webview/chromium/WebViewDelegateFactory.java    | 5 -----
 chromium/package.mk                                                  | 2 ++
 4 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'chromium')

diff --git a/chromium/java/com/android/webview/chromium/WebViewChromium.java b/chromium/java/com/android/webview/chromium/WebViewChromium.java
index c12fb0a..1afd5b7 100644
--- a/chromium/java/com/android/webview/chromium/WebViewChromium.java
+++ b/chromium/java/com/android/webview/chromium/WebViewChromium.java
@@ -319,7 +319,7 @@ class WebViewChromium implements WebViewProvider,
         }
 
         AwContentsStatics.setRecordFullDocument(sRecordWholeDocumentEnabledByApi ||
-                mAppTargetSdkVersion < Build.VERSION_CODES.L);
+                mAppTargetSdkVersion < Build.VERSION_CODES.LOLLIPOP);
 
         if (mAppTargetSdkVersion <= Build.VERSION_CODES.KITKAT) {
             // On KK and older versions, JavaScript objects injected via addJavascriptInterface
diff --git a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
index 79751d8..f54c964 100644
--- a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
+++ b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
@@ -261,7 +261,7 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
         initPlatSupportLibrary();
         AwBrowserProcess.start(mWebViewDelegate.getApplication());
 
-        if (Build.IS_DEBUGGABLE) {
+        if (isBuildDebuggable()) {
             setWebContentsDebuggingEnabled(true);
         }
 
@@ -362,7 +362,7 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
                     @Override
                     public void setWebContentsDebuggingEnabled(boolean enable) {
                         // Web Contents debugging is always enabled on debug builds.
-                        if (!Build.IS_DEBUGGABLE) {
+                        if (!isBuildDebuggable()) {
                             WebViewChromiumFactoryProvider.this.
                                     setWebContentsDebuggingEnabled(enable);
                         }
diff --git a/chromium/java/com/android/webview/chromium/WebViewDelegateFactory.java b/chromium/java/com/android/webview/chromium/WebViewDelegateFactory.java
index f5d1518..bf6a06f 100644
--- a/chromium/java/com/android/webview/chromium/WebViewDelegateFactory.java
+++ b/chromium/java/com/android/webview/chromium/WebViewDelegateFactory.java
@@ -1,20 +1,15 @@
 package com.android.webview.chromium;
 
-import android.app.ActivityThread;
 import android.app.Application;
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.res.AssetManager;
 import android.content.res.Resources;
 import android.graphics.Canvas;
-import android.net.http.ErrorStrings;
-import android.os.SystemProperties;
 import android.os.Trace;
 import android.util.Log;
 import android.util.SparseArray;
-import android.view.HardwareCanvas;
 import android.view.View;
-import android.view.ViewRootImpl;
 import android.webkit.WebViewFactory;
 
 import java.lang.reflect.InvocationTargetException;
diff --git a/chromium/package.mk b/chromium/package.mk
index 2f890ca..061b40e 100644
--- a/chromium/package.mk
+++ b/chromium/package.mk
@@ -35,6 +35,8 @@ LOCAL_MANIFEST_FILE := AndroidManifest.xml
 
 LOCAL_MODULE_TAGS := optional
 
+LOCAL_SDK_VERSION := system_current
+
 LOCAL_STATIC_JAVA_LIBRARIES += android_webview_java_with_new_resources
 
 LOCAL_SRC_FILES := $(call all-java-files-under, java)
-- 
cgit v1.2.3


From d96f01bc4bccc016cc35173358b9ebb4eb4ecae4 Mon Sep 17 00:00:00 2001
From: "Torne (Richard Coles)" <torne@google.com>
Date: Mon, 17 Nov 2014 20:28:51 +0000
Subject: Allow dex preopt in webview.

The bug around preopting a multiarch apk has been fixed for a while;
stop disabling LOCAL_DEX_PREOPT.

Bug: 17772057
Change-Id: Ie653d7e79ef5cef5dc01e9b87c8f3ee78175f4f9
---
 chromium/package.mk | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'chromium')

diff --git a/chromium/package.mk b/chromium/package.mk
index 061b40e..1abe575 100644
--- a/chromium/package.mk
+++ b/chromium/package.mk
@@ -61,9 +61,6 @@ LOCAL_JNI_SHARED_LIBRARIES += libwebviewchromium
 
 LOCAL_MULTILIB := both
 
-# See Bug 17409149.
-LOCAL_DEX_PREOPT := false
-
 # If this build is just for apps, skip building the platform-side dependencies.
 ifeq ($(TARGET_BUILD_APPS),)
 LOCAL_REQUIRED_MODULES := \
-- 
cgit v1.2.3