| OLD | NEW |
| 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/android/chrome_public_apk_tmpl.gni") | 8 import("//chrome/android/chrome_public_apk_tmpl.gni") |
| 9 import("//chrome/version.gni") | 9 import("//chrome/version.gni") |
| 10 import("//testing/test.gni") | 10 import("//testing/test.gni") |
| (...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 340 # Overrides icon / name defined in chrome_java_resources. | 340 # Overrides icon / name defined in chrome_java_resources. |
| 341 android_resources("chrome_public_apk_resources") { | 341 android_resources("chrome_public_apk_resources") { |
| 342 resource_dirs = [ "java/res_chromium" ] | 342 resource_dirs = [ "java/res_chromium" ] |
| 343 | 343 |
| 344 # Dep needed to ensure override works properly. | 344 # Dep needed to ensure override works properly. |
| 345 deps = [ | 345 deps = [ |
| 346 ":chrome_java_resources", | 346 ":chrome_java_resources", |
| 347 ] | 347 ] |
| 348 } | 348 } |
| 349 | 349 |
| 350 copy_ex("chrome_public_apk_assets") { | 350 android_assets("chrome_public_apk_assets") { |
| 351 clear_dir = true | |
| 352 dest = "$root_build_dir/chrome_public_apk_assets" | |
| 353 sources = chrome_android_paks_gypi.chrome_android_pak_input_resources | 351 sources = chrome_android_paks_gypi.chrome_android_pak_input_resources |
| 354 if (icu_use_data_file) { | 352 sources += [ "$root_build_dir/resources.pak" ] |
| 355 sources += [ "$root_build_dir/icudtl.dat" ] | 353 disable_compression = true |
| 356 } | 354 |
| 357 deps = [ | 355 deps = [ |
| 358 "//chrome:packed_extra_resources", | 356 "//chrome:packed_extra_resources", |
| 359 "//chrome:packed_resources", | 357 "//chrome:packed_resources", |
| 360 "//third_party/icu:icudata", | 358 "//third_party/icu:icu_assets", |
| 359 "//v8:v8_external_startup_data_assets", |
| 361 ] | 360 ] |
| 362 | |
| 363 if (v8_use_external_startup_data) { | |
| 364 renaming_sources = v8_external_startup_data_renaming_sources | |
| 365 renaming_destinations = v8_external_startup_data_renaming_destinations | |
| 366 deps += [ "//v8" ] | |
| 367 } | |
| 368 | |
| 369 sources += [ "$root_build_dir/resources.pak" ] | |
| 370 } | 361 } |
| 371 | 362 |
| 372 # GYP: //chrome/android/chrome_apk.gyp:chrome_apk_manifest | 363 # GYP: //chrome/android/chrome_apk.gyp:chrome_apk_manifest |
| 373 jinja_template("chrome_public_apk_manifest") { | 364 jinja_template("chrome_public_apk_manifest") { |
| 374 input = "java/AndroidManifest.xml" | 365 input = "java/AndroidManifest.xml" |
| 375 output = "$root_gen_dir/chrome_public_apk_manifest/AndroidManifest.xml" | 366 output = "$root_gen_dir/chrome_public_apk_manifest/AndroidManifest.xml" |
| 376 variables = jinja_variables | 367 variables = jinja_variables |
| 377 variables += [ | 368 variables += [ |
| 378 "min_sdk_version=16", | 369 "min_sdk_version=16", |
| 379 "target_sdk_version=23", | 370 "target_sdk_version=23", |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 458 # TODO(GYP,cjhopman): Does this need version code/name? | 449 # TODO(GYP,cjhopman): Does this need version code/name? |
| 459 apk_name = "ChromePublicTest" | 450 apk_name = "ChromePublicTest" |
| 460 apk_under_test = ":chrome_public_apk" | 451 apk_under_test = ":chrome_public_apk" |
| 461 android_manifest = chrome_public_test_apk_manifest | 452 android_manifest = chrome_public_test_apk_manifest |
| 462 deps = [ | 453 deps = [ |
| 463 ":chrome_public_test_apk_manifest", | 454 ":chrome_public_test_apk_manifest", |
| 464 "//chrome/android:chrome_shared_test_java", | 455 "//chrome/android:chrome_shared_test_java", |
| 465 ] | 456 ] |
| 466 isolate_file = "../chrome_public_test_apk.isolate" | 457 isolate_file = "../chrome_public_test_apk.isolate" |
| 467 } | 458 } |
| OLD | NEW |