Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(21)

Unified Diff: android_webview/glue/BUILD.gn

Issue 1840743003: Not build glue layer if use_webview_internal_framework is set (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix unused variable Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/glue/BUILD.gn
diff --git a/android_webview/glue/BUILD.gn b/android_webview/glue/BUILD.gn
index 7cf6270edfcec857aa78ad081ea88630e9bbf322..59302f7783514bd882f205b2df158cc97555046e 100644
--- a/android_webview/glue/BUILD.gn
+++ b/android_webview/glue/BUILD.gn
@@ -21,32 +21,35 @@ generate_resource_rewriter("glue_resource_rewriter") {
package_name = "com.android.webview.chromium"
}
-android_library("glue") {
- # Change deps? please modify glue_library_deps variable.
- deps = glue_library_deps
- srcjar_deps = [ ":glue_resource_rewriter" ]
+if (!defined(use_webview_internal_framework) ||
+ !use_webview_internal_framework) {
+ android_library("glue") {
+ # Change deps? please modify glue_library_deps variable.
+ deps = glue_library_deps
+ srcjar_deps = [ ":glue_resource_rewriter" ]
- alternative_android_sdk_ijar = webview_framework_ijar
- alternative_android_sdk_ijar_dep = "//android_webview/glue:framework_ijar"
+ alternative_android_sdk_ijar = webview_framework_ijar
+ alternative_android_sdk_ijar_dep = "//android_webview/glue:framework_ijar"
- java_files = [
- "java/src/com/android/webview/chromium/ContentSettingsAdapter.java",
- "java/src/com/android/webview/chromium/CookieManagerAdapter.java",
- "java/src/com/android/webview/chromium/DrawGLFunctor.java",
- "java/src/com/android/webview/chromium/GeolocationPermissionsAdapter.java",
- "java/src/com/android/webview/chromium/GraphicsUtils.java",
- "java/src/com/android/webview/chromium/LicenseActivity.java",
- "java/src/com/android/webview/chromium/LicenseContentProvider.java",
- "java/src/com/android/webview/chromium/ResourcesContextWrapperFactory.java",
- "java/src/com/android/webview/chromium/WebBackForwardListChromium.java",
- "java/src/com/android/webview/chromium/WebHistoryItemChromium.java",
- "java/src/com/android/webview/chromium/WebIconDatabaseAdapter.java",
- "java/src/com/android/webview/chromium/WebMessagePortAdapter.java",
- "java/src/com/android/webview/chromium/WebStorageAdapter.java",
- "java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java",
- "java/src/com/android/webview/chromium/WebViewChromium.java",
- "java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java",
- "java/src/com/android/webview/chromium/WebViewDatabaseAdapter.java",
- "java/src/com/android/webview/chromium/WebViewDelegateFactory.java",
- ]
+ java_files = [
+ "java/src/com/android/webview/chromium/ContentSettingsAdapter.java",
+ "java/src/com/android/webview/chromium/CookieManagerAdapter.java",
+ "java/src/com/android/webview/chromium/DrawGLFunctor.java",
+ "java/src/com/android/webview/chromium/GeolocationPermissionsAdapter.java",
+ "java/src/com/android/webview/chromium/GraphicsUtils.java",
+ "java/src/com/android/webview/chromium/LicenseActivity.java",
+ "java/src/com/android/webview/chromium/LicenseContentProvider.java",
+ "java/src/com/android/webview/chromium/ResourcesContextWrapperFactory.java",
+ "java/src/com/android/webview/chromium/WebBackForwardListChromium.java",
+ "java/src/com/android/webview/chromium/WebHistoryItemChromium.java",
+ "java/src/com/android/webview/chromium/WebIconDatabaseAdapter.java",
+ "java/src/com/android/webview/chromium/WebMessagePortAdapter.java",
+ "java/src/com/android/webview/chromium/WebStorageAdapter.java",
+ "java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java",
+ "java/src/com/android/webview/chromium/WebViewChromium.java",
+ "java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java",
+ "java/src/com/android/webview/chromium/WebViewDatabaseAdapter.java",
+ "java/src/com/android/webview/chromium/WebViewDelegateFactory.java",
+ ]
+ }
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698