diff options
| author | 2023-09-07 00:49:34 +0000 | |
|---|---|---|
| committer | 2023-09-07 00:51:09 +0000 | |
| commit | d293e28f521f37d4e07c307090e5db829545d774 (patch) | |
| tree | 4eafd2bd9bc205ffc239e6e6198e08829246f871 /java/builder.go | |
| parent | 6158528e152304f1259e31ff343358ff0f50c0e4 (diff) | |
Revert "Only allow setting presigned without preprocessed on targetSdk < 30"
This reverts commit 6158528e152304f1259e31ff343358ff0f50c0e4.
Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.corp.google.com/builds/quarterdeck?branch=git_udc-d1-dev-plus-aosp&target=aosp_bramble-trunk_staging-userdebug&lkgb=10771573&lkbb=10771600&fkbb=10771587, bug https://buganizer.corp.google.com/issues/299369971
BUG: 299369971
Change-Id: I6bf6eb5c0fb9e30197e145121adc7ed58871526f
Diffstat (limited to 'java/builder.go')
| -rw-r--r-- | java/builder.go | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/java/builder.go b/java/builder.go index bf919175d..debf49a00 100644 --- a/java/builder.go +++ b/java/builder.go @@ -277,14 +277,6 @@ var ( Command: `${config.Zip2ZipCmd} -i ${in} -o ${out} -x 'META-INF/services/**/*'`, CommandDeps: []string{"${config.Zip2ZipCmd}"}, }) - - checkBelowTargetSdk30ForNonPreprocessedApks = pctx.AndroidStaticRule("checkBelowTargetSdk30ForNonPreprocessedApks", - blueprint.RuleParams{ - Command: "build/soong/scripts/check_target_sdk_less_than_30.py ${config.Aapt2Cmd} $in $out", - CommandDeps: []string{"build/soong/scripts/check_target_sdk_less_than_30.py", "${config.Aapt2Cmd}"}, - Description: "Check prebuilt target sdk version", - }, - ) ) func init() { @@ -697,13 +689,12 @@ func GenerateMainClassManifest(ctx android.ModuleContext, outputFile android.Wri android.WriteFileRule(ctx, outputFile, "Main-Class: "+mainClass+"\n") } -func TransformZipAlign(ctx android.ModuleContext, outputFile android.WritablePath, inputFile android.Path, validations android.Paths) { +func TransformZipAlign(ctx android.ModuleContext, outputFile android.WritablePath, inputFile android.Path) { ctx.Build(pctx, android.BuildParams{ Rule: zipalign, Description: "align", Input: inputFile, Output: outputFile, - Validations: validations, }) } |