aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/protobuf
diff options
context:
space:
mode:
authorGravatar ajmichael <ajmichael@google.com>2017-04-04 14:54:14 +0000
committerGravatar Damien Martin-Guillerez <dmarting@google.com>2017-04-04 18:39:31 +0200
commit0297702d9533142e6c326660f913899d25b89b5d (patch)
tree3dc2f7e79a783aa1d8a30d31e160971eafef0eed /src/main/protobuf
parenta00c6249a7dea381a384e13c336c61211ac83965 (diff)
Remove jack support and make jack/jill attributes of android_sdk optional.
Closes https://github.com/bazelbuild/bazel/issues/1391. RELNOTES: Removed --experimental_use_jack_for_dexing and libname.jack output of android_library. PiperOrigin-RevId: 152131075
Diffstat (limited to 'src/main/protobuf')
-rw-r--r--src/main/protobuf/apk_manifest.proto4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/main/protobuf/apk_manifest.proto b/src/main/protobuf/apk_manifest.proto
index 7b58e507e9..f638450381 100644
--- a/src/main/protobuf/apk_manifest.proto
+++ b/src/main/protobuf/apk_manifest.proto
@@ -38,8 +38,6 @@ message AndroidSdk {
string annotations_jar = 5;
string dx = 7;
string framework_aidl = 8;
- string jack = 9;
- string jill = 10;
string main_dex_classes = 11;
string main_dex_list_creator = 12;
string proguard = 13;
@@ -50,7 +48,7 @@ message AndroidSdk {
string apksigner = 18;
// Deprecated tag numbers.
- reserved 6;
+ reserved 6, 9, 10;
}
// Information about a resource referenced from AndroidManifest.xml.