diff options
author | 2015-08-25 12:34:20 +0000 | |
---|---|---|
committer | 2015-08-26 07:35:29 +0000 | |
commit | d5079a59bf85d298ec8598eb3f6b002accb297ce (patch) | |
tree | 697de1e55c2ab1aa23e62e8a2605a9b8f438df81 /src/main/java/com/google/devtools/build | |
parent | 4c43b0efc1ab0797682121edfe6e5da2493dc1ca (diff) |
Require an android_local_tools_repository stanza in the WORKSPACE file so that Bazel finds Android tools and update the tools themselves to handle their new location.
This paves the way for eventually referencing every tool this way.
We have to figure out if android_http_tools_repository is the right way to distribute the Android tools, but now that we don't have a binary distribution yet, it's not an immediate problem.
This will break existing users of Android support in Bazel, whom I'll inform over bazel-discuss.
Fixes #384.
--
MOS_MIGRATED_REVID=101456190
Diffstat (limited to 'src/main/java/com/google/devtools/build')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/bazel/rules/android/android.WORKSPACE | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android.WORKSPACE b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android.WORKSPACE index 27bbd95078..711409aaa6 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android.WORKSPACE +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android.WORKSPACE @@ -1,16 +1,16 @@ -bind(name = "android/proguard_whitelister", actual = "//tools/android:proguard_whitelister") -bind(name = "android/merge_manifests", actual = "//tools/android:merge_manifests") -bind(name = "android/build_incremental_dexmanifest", actual = "//tools/android:build_incremental_dexmanifest") -bind(name = "android/stubify_manifest", actual = "//tools/android:stubify_manifest") -bind(name = "android/incremental_install", actual = "//tools/android:incremental_install") -bind(name = "android/build_split_manifest", actual = "//tools/android:build_split_manifest") -bind(name = "android/strip_resources", actual = "//tools/android:strip_resources") -bind(name = "android/incremental_stub_application", actual = "//tools/android:incremental_stub_application") -bind(name = "android/incremental_split_stub_application", actual = "//tools/android:incremental_split_stub_application") -bind(name = "android/resources_processor", actual = "//tools/android:resources_processor") -bind(name = "android/aar_generator", actual = "//tools/android:aar_generator") -bind(name = "android/shuffle_jars", actual = "//tools/android:shuffle_jars") -bind(name = "android/merge_dexzips", actual = "//tools/android:merge_dexzips") +# bind(name = "android/proguard_whitelister", actual = "//tools/android:proguard_whitelister") +# bind(name = "android/merge_manifests", actual = "//tools/android:merge_manifests") +# bind(name = "android/build_incremental_dexmanifest", actual = "//tools/android:build_incremental_dexmanifest") +# bind(name = "android/stubify_manifest", actual = "//tools/android:stubify_manifest") +# bind(name = "android/incremental_install", actual = "//tools/android:incremental_install") +# bind(name = "android/build_split_manifest", actual = "//tools/android:build_split_manifest") +# bind(name = "android/strip_resources", actual = "//tools/android:strip_resources") +# bind(name = "android/incremental_stub_application", actual = "//tools/android:incremental_stub_application") +# bind(name = "android/incremental_split_stub_application", actual = "//tools/android:incremental_split_stub_application") +# bind(name = "android/resources_processor", actual = "//tools/android:resources_processor") +# bind(name = "android/aar_generator", actual = "//tools/android:aar_generator") +# bind(name = "android/shuffle_jars", actual = "//tools/android:shuffle_jars") +# bind(name = "android/merge_dexzips", actual = "//tools/android:merge_dexzips") bind(name = "android/sdk") bind(name = "android/crosstool", actual = "//tools/cpp:toolchain") bind(name = "android/appcompat_v4") |