Index: build/config/android/internal_rules.gni |
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni |
index 0a8f64dfbf0853e9d70ae4d2a6c10ea31e96314b..ca5b1673a025b2bffccbe1f890f58b446804bbe0 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)) { |
pasko
2015/09/29 09:38:58
I am not familiar with the concept of invoker, is
pkotwicz
2015/09/29 18:56:32
The GN documentation is checked into the chromium
pasko
2015/09/29 20:14:26
thanks! now clearer
|
+ _android_manifest = invoker.android_manifest |
+ } |
+ assert(_android_manifest != "") # Mark as used. |
_run_findbugs = defined(invoker.run_findbugs) && invoker.run_findbugs |
assert(_run_findbugs || true) # Mark as used. |
@@ -1308,11 +1313,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 |