diff options
author | 2015-06-16 06:42:41 +0000 | |
---|---|---|
committer | 2015-06-16 14:00:01 +0000 | |
commit | cc9ac3f152f24662691eba330234fbe70956bc78 (patch) | |
tree | db0fec783f6971b7c3e55737690974685821c68e /src/main/java/com/google/devtools/build/lib/Constants.java | |
parent | 551bb0973da646ae7b1a35878ee02c334156ccb6 (diff) |
Default Android dependencies to a //external: label with a default binding to //tools/android: .
This is useful because we can then eventually implement an android_tools_repository() rule that lets Bazel download the Android tools from somewhere instead of requiring it to be in every workspace with Android tools.
The number of tools here is somewhat scary, therefore, I'm considering creating an android_tools rule which would have an attribute for each of these things.
Some non-trivial things about this CL:
- The labels to load are removed from AndroidConfiguration because they would resolve to e.g. //external:dx_jar, which labels just don't exist and I don't want to add dummy //external:labels not prefixed with android_
- RedirectChaser is taught how to chase redirect through bind() rules because the Android SDK is now found by //external:android_sdk -> //tools/android:sdk -> @androidsdk//:sdk . Ideally, it would be ///external:android_sdk -> @androidsdk//:sdk, but I figured I'd not fix that in this CL.
--
MOS_MIGRATED_REVID=96080553
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/Constants.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/Constants.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/Constants.java b/src/main/java/com/google/devtools/build/lib/Constants.java index 1d214e98bd..60d21869c1 100644 --- a/src/main/java/com/google/devtools/build/lib/Constants.java +++ b/src/main/java/com/google/devtools/build/lib/Constants.java @@ -87,6 +87,7 @@ public class Constants { */ public static final ImmutableSet<String> IOS_DEVICE_RULE_CLASSES = ImmutableSet.of("ios_device"); - public static final String ANDROID_DEFAULT_SDK = "//tools/android:sdk".toString(); + public static final String ANDROID_DEFAULT_SDK = "//external:android_sdk".toString(); public static final boolean ANDROID_ALLOW_SDK_FILEGROUP = Boolean.valueOf(false); + public static final String ANDROID_DEP_PREFIX = "//external:android/".toString(); } |