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

Side by Side Diff: chrome/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 | « no previous file | components/html_viewer/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("//chrome/version.gni") 8 import("//chrome/version.gni")
9 import("//testing/test.gni") 9 import("//testing/test.gni")
10 import("//third_party/icu/config.gni") 10 import("//third_party/icu/config.gni")
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 sources += [ "$root_build_dir/icudtl.dat" ] 339 sources += [ "$root_build_dir/icudtl.dat" ]
340 } 340 }
341 deps = [ 341 deps = [
342 "//chrome:packed_extra_resources", 342 "//chrome:packed_extra_resources",
343 "//chrome:packed_resources", 343 "//chrome:packed_resources",
344 "//third_party/icu:icudata", 344 "//third_party/icu:icudata",
345 ] 345 ]
346 346
347 if (v8_use_external_startup_data) { 347 if (v8_use_external_startup_data) {
348 sources += [ 348 sources += [
349 "$root_build_dir/natives_blob.bin", 349 "$root_out_dir/natives_blob.bin",
350 "$root_build_dir/snapshot_blob.bin", 350 "$root_out_dir/snapshot_blob.bin",
351 ] 351 ]
352 deps += [ "//v8" ] 352 deps += [ "//v8" ]
353 } 353 }
354 354
355 sources += [ "$root_build_dir/resources.pak" ] 355 sources += [ "$root_build_dir/resources.pak" ]
356 } 356 }
357 357
358 # GYP: //chrome/android/chrome_apk.gyp:chrome_apk_manifest 358 # GYP: //chrome/android/chrome_apk.gyp:chrome_apk_manifest
359 jinja_template("chrome_public_apk_manifest") { 359 jinja_template("chrome_public_apk_manifest") {
360 input = "java/AndroidManifest.xml" 360 input = "java/AndroidManifest.xml"
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
440 # TODO(GYP,cjhopman): Does this need version code/name? 440 # TODO(GYP,cjhopman): Does this need version code/name?
441 apk_name = "ChromePublicTest" 441 apk_name = "ChromePublicTest"
442 apk_under_test = ":chrome_public_apk" 442 apk_under_test = ":chrome_public_apk"
443 android_manifest = chrome_public_test_apk_manifest 443 android_manifest = chrome_public_test_apk_manifest
444 deps = [ 444 deps = [
445 ":chrome_public_test_apk_manifest", 445 ":chrome_public_test_apk_manifest",
446 "//chrome/android:chrome_shared_test_java", 446 "//chrome/android:chrome_shared_test_java",
447 ] 447 ]
448 isolate_file = "../chrome_public_test_apk.isolate" 448 isolate_file = "../chrome_public_test_apk.isolate"
449 } 449 }
OLDNEW
« no previous file with comments | « no previous file | components/html_viewer/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698