diff options
author | 2023-03-20 16:19:53 -0700 | |
---|---|---|
committer | 2023-03-21 08:13:25 -0700 | |
commit | 51645ff23ee07b93c2508accadecb0f71d980366 (patch) | |
tree | d5d0815f40babd6daff3063aa19517273d638770 /java/builder.go | |
parent | 94d107020a41115dde1202b94c5fa80680bff808 (diff) |
Add skip-sdk-check to extract_apks
Add skip-sdk-check to skip checking the SDK version when extracting an
APK/APEX from an App Set Bundle. This can be used when the platform SDK
version is not defined and the APEXs/APKs use SHA based SDK versions.
This check should not be set to true for non Beta dessert releases
Bug: 274518686
Test: # Add SHA targeting modules to platform
m SOONG_SKIP_APPSET_SDK_CHECK=true #Build Passes
m SOONG_SKIP_APPSET_SDK_CHECK=false #Build Fails
m #No config supplied, build fails
Change-Id: I1919437d3410f09c991e1de39031bd88e1f8246a
Diffstat (limited to 'java/builder.go')
-rw-r--r-- | java/builder.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/builder.go b/java/builder.go index 6f8eec927..462626712 100644 --- a/java/builder.go +++ b/java/builder.go @@ -131,13 +131,13 @@ var ( blueprint.RuleParams{ Command: `rm -rf "$out" && ` + `${config.ExtractApksCmd} -o "${out}" -zip "${zip}" -allow-prereleased=${allow-prereleased} ` + - `-sdk-version=${sdk-version} -abis=${abis} ` + + `-sdk-version=${sdk-version} -skip-sdk-check=${skip-sdk-check} -abis=${abis} ` + `--screen-densities=${screen-densities} --stem=${stem} ` + `-apkcerts=${apkcerts} -partition=${partition} ` + `${in}`, CommandDeps: []string{"${config.ExtractApksCmd}"}, }, - "abis", "allow-prereleased", "screen-densities", "sdk-version", "stem", "apkcerts", "partition", "zip") + "abis", "allow-prereleased", "screen-densities", "sdk-version", "skip-sdk-check", "stem", "apkcerts", "partition", "zip") turbine, turbineRE = pctx.RemoteStaticRules("turbine", blueprint.RuleParams{ |