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

Side by Side Diff: android_webview/glue/BUILD.gn

Issue 2180423003: aw: Fix FactoryProvider threading (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 unified diff | Download patch
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/android/config.gni") 5 import("//build/config/android/config.gni")
6 import("//build/config/android/rules.gni") 6 import("//build/config/android/rules.gni")
7 import("generate_resource_rewriter.gni") 7 import("generate_resource_rewriter.gni")
8 import("glue.gni") 8 import("glue.gni")
9 9
10 # There are two copies of this file: one upstream and one downstream, 10 # There are two copies of this file: one upstream and one downstream,
(...skipping 23 matching lines...) Expand all
34 34
35 generate_resource_rewriter("glue_resource_rewriter") { 35 generate_resource_rewriter("glue_resource_rewriter") {
36 # Change deps? please modify glue_library_deps variable. 36 # Change deps? please modify glue_library_deps variable.
37 deps = glue_library_deps 37 deps = glue_library_deps
38 package_name = "com.android.webview.chromium" 38 package_name = "com.android.webview.chromium"
39 } 39 }
40 40
41 android_library("glue") { 41 android_library("glue") {
42 # Change deps? please modify glue_library_deps variable. 42 # Change deps? please modify glue_library_deps variable.
43 deps = glue_library_deps 43 deps = glue_library_deps
44 srcjar_deps = [ ":glue_resource_rewriter" ] 44 srcjar_deps = [
45 ":glue_resource_rewriter",
46 "//base:base_build_config_gen",
boliu 2016/07/27 05:30:26 for BuildConfig
47 ]
45 48
46 # Always build upstream or downstream target with public or internal 49 # Always build upstream or downstream target with public or internal
47 # framework jar respectively. 50 # framework jar respectively.
48 if (is_upstream) { 51 if (is_upstream) {
49 alternative_android_sdk_ijar_dep = ":public_framework_ijar" 52 alternative_android_sdk_ijar_dep = ":public_framework_ijar"
50 _ijar = webview_public_framework_ijar 53 _ijar = webview_public_framework_ijar
51 } else { 54 } else {
52 assert(defined(webview_internal_framework_jar)) 55 assert(defined(webview_internal_framework_jar))
53 alternative_android_sdk_ijar_dep = ":framework_ijar" 56 alternative_android_sdk_ijar_dep = ":framework_ijar"
54 _ijar = webview_framework_ijar 57 _ijar = webview_framework_ijar
(...skipping 13 matching lines...) Expand all
68 "java/src/com/android/webview/chromium/WebIconDatabaseAdapter.java", 71 "java/src/com/android/webview/chromium/WebIconDatabaseAdapter.java",
69 "java/src/com/android/webview/chromium/WebMessagePortAdapter.java", 72 "java/src/com/android/webview/chromium/WebMessagePortAdapter.java",
70 "java/src/com/android/webview/chromium/WebStorageAdapter.java", 73 "java/src/com/android/webview/chromium/WebStorageAdapter.java",
71 "java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java", 74 "java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java",
72 "java/src/com/android/webview/chromium/WebViewChromium.java", 75 "java/src/com/android/webview/chromium/WebViewChromium.java",
73 "java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java", 76 "java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java",
74 "java/src/com/android/webview/chromium/WebViewDatabaseAdapter.java", 77 "java/src/com/android/webview/chromium/WebViewDatabaseAdapter.java",
75 "java/src/com/android/webview/chromium/WebViewDelegateFactory.java", 78 "java/src/com/android/webview/chromium/WebViewDelegateFactory.java",
76 ] 79 ]
77 } 80 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698