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

Side by Side Diff: content/shell/android/BUILD.gn

Issue 1410643013: GN: Fix references to $root_build_dir/natives_blob.bin -> $root_out_dir (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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 | « components/html_viewer/BUILD.gn ('k') | gin/BUILD.gn » ('j') | no next file with comments »
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("//third_party/icu/config.gni") 8 import("//third_party/icu/config.gni")
9 9
10 generate_jni("content_shell_jni_headers") { 10 generate_jni("content_shell_jni_headers") {
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 deps = [ 96 deps = [
97 "//content/shell:pak", 97 "//content/shell:pak",
98 ] 98 ]
99 99
100 if (icu_use_data_file) { 100 if (icu_use_data_file) {
101 sources += [ "$root_build_dir/icudtl.dat" ] 101 sources += [ "$root_build_dir/icudtl.dat" ]
102 deps += [ "//third_party/icu:icudata" ] 102 deps += [ "//third_party/icu:icudata" ]
103 } 103 }
104 if (v8_use_external_startup_data) { 104 if (v8_use_external_startup_data) {
105 sources += [ 105 sources += [
106 "$root_build_dir/natives_blob.bin", 106 "$root_out_dir/natives_blob.bin",
107 "$root_build_dir/snapshot_blob.bin", 107 "$root_out_dir/snapshot_blob.bin",
108 ] 108 ]
109 deps += [ "//v8" ] 109 deps += [ "//v8" ]
110 } 110 }
111 } 111 }
112 112
113 android_apk("content_shell_apk") { 113 android_apk("content_shell_apk") {
114 testonly = true 114 testonly = true
115 data_deps = [ 115 data_deps = [
116 # "//tools/android/forwarder", 116 # "//tools/android/forwarder",
117 ] 117 ]
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 ] 152 ]
153 DEPRECATED_java_in_dir = "javatests/src" 153 DEPRECATED_java_in_dir = "javatests/src"
154 } 154 }
155 155
156 instrumentation_test_apk("content_shell_test_apk") { 156 instrumentation_test_apk("content_shell_test_apk") {
157 deps = [ 157 deps = [
158 "//content/public/android:content_javatests", 158 "//content/public/android:content_javatests",
159 "//base:base_javatests", 159 "//base:base_javatests",
160 "//net/android:net_javatests", 160 "//net/android:net_javatests",
161 ] 161 ]
162 data_deps = [ ":content_shell_apk" ] 162 data_deps = [
163 ":content_shell_apk",
164 ]
163 apk_under_test = ":content_shell_apk" 165 apk_under_test = ":content_shell_apk"
164 apk_name = "ContentShellTest" 166 apk_name = "ContentShellTest"
165 android_manifest = "javatests/AndroidManifest.xml" 167 android_manifest = "javatests/AndroidManifest.xml"
166 isolate_file = "../../content_shell_test_apk.isolate" 168 isolate_file = "../../content_shell_test_apk.isolate"
167 } 169 }
168 170
169 if (current_cpu != "x64") { 171 if (current_cpu != "x64") {
170 chromium_linker_test_manifest = 172 chromium_linker_test_manifest =
171 "$target_gen_dir/linker_test_apk/AndroidManifest.xml" 173 "$target_gen_dir/linker_test_apk/AndroidManifest.xml"
172 174
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 231
230 # GYP: //content/content_tests.gypi:chromium_android_linker_test_jni_headers 232 # GYP: //content/content_tests.gypi:chromium_android_linker_test_jni_headers
231 generate_jni("linker_test_jni_headers") { 233 generate_jni("linker_test_jni_headers") {
232 testonly = true 234 testonly = true
233 jni_package = "content/shell" 235 jni_package = "content/shell"
234 sources = [ 236 sources = [
235 "linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.jav a", 237 "linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.jav a",
236 ] 238 ]
237 } 239 }
238 } 240 }
OLDNEW
« no previous file with comments | « components/html_viewer/BUILD.gn ('k') | gin/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698