Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2038)

Unified Diff: build/config/android/internal_rules.gni

Issue 1236643002: GN: Fix input not defined by deps issue with //build/android:sun_tools_java (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/android/internal_rules.gni
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
index 630d0e69a22348632b9ea1d7e4f33886e0f46732..8f9260d00a26fde706d1125db791ccb3e5fea811 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -834,6 +834,10 @@ template("java_prebuilt_impl") {
if (_supports_android) {
_dex_path = _base_path + ".dex.jar"
}
+ _deps = []
+ if (defined(invoker.deps)) {
+ _deps = invoker.deps
+ }
_template_name = target_name
@@ -849,10 +853,7 @@ template("java_prebuilt_impl") {
requires_android =
defined(invoker.requires_android) && invoker.requires_android
- deps = []
- if (defined(invoker.deps)) {
- deps += invoker.deps
- }
+ deps = _deps
build_config = _build_config
jar_path = _jar_path
if (_supports_android) {
@@ -875,9 +876,7 @@ template("java_prebuilt_impl") {
input_jar_path = invoker.jar_path
output_jar_path = _jar_path
- deps = [
- ":$build_config_target_name",
- ]
+ deps = [ ":$build_config_target_name" ] + _deps
}
if (_supports_android) {
« no previous file with comments | « build/android/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698