diff options
| author |  Adam Michael <ajmichael@google.com> | 2016-12-14 22:58:39 +0000 |
|---|---|---|
| committer |  John Cater <jcater@google.com> | 2016-12-15 20:36:45 +0000 |
| commit | 0b9ebfee8d7f3bd5cf68f4dba4790bf3fed9349d (patch) | |
| tree | 30beb455d497083a463fa866dd1f6ad9575fd26e /tools | |
| parent | e2beb245e6e962acb2690c5e0234cedcc5046523 (diff) | |
Rollback of commit 27cd7f6bb4a02f56f9ad73e57e71e69a1c00d5ea.
*** Reason for rollback ***
Rolling forward, intentionally breaking loading phase (and therefore `bazel fetch`) for android_binary in Bazel if no android_sdk_repository is set up.
Will not submit until Tensorflow's use case is cleaned up in https://github.com/tensorflow/tensorflow/pull/6225.
--
PiperOrigin-RevId: 142068703
MOS_MIGRATED_REVID=142068703
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/android/BUILD | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/android/BUILD b/tools/android/BUILD index e52829692a..fd58049bc1 100644 --- a/tools/android/BUILD +++ b/tools/android/BUILD @@ -65,14 +65,14 @@ alias( actual = "//src/tools/android/java/com/google/devtools/build/android/ziputils:mapper", ) -sh_binary( +alias( name = "dexbuilder", - srcs = ["fail.sh"], + actual = "//src/tools/android/java/com/google/devtools/build/android/dexer:DexBuilder", ) -sh_binary( +alias( name = "dexmerger", - srcs = ["fail.sh"], + actual = "//src/tools/android/java/com/google/devtools/build/android/dexer:DexFileMerger", ) sh_binary( |