diff options
| author | 2023-09-07 00:58:24 +0000 | |
|---|---|---|
| committer | 2023-09-07 00:58:24 +0000 | |
| commit | d79c10f71f97c3b1bbae1a2bcb3b6a13bb98d7d6 (patch) | |
| tree | 37014255172c4bc465ce5dab7b4a03e45342f678 /java/builder.go | |
| parent | 2f681324c2aef739291a259dbc654bc86b6a74ff (diff) | |
| parent | d293e28f521f37d4e07c307090e5db829545d774 (diff) | |
Merge "Revert "Only allow setting presigned without preprocessed on targetSdk < 30"" into main
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, }) } |