| 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/module_args/v8.gni") | 7 import("//build/module_args/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 353 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 364 chrome_shell_manifest = | 364 chrome_shell_manifest = |
| 365 "$target_gen_dir/chrome_shell_manifest/AndroidManifest.xml" | 365 "$target_gen_dir/chrome_shell_manifest/AndroidManifest.xml" |
| 366 | 366 |
| 367 # GYP: //chrome/chrome_shell.gypi:chrome_shell_manifest | 367 # GYP: //chrome/chrome_shell.gypi:chrome_shell_manifest |
| 368 jinja_template("chrome_shell_manifest") { | 368 jinja_template("chrome_shell_manifest") { |
| 369 testonly = true | 369 testonly = true |
| 370 input = "shell/java/AndroidManifest.xml.jinja2" | 370 input = "shell/java/AndroidManifest.xml.jinja2" |
| 371 output = chrome_shell_manifest | 371 output = chrome_shell_manifest |
| 372 } | 372 } |
| 373 | 373 |
| 374 # TODO(cjhopman): This should actually be done as a build step instead of at gn | |
| 375 # time. | |
| 376 _version_py_path = "//build/util/version.py" | |
| 377 _chrome_version_path = "//chrome/VERSION" | |
| 378 _version_full = exec_script(_version_py_path, | |
| 379 [ | |
| 380 "-f", | |
| 381 rebase_path(_chrome_version_path, root_build_dir), | |
| 382 "-t \"@MAJOR@.@MINOR@.@BUILD@.@PATCH@\"", | |
| 383 ], | |
| 384 "value", | |
| 385 [ _chrome_version_path ]) | |
| 386 | |
| 387 # GYP: //chrome/chrome_shell.gypi:chrome_shell_apk | 374 # GYP: //chrome/chrome_shell.gypi:chrome_shell_apk |
| 388 android_apk("chrome_shell_apk") { | 375 android_apk("chrome_shell_apk") { |
| 389 testonly = true | 376 testonly = true |
| 390 deps = [ | 377 deps = [ |
| 391 ":chrome_shell", | 378 ":chrome_shell", |
| 392 ":chrome_shell_assets", | 379 ":chrome_shell_assets", |
| 393 ":chrome_shell_java", | 380 ":chrome_shell_java", |
| 394 ":chrome_shell_manifest", | 381 ":chrome_shell_manifest", |
| 395 ":chrome_shell_resources", | 382 ":chrome_shell_resources", |
| 396 "//base:base_java", | 383 "//base:base_java", |
| 397 ] | 384 ] |
| 398 apk_name = "ChromeShell" | 385 apk_name = "ChromeShell" |
| 399 android_manifest = chrome_shell_manifest | 386 android_manifest = chrome_shell_manifest |
| 400 native_libs = [ "libchrome_shell.so" ] | 387 native_libs = [ "libchrome_shell.so" ] |
| 401 native_lib_version_name = _version_full | 388 native_lib_version_rule = "//build/util:chrome_version_json" |
| 389 _native_lib_file = |
| 390 rebase_path("$root_gen_dir/CHROME_VERSION.json", root_out_dir) |
| 391 native_lib_version_arg = "@FileArg($_native_lib_file:full-quoted)" |
| 402 asset_location = chrome_shell_assets_dir | 392 asset_location = chrome_shell_assets_dir |
| 403 | 393 |
| 404 #TODO(GYP): | 394 #TODO(GYP): |
| 405 #'variables': { | 395 #'variables': { |
| 406 #'conditions': [ | 396 #'conditions': [ |
| 407 #['component != "shared_library" and target_arch != "arm64" and target_arch !=
"x64" and profiling_full_stack_frames != 1', { | 397 #['component != "shared_library" and target_arch != "arm64" and target_arch !=
"x64" and profiling_full_stack_frames != 1', { |
| 408 ## Only enable the chromium linker on regular builds, since the | 398 ## Only enable the chromium linker on regular builds, since the |
| 409 ## component build crashes on Android 4.4. See b/11379966 | 399 ## component build crashes on Android 4.4. See b/11379966 |
| 410 #'use_chromium_linker': '1', | 400 #'use_chromium_linker': '1', |
| 411 #}], | 401 #}], |
| (...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 711 #], | 701 #], |
| 712 } | 702 } |
| 713 | 703 |
| 714 android_apk("chrome_public_apk") { | 704 android_apk("chrome_public_apk") { |
| 715 version_name = "Developer Build" | 705 version_name = "Developer Build" |
| 716 version_code = "1" | 706 version_code = "1" |
| 717 android_manifest = get_target_outputs(":chrome_public_apk_manifest") | 707 android_manifest = get_target_outputs(":chrome_public_apk_manifest") |
| 718 android_manifest = android_manifest[1] | 708 android_manifest = android_manifest[1] |
| 719 apk_name = "ChromePublic" | 709 apk_name = "ChromePublic" |
| 720 native_libs = [ "$root_build_dir/lib.stripped/libchrome_public.so" ] | 710 native_libs = [ "$root_build_dir/lib.stripped/libchrome_public.so" ] |
| 721 native_lib_version_name = _version_full | 711 native_lib_version_rule = "//build/util:chrome_version_json" |
| 712 _native_lib_file = |
| 713 rebase_path("$root_gen_dir/CHROME_VERSION.json", root_out_dir) |
| 714 native_lib_version_arg = "@FileArg($_native_lib_file:full-quoted)" |
| 722 asset_location = chrome_public_apk_assets_dir | 715 asset_location = chrome_public_apk_assets_dir |
| 723 | 716 |
| 724 deps = [ | 717 deps = [ |
| 725 ":chrome_java", | 718 ":chrome_java", |
| 726 ":chrome_java_resources", | 719 ":chrome_java_resources", |
| 727 ":chrome_public", | 720 ":chrome_public", |
| 728 ":chrome_public_apk_assets", | 721 ":chrome_public_apk_assets", |
| 729 ":chrome_public_apk_manifest", | 722 ":chrome_public_apk_manifest", |
| 730 ":chrome_public_template_resources", | 723 ":chrome_public_template_resources", |
| 731 "//base:base_java", | 724 "//base:base_java", |
| (...skipping 16 matching lines...) Expand all Loading... |
| 748 # TODO(GYP,cjhopman): Does this need version code/name? | 741 # TODO(GYP,cjhopman): Does this need version code/name? |
| 749 apk_name = "ChromePublicTest" | 742 apk_name = "ChromePublicTest" |
| 750 apk_under_test = ":chrome_public_apk" | 743 apk_under_test = ":chrome_public_apk" |
| 751 android_manifest = chrome_public_test_apk_manifest | 744 android_manifest = chrome_public_test_apk_manifest |
| 752 deps = [ | 745 deps = [ |
| 753 ":chrome_public_test_apk_manifest", | 746 ":chrome_public_test_apk_manifest", |
| 754 "//chrome/android:chrome_shared_test_java", | 747 "//chrome/android:chrome_shared_test_java", |
| 755 ] | 748 ] |
| 756 isolate_file = "../chrome_public_test_apk.isolate" | 749 isolate_file = "../chrome_public_test_apk.isolate" |
| 757 } | 750 } |
| OLD | NEW |