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

Side by Side Diff: chrome/android/BUILD.gn

Issue 1989283002: Upstream: Launch WebApkActivity from WebAPK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nits. Created 4 years, 6 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
« no previous file with comments | « no previous file | chrome/android/java/AndroidManifest.xml » ('j') | chrome/android/java_sources.gni » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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("//build_overrides/v8.gni") 7 import("//build_overrides/v8.gni")
8 import("//chrome/android/chrome_public_apk_tmpl.gni") 8 import("//chrome/android/chrome_public_apk_tmpl.gni")
9 import("//chrome/common/features.gni") 9 import("//chrome/common/features.gni")
10 import("//chrome/version.gni") 10 import("//chrome/version.gni")
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 "values-zh-rCN/android_chrome_strings.xml", 113 "values-zh-rCN/android_chrome_strings.xml",
114 "values-zh/android_chrome_strings.xml", 114 "values-zh/android_chrome_strings.xml",
115 ] 115 ]
116 } 116 }
117 117
118 # GYP: //chrome/chrome.gyp:chrome_java 118 # GYP: //chrome/chrome.gyp:chrome_java
119 android_library("chrome_java") { 119 android_library("chrome_java") {
120 deps = [ 120 deps = [
121 "//base:base_java", 121 "//base:base_java",
122 "//chrome/android/webapk/libs/client", 122 "//chrome/android/webapk/libs/client",
123 "//chrome/android/webapk/libs/common",
123 "//components/safe_json/android:safe_json_java", 124 "//components/safe_json/android:safe_json_java",
124 "//components/variations/android:variations_java", 125 "//components/variations/android:variations_java",
125 "//components/web_contents_delegate_android:web_contents_delegate_android_ja va", 126 "//components/web_contents_delegate_android:web_contents_delegate_android_ja va",
126 "//components/web_restrictions:web_restrictions_java", 127 "//components/web_restrictions:web_restrictions_java",
127 "//content/public/android:content_java", 128 "//content/public/android:content_java",
128 "//media/base/android:media_java", 129 "//media/base/android:media_java",
129 "//media/capture/video/android:capture_java", 130 "//media/capture/video/android:capture_java",
130 "//media/midi:midi_java", 131 "//media/midi:midi_java",
131 "//mojo/public/java:bindings", 132 "//mojo/public/java:bindings",
132 "//mojo/public/java:system", 133 "//mojo/public/java:system",
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 testonly = true 328 testonly = true
328 329
329 # From java_sources.gni. 330 # From java_sources.gni.
330 java_files = chrome_test_java_sources 331 java_files = chrome_test_java_sources
331 332
332 deps = [ 333 deps = [
333 "//base:base_java", 334 "//base:base_java",
334 "//base:base_java_test_support", 335 "//base:base_java_test_support",
335 "//chrome/android:chrome_java", 336 "//chrome/android:chrome_java",
336 "//chrome/android:chrome_java_resources", 337 "//chrome/android:chrome_java_resources",
338 "//chrome/android/webapk/libs/common",
337 "//chrome/test/android:chrome_java_test_support", 339 "//chrome/test/android:chrome_java_test_support",
338 "//components/bookmarks/common/android:bookmarks_java", 340 "//components/bookmarks/common/android:bookmarks_java",
339 "//components/dom_distiller/android:dom_distiller_core_java", 341 "//components/dom_distiller/android:dom_distiller_core_java",
340 "//components/gcm_driver/android:gcm_driver_java", 342 "//components/gcm_driver/android:gcm_driver_java",
341 "//components/invalidation/impl:java", 343 "//components/invalidation/impl:java",
342 "//components/invalidation/impl:javatests", 344 "//components/invalidation/impl:javatests",
343 "//components/navigation_interception/android:navigation_interception_java", 345 "//components/navigation_interception/android:navigation_interception_java",
344 "//components/policy/android:policy_java", 346 "//components/policy/android:policy_java",
345 "//components/precache/android:precache_java", 347 "//components/precache/android:precache_java",
346 "//components/precache/android:precache_javatests", 348 "//components/precache/android:precache_javatests",
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
598 instrumentation_test_apk("chrome_sync_shell_test_apk") { 600 instrumentation_test_apk("chrome_sync_shell_test_apk") {
599 apk_name = "ChromeSyncShellTest" 601 apk_name = "ChromeSyncShellTest"
600 apk_under_test = ":chrome_sync_shell_apk" 602 apk_under_test = ":chrome_sync_shell_apk"
601 android_manifest = chrome_sync_shell_test_apk_manifest 603 android_manifest = chrome_sync_shell_test_apk_manifest
602 deps = [ 604 deps = [
603 ":chrome_sync_shell_test_apk_java", 605 ":chrome_sync_shell_test_apk_java",
604 ":chrome_sync_shell_test_apk_manifest", 606 ":chrome_sync_shell_test_apk_manifest",
605 ] 607 ]
606 proguard_enabled = !is_debug 608 proguard_enabled = !is_debug
607 } 609 }
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/AndroidManifest.xml » ('j') | chrome/android/java_sources.gni » ('J')

Powered by Google App Engine
This is Rietveld 408576698