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

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

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