diff options
author | Ignacio Solla <igsolla@google.com> | 2014-11-06 19:51:47 +0000 |
---|---|---|
committer | Ignacio Solla Paula <igsolla@google.com> | 2014-11-13 19:36:36 +0000 |
commit | 05a7888ca30d8f6c60f2900a592cfbaaef0ac236 (patch) | |
tree | 6718e3d4ac35550d0505abc071118630edd5bb6a /chromium/java/com/android | |
parent | ee0f312eaa0858d2608d88011527f9458bfeb8bf (diff) | |
download | webview-05a7888ca30d8f6c60f2900a592cfbaaef0ac236.tar.gz |
[WebView] Start building against the System SDK.
BUG:18152150
Change-Id: I995dd1a5f72bc817bdd71507fa4eee790144846a
(cherry picked from commit 0dd72dc2dac5ee57fd597f172e5015650312a700)
Diffstat (limited to 'chromium/java/com/android')
3 files changed, 3 insertions, 8 deletions
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; |