commit | b445d948eca5e09b432245ab305d43aaf44d79e7 | [log] [tgz] |
---|---|---|
author | Aurimas Liutikas <aurimas@google.com> | Mon Mar 05 12:52:27 2018 -0800 |
committer | Aurimas Liutikas <aurimas@google.com> | Mon Mar 05 12:52:27 2018 -0800 |
tree | f9089f7b25c4092e6e9967ee853685c674e3a383 | |
parent | 07aaffeb2feb06db1bf88002f45c277df2b405d0 [diff] |
Fix webkit project imports after upstream package move. We got broken by https://chromium-review.googlesource.com/c/chromium/src/+/943504 Test: ./gradlew webkit:assembleDebug now passes Change-Id: I9628c0419d6dee6c800d852f38d322e01a46315f
diff --git a/webkit/src/main/java/androidx/webkit/internal/WebViewGlueCommunicator.java b/webkit/src/main/java/androidx/webkit/internal/WebViewGlueCommunicator.java index 24bb2d1..57a2263 100644 --- a/webkit/src/main/java/androidx/webkit/internal/WebViewGlueCommunicator.java +++ b/webkit/src/main/java/androidx/webkit/internal/WebViewGlueCommunicator.java
@@ -19,8 +19,8 @@ import android.support.v4.os.BuildCompat; import android.webkit.WebView; -import org.chromium.support_lib_boundary.BoundaryInterfaceReflectionUtil; import org.chromium.support_lib_boundary.WebViewProviderFactoryBoundaryInterface; +import org.chromium.support_lib_boundary.util.BoundaryInterfaceReflectionUtil; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException;
diff --git a/webkit/src/main/java/androidx/webkit/internal/WebViewProviderAdapter.java b/webkit/src/main/java/androidx/webkit/internal/WebViewProviderAdapter.java index 249d367..2093e0b 100644 --- a/webkit/src/main/java/androidx/webkit/internal/WebViewProviderAdapter.java +++ b/webkit/src/main/java/androidx/webkit/internal/WebViewProviderAdapter.java
@@ -16,8 +16,8 @@ package androidx.webkit.internal; -import org.chromium.support_lib_boundary.BoundaryInterfaceReflectionUtil; import org.chromium.support_lib_boundary.WebViewProviderBoundaryInterface; +import org.chromium.support_lib_boundary.util.BoundaryInterfaceReflectionUtil; import androidx.webkit.WebViewCompat;
diff --git a/webkit/src/main/java/androidx/webkit/internal/WebViewProviderFactoryAdapter.java b/webkit/src/main/java/androidx/webkit/internal/WebViewProviderFactoryAdapter.java index 80067ed..62ce41e 100644 --- a/webkit/src/main/java/androidx/webkit/internal/WebViewProviderFactoryAdapter.java +++ b/webkit/src/main/java/androidx/webkit/internal/WebViewProviderFactoryAdapter.java
@@ -18,11 +18,11 @@ import android.webkit.WebView; -import org.chromium.support_lib_boundary.BoundaryInterfaceReflectionUtil; import org.chromium.support_lib_boundary.StaticsBoundaryInterface; import org.chromium.support_lib_boundary.WebViewProviderBoundaryInterface; import org.chromium.support_lib_boundary.WebViewProviderFactoryBoundaryInterface; import org.chromium.support_lib_boundary.WebkitToCompatConverterBoundaryInterface; +import org.chromium.support_lib_boundary.util.BoundaryInterfaceReflectionUtil; /** * Adapter for WebViewProviderFactoryBoundaryInterface providing static WebView functionality
diff --git a/webkit/src/main/java/androidx/webkit/internal/WebkitToCompatConverter.java b/webkit/src/main/java/androidx/webkit/internal/WebkitToCompatConverter.java index cb40530..a07cf07 100644 --- a/webkit/src/main/java/androidx/webkit/internal/WebkitToCompatConverter.java +++ b/webkit/src/main/java/androidx/webkit/internal/WebkitToCompatConverter.java
@@ -18,9 +18,9 @@ import android.webkit.WebSettings; -import org.chromium.support_lib_boundary.BoundaryInterfaceReflectionUtil; import org.chromium.support_lib_boundary.WebSettingsBoundaryInterface; import org.chromium.support_lib_boundary.WebkitToCompatConverterBoundaryInterface; +import org.chromium.support_lib_boundary.util.BoundaryInterfaceReflectionUtil; /** * A class providing functionality for converting android.webkit classes into support library