Index: build/config/android/internal_rules.gni |
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni |
index 4ff6f3995a97e63cad4ef18868f28223a5bd9d7b..3c70ae4d89b1bbe9123c91b3246d1715fc82834a 100644 |
--- a/build/config/android/internal_rules.gni |
+++ b/build/config/android/internal_rules.gni |
@@ -1185,6 +1185,11 @@ template("java_library_impl") { |
_requires_android = |
defined(invoker.requires_android) && invoker.requires_android |
assert(_requires_android || true) # Mark as used. |
+ _android_manifest = "//build/android/AndroidManifest.xml" |
+ if (defined(invoker.android_manifest)) { |
+ _android_manifest = invoker.android_manifest |
+ } |
+ assert(_android_manifest != "") # Mark as used. |
_run_findbugs = false |
if (defined(invoker.run_findbugs)) { |
_run_findbugs = invoker.run_findbugs |
@@ -1311,11 +1316,6 @@ template("java_library_impl") { |
if (_supports_android) { |
if (defined(invoker.chromium_code) && invoker.chromium_code) { |
- _android_manifest = "//build/android/AndroidManifest.xml" |
- if (defined(invoker.android_manifest)) { |
- _android_manifest = invoker.android_manifest |
- } |
- |
_final_datadeps += [ ":${_template_name}__lint" ] |
android_lint("${_template_name}__lint") { |
android_manifest = _android_manifest |