| 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/sanitizers/sanitizers.gni") | 6 import("//build/config/sanitizers/sanitizers.gni") |
| 7 import("//build/config/zip.gni") | 7 import("//build/config/zip.gni") |
| 8 import("//third_party/ijar/ijar.gni") | 8 import("//third_party/ijar/ijar.gni") |
| 9 | 9 |
| 10 assert(is_android) | 10 assert(is_android) |
| (...skipping 835 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 846 _native_libs = [] | 846 _native_libs = [] |
| 847 if (defined(invoker.native_libs)) { | 847 if (defined(invoker.native_libs)) { |
| 848 _native_libs = invoker.native_libs | 848 _native_libs = invoker.native_libs |
| 849 } | 849 } |
| 850 _native_libs_even_when_incremental = [] | 850 _native_libs_even_when_incremental = [] |
| 851 if (defined(invoker.native_libs_even_when_incremental)) { | 851 if (defined(invoker.native_libs_even_when_incremental)) { |
| 852 _native_libs_even_when_incremental = | 852 _native_libs_even_when_incremental = |
| 853 invoker.native_libs_even_when_incremental | 853 invoker.native_libs_even_when_incremental |
| 854 } | 854 } |
| 855 | 855 |
| 856 # TODO(agrieve): Remove support for asset_location in favor of using | |
| 857 # android_assets() everywhere (http://crbug.com/547162). | |
| 858 if (defined(invoker.asset_location)) { | |
| 859 _asset_location = invoker.asset_location | |
| 860 assert(_asset_location != "") # Mark as used. | |
| 861 } | |
| 862 | |
| 863 _version_code = invoker.version_code | 856 _version_code = invoker.version_code |
| 864 _version_name = invoker.version_name | 857 _version_name = invoker.version_name |
| 865 assert(_version_code != -1) # Mark as used. | 858 assert(_version_code != -1) # Mark as used. |
| 866 assert(_version_name != "") # Mark as used. | 859 assert(_version_name != "") # Mark as used. |
| 867 | 860 |
| 868 _base_apk_path = _base_path + ".apk_intermediates" | 861 _base_apk_path = _base_path + ".apk_intermediates" |
| 869 | 862 |
| 870 _resource_packaged_apk_path = _base_apk_path + ".ap_" | 863 _resource_packaged_apk_path = _base_apk_path + ".ap_" |
| 871 _incremental_resource_packaged_apk_path = _base_apk_path + "_incremental.ap_" | 864 _incremental_resource_packaged_apk_path = _base_apk_path + "_incremental.ap_" |
| 872 _packaged_apk_path = _base_apk_path + ".unfinished.apk" | 865 _packaged_apk_path = _base_apk_path + ".unfinished.apk" |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 924 "--android-manifest", | 917 "--android-manifest", |
| 925 rebase_path(invoker.android_manifest, root_build_dir), | 918 rebase_path(invoker.android_manifest, root_build_dir), |
| 926 "--version-code", | 919 "--version-code", |
| 927 _version_code, | 920 _version_code, |
| 928 "--version-name", | 921 "--version-name", |
| 929 _version_name, | 922 _version_name, |
| 930 "--apk-path", | 923 "--apk-path", |
| 931 rebase_path(invoker.resource_packaged_apk_path, root_build_dir), | 924 rebase_path(invoker.resource_packaged_apk_path, root_build_dir), |
| 932 ] | 925 ] |
| 933 | 926 |
| 934 if (defined(_asset_location)) { | |
| 935 args += [ | |
| 936 "--asset-dir", | |
| 937 rebase_path(_asset_location, root_build_dir), | |
| 938 ] | |
| 939 } | |
| 940 if (defined(_resources_zip)) { | 927 if (defined(_resources_zip)) { |
| 941 args += [ | 928 args += [ |
| 942 "--resource-zips", | 929 "--resource-zips", |
| 943 rebase_path(_resources_zip, root_build_dir), | 930 rebase_path(_resources_zip, root_build_dir), |
| 944 ] | 931 ] |
| 945 } | 932 } |
| 946 if (_shared_resources) { | 933 if (_shared_resources) { |
| 947 args += [ "--shared-resources" ] | 934 args += [ "--shared-resources" ] |
| 948 } | 935 } |
| 949 if (_split_densities != []) { | 936 if (_split_densities != []) { |
| (...skipping 1072 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2022 ] | 2009 ] |
| 2023 args = [ | 2010 args = [ |
| 2024 "--depfile", | 2011 "--depfile", |
| 2025 rebase_path(depfile, root_build_dir), | 2012 rebase_path(depfile, root_build_dir), |
| 2026 "--script-output-path", | 2013 "--script-output-path", |
| 2027 rebase_path(generated_script, root_build_dir), | 2014 rebase_path(generated_script, root_build_dir), |
| 2028 ] | 2015 ] |
| 2029 args += test_runner_args | 2016 args += test_runner_args |
| 2030 } | 2017 } |
| 2031 } | 2018 } |
| OLD | NEW |