diff options
| author |  Lukacs Berki <lberki@google.com> | 2015-06-12 07:34:02 +0000 |
|---|---|---|
| committer |  Philipp Wollermann <philwo@google.com> | 2015-06-12 11:52:33 +0000 |
| commit | 7586c8b1e1918f7e6cac588ccddc4e811c104774 (patch) | |
| tree | b5d31d3c1174792587e02bfa6169385a3c939e23 /src/main/java/com/google/devtools/build/lib/Constants.java | |
| parent | 2e4c2aa834542c7979c96936e3e70666f688dc25 (diff) | |
Various odds and ends in preparation for adding the Android rules to BazelRuleClassProvider:
- Add stub targets to tools/android/BUILD
- Make Constants.ANDROID_DEFAULT_SDK non-constant so that the classfile can be replaced in the .jar
- Make AndroidTools complain if --android_sdk does not point to an android_sdk rule.
- Make the default visibility in the BUILD file generated by android_sdk_repository public
--
MOS_MIGRATED_REVID=95816158
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 9e18b64544..1d214e98bd 100644 --- a/src/main/java/com/google/devtools/build/lib/Constants.java +++ b/src/main/java/com/google/devtools/build/lib/Constants.java @@ -87,5 +87,6 @@ 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"; + public static final String ANDROID_DEFAULT_SDK = "//tools/android:sdk".toString(); + public static final boolean ANDROID_ALLOW_SDK_FILEGROUP = Boolean.valueOf(false); } |