| Index: build/config/android/rules.gni
|
| diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
|
| index f83d92f1d8c77b2b47312caccedc074dbb9ef20d..b895c1948b4a0a9ec93c4e0c91d16ad250d122ed 100644
|
| --- a/build/config/android/rules.gni
|
| +++ b/build/config/android/rules.gni
|
| @@ -1428,6 +1428,8 @@ template("android_apk") {
|
| # (which will be correct unless that target specifies an "output_name".
|
| # TODO(brettw) make this automatic by allowing get_target_outputs to
|
| # support executables.
|
| +# apk_name: The name of the produced apk. If unspecified, it uses the name
|
| +# of the unittests_dep target postfixed with "_apk"
|
| #
|
| # Example
|
| # unittest_apk("foo_unittests_apk") {
|
| @@ -1447,8 +1449,14 @@ template("unittest_apk") {
|
| unittests_binary = "lib" + test_suite_name + ".so"
|
| }
|
|
|
| + if (defined(invoker.apk_name)) {
|
| + apk_name = invoker.apk_name
|
| + } else {
|
| + apk_name = test_suite_name
|
| + }
|
| +
|
| android_apk(target_name) {
|
| - _apk_name = test_suite_name
|
| + _apk_name = apk_name
|
| final_apk_path = "$root_build_dir/${_apk_name}_apk/${_apk_name}-debug.apk"
|
| java_files = [ "//testing/android/java/src/org/chromium/native_test/ChromeNativeTestActivity.java" ]
|
| android_manifest = "//testing/android/java/AndroidManifest.xml"
|
|
|