Commit 1fdc5a35 authored by Andrew Grieve's avatar Andrew Grieve Committed by Commit Bot

Android: Remove junit_binary() android_manifest_path parameter

To be just "android_manifest", in order to match the name used
for this in other templates.

Change-Id: I6f7a5bf74c8257d82bc94da3622f1588d0769962
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1974471
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: default avatarSam Maier <smaier@chromium.org>
Commit-Queue: Sam Maier <smaier@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#726088}
parent 021283be
......@@ -1389,21 +1389,20 @@ if (enable_java_templates) {
# still use resources without having to explicitly set one.
if (defined(invoker.package_name)) {
_package_name = invoker.package_name
} else if (!defined(invoker.android_manifest_path)) {
} else if (!defined(invoker.android_manifest)) {
_package_name = "org.chromium.test"
}
_resource_arsc_output = "${target_gen_dir}/${target_name}.ap_"
_compile_resources_target = "${target_name}__compile_resources"
compile_resources(_compile_resources_target) {
forward_variables_from(invoker, [ "android_manifest" ])
deps = _deps + [ ":$_build_config_target_name" ]
build_config = _build_config
if (defined(_package_name)) {
rename_manifest_package = _package_name
}
if (defined(invoker.android_manifest_path)) {
android_manifest = invoker.android_manifest_path
} else {
if (!defined(android_manifest)) {
android_manifest = "//build/android/AndroidManifest.xml"
}
arsc_output = _resource_arsc_output
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment