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

Unified Diff: chrome/android/BUILD.gn

Issue 1149893018: Fixes for GN Android build inputs/outputs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 | « build/config/android/rules.gni ('k') | components/resource_provider/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/BUILD.gn
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 2e35d50e7ae16fbaec4f8145665bc1b3de3d5097..1a80141e23f93a16aed96602b24999f47f401f48 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -220,9 +220,7 @@ shared_library("chrome_sync_shell") {
deps = [
"//sync:test_support_sync_fake_server_android",
]
- datadeps = [
- ":chrome_shell_base",
- ]
+ data_deps = [ ":chrome_shell_base" ]
}
# GYP: N/A
@@ -471,9 +469,7 @@ android_apk("chrome_shell_test_apk") {
"//testing/android/broker:broker_java",
"//ui/android:ui_javatests",
]
- datadeps = [
- "//testing/android/driver:driver_apk",
- ]
+ data_deps = [ "//testing/android/driver:driver_apk" ]
apk_name = "ChromeShellTest"
android_manifest = "shell/javatests/AndroidManifest.xml"
}
@@ -742,12 +738,18 @@ copy_ex("chrome_public_apk_assets") {
if (icu_use_data_file) {
sources += [ "$root_build_dir/icudtl.dat" ]
}
+ deps = [
+ "//chrome:packed_extra_resources",
+ "//chrome:packed_resources",
+ "//third_party/icu:icudata",
+ ]
if (v8_use_external_startup_data) {
sources += [
"$root_build_dir/natives_blob.bin",
"$root_build_dir/snapshot_blob.bin",
]
+ deps += [ "//v8" ]
}
sources += [ "$root_build_dir/resources.pak" ]
« no previous file with comments | « build/config/android/rules.gni ('k') | components/resource_provider/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698