aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/protobuf
diff options
context:
space:
mode:
authorGravatar ajmichael <ajmichael@google.com>2017-03-30 18:51:57 +0000
committerGravatar Philipp Wollermann <philwo@google.com>2017-03-31 17:10:38 +0200
commit32aa729cca22d876d3365f5e4ff6e034d339b08c (patch)
tree13f3a1d9aee6d7dff7c620b9471c1935f1bab9b6 /src/main/protobuf
parent20c41d03ea798ced1e9f873e040a52b28974bb18 (diff)
Make apkbuilder attribute of android_sdk optional.
This change is one step towards removing --nouse_singlejar_apkbuilder. RELNOTES: None PiperOrigin-RevId: 151730390
Diffstat (limited to 'src/main/protobuf')
-rw-r--r--src/main/protobuf/apk_manifest.proto4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/protobuf/apk_manifest.proto b/src/main/protobuf/apk_manifest.proto
index a9595d86e4..7b58e507e9 100644
--- a/src/main/protobuf/apk_manifest.proto
+++ b/src/main/protobuf/apk_manifest.proto
@@ -36,7 +36,6 @@ message AndroidSdk {
string aidl = 3;
string android_jar = 4;
string annotations_jar = 5;
- string apkbuilder = 6;
string dx = 7;
string framework_aidl = 8;
string jack = 9;
@@ -49,6 +48,9 @@ message AndroidSdk {
string zipalign = 16;
string build_tools_version = 17; // assume latest if not set
string apksigner = 18;
+
+ // Deprecated tag numbers.
+ reserved 6;
}
// Information about a resource referenced from AndroidManifest.xml.