diff options
4 files changed, 6 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java index 5fc82a9535..1ce4c55b9c 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java @@ -370,7 +370,7 @@ public final class AndroidRuleClasses { .add(attr("shrinked_android_jar", LABEL).mandatory().cfg(HOST).allowedFileTypes(ANY_FILE)) .add(attr("annotations_jar", LABEL).mandatory().cfg(HOST).allowedFileTypes(ANY_FILE)) .add(attr("main_dex_classes", LABEL).mandatory().cfg(HOST).allowedFileTypes(ANY_FILE)) - .add(attr("apkbuilder", LABEL).mandatory().cfg(HOST).allowedFileTypes(ANY_FILE).exec()) + .add(attr("apkbuilder", LABEL).cfg(HOST).allowedFileTypes(ANY_FILE).exec()) .add(attr("apksigner", LABEL).mandatory().cfg(HOST).allowedFileTypes(ANY_FILE).exec()) .add(attr("zipalign", LABEL).mandatory().cfg(HOST).allowedFileTypes(ANY_FILE).exec()) .add( diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdkProvider.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdkProvider.java index 4e65affeb2..c01545dece 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdkProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdkProvider.java @@ -45,7 +45,7 @@ public abstract class AndroidSdkProvider implements TransitiveInfoProvider { FilesToRunProvider mainDexListCreator, FilesToRunProvider aidl, FilesToRunProvider aapt, - FilesToRunProvider apkBuilder, + @Nullable FilesToRunProvider apkBuilder, FilesToRunProvider apkSigner, FilesToRunProvider proguard, FilesToRunProvider zipalign, @@ -144,6 +144,7 @@ public abstract class AndroidSdkProvider implements TransitiveInfoProvider { public abstract FilesToRunProvider getAapt(); + @Nullable public abstract FilesToRunProvider getApkBuilder(); public abstract FilesToRunProvider getApkSigner(); diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ApkManifestAction.java b/src/main/java/com/google/devtools/build/lib/rules/android/ApkManifestAction.java index eacd339387..f6a8fbafd8 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/ApkManifestAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/ApkManifestAction.java @@ -51,7 +51,6 @@ public final class ApkManifestAction extends AbstractFileWriteAction { .add(sdk.getAidl().getExecutable()) .add(sdk.getAndroidJar()) .add(sdk.getAnnotationsJar()) - .add(sdk.getApkBuilder().getExecutable()) .add(sdk.getDx().getExecutable()) .add(sdk.getFrameworkAidl()) .add(sdk.getJack().getExecutable()) @@ -239,7 +238,6 @@ public final class ApkManifestAction extends AbstractFileWriteAction { sdkProto.setAidl(getArtifactPath(sdk.getAidl())); sdkProto.setAndroidJar(getArtifactPath(sdk.getAndroidJar())); sdkProto.setAnnotationsJar(getArtifactPath(sdk.getAnnotationsJar())); - sdkProto.setApkbuilder(getArtifactPath(sdk.getApkBuilder())); sdkProto.setDx(getArtifactPath(sdk.getDx())); sdkProto.setFrameworkAidl(getArtifactPath(sdk.getFrameworkAidl())); sdkProto.setJack(getArtifactPath(sdk.getJack())); 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. |