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

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

Issue 1422793004: Reland Reland Switch Chrome Android using v8 arch specific external data name (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 | « build_overrides/v8.gni ('k') | chrome/chrome_android_paks.gypi » ('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 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 if (icu_use_data_file) { 349 if (icu_use_data_file) {
350 sources += [ "$root_build_dir/icudtl.dat" ] 350 sources += [ "$root_build_dir/icudtl.dat" ]
351 } 351 }
352 deps = [ 352 deps = [
353 "//chrome:packed_extra_resources", 353 "//chrome:packed_extra_resources",
354 "//chrome:packed_resources", 354 "//chrome:packed_resources",
355 "//third_party/icu:icudata", 355 "//third_party/icu:icudata",
356 ] 356 ]
357 357
358 if (v8_use_external_startup_data) { 358 if (v8_use_external_startup_data) {
359 sources += [ 359 renaming_sources = v8_external_startup_data_renaming_sources
360 "$root_out_dir/natives_blob.bin", 360 renaming_destinations = v8_external_startup_data_renaming_destinations
361 "$root_out_dir/snapshot_blob.bin",
362 ]
363 deps += [ "//v8" ] 361 deps += [ "//v8" ]
364 } 362 }
365 363
366 sources += [ "$root_build_dir/resources.pak" ] 364 sources += [ "$root_build_dir/resources.pak" ]
367 } 365 }
368 366
369 # GYP: //chrome/android/chrome_apk.gyp:chrome_apk_manifest 367 # GYP: //chrome/android/chrome_apk.gyp:chrome_apk_manifest
370 jinja_template("chrome_public_apk_manifest") { 368 jinja_template("chrome_public_apk_manifest") {
371 input = "java/AndroidManifest.xml" 369 input = "java/AndroidManifest.xml"
372 output = "$root_gen_dir/chrome_public_apk_manifest/AndroidManifest.xml" 370 output = "$root_gen_dir/chrome_public_apk_manifest/AndroidManifest.xml"
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
451 # TODO(GYP,cjhopman): Does this need version code/name? 449 # TODO(GYP,cjhopman): Does this need version code/name?
452 apk_name = "ChromePublicTest" 450 apk_name = "ChromePublicTest"
453 apk_under_test = ":chrome_public_apk" 451 apk_under_test = ":chrome_public_apk"
454 android_manifest = chrome_public_test_apk_manifest 452 android_manifest = chrome_public_test_apk_manifest
455 deps = [ 453 deps = [
456 ":chrome_public_test_apk_manifest", 454 ":chrome_public_test_apk_manifest",
457 "//chrome/android:chrome_shared_test_java", 455 "//chrome/android:chrome_shared_test_java",
458 ] 456 ]
459 isolate_file = "../chrome_public_test_apk.isolate" 457 isolate_file = "../chrome_public_test_apk.isolate"
460 } 458 }
OLDNEW
« no previous file with comments | « build_overrides/v8.gni ('k') | chrome/chrome_android_paks.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698