From 9c5c09f0ad6ac83104dae86ad719a46fb3ea91c4 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Wed, 6 Sep 2023 16:11:44 -0700 Subject: Error out if skip_preprocessed_apk_checks is set when it's not necessary So that we don't erroneously add skip_preprocessed_apk_checks everywhere. Bug: 185811447 Test: Presubmits Change-Id: Icb1c6163d170ca4181c5c6a814b51fda4777746f --- java/builder.go | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'java/builder.go') diff --git a/java/builder.go b/java/builder.go index bf919175d..ee7e225a8 100644 --- a/java/builder.go +++ b/java/builder.go @@ -259,32 +259,11 @@ var ( }, ) - checkZipAlignment = pctx.AndroidStaticRule("checkzipalign", - blueprint.RuleParams{ - Command: "if ! ${config.ZipAlign} -c -p 4 $in > /dev/null; then " + - "echo $in: Improper package alignment >&2; " + - "exit 1; " + - "else " + - "touch $out; " + - "fi", - CommandDeps: []string{"${config.ZipAlign}"}, - Description: "Check zip alignment", - }, - ) - convertImplementationJarToHeaderJarRule = pctx.AndroidStaticRule("convertImplementationJarToHeaderJar", blueprint.RuleParams{ 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() { -- cgit v1.2.3-59-g8ed1b