diff options
author | Torne (Richard Coles) <torne@google.com> | 2014-11-18 19:17:58 +0000 |
---|---|---|
committer | Torne (Richard Coles) <torne@google.com> | 2014-11-18 19:17:58 +0000 |
commit | b0fc23fd000409a323dc216ad4a033b5fe2b9b95 (patch) | |
tree | fe60442d515d1bb332d926e95949f18807e50a8a /chromium | |
parent | c28cfda48ebe288274a9e58f7605e08658f7ed87 (diff) | |
parent | d96f01bc4bccc016cc35173358b9ebb4eb4ecae4 (diff) | |
download | webview-b0fc23fd000409a323dc216ad4a033b5fe2b9b95.tar.gz |
Update to latest master-chromium.
Start building against the system SDK.
Diffstat (limited to 'chromium')
4 files changed, 5 insertions, 11 deletions
diff --git a/chromium/java/com/android/webview/chromium/WebViewChromium.java b/chromium/java/com/android/webview/chromium/WebViewChromium.java index c065988..6cf4238 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..1abe575 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) @@ -59,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 := \ |