diff options
| author | Pranav Gupta <pranavgupta@google.com> | 2023-03-21 19:16:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-03-21 19:16:39 +0000 |
| commit | 957cd6bcbc51b74b75b8ab663e52b34b410dcb82 (patch) | |
| tree | a1220ad11890113a29c9ef05ad38cd0910aeffdd /apex | |
| parent | aaaf1b015781ecfc12f729f423b23100c9c95e60 (diff) | |
| parent | 51645ff23ee07b93c2508accadecb0f71d980366 (diff) | |
| download | soong-957cd6bcbc51b74b75b8ab663e52b34b410dcb82.tar.gz | |
Merge "Add skip-sdk-check to extract_apks"
Diffstat (limited to 'apex')
| -rw-r--r-- | apex/prebuilt.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apex/prebuilt.go b/apex/prebuilt.go index 0997a68eb..cae507e5d 100644 --- a/apex/prebuilt.go +++ b/apex/prebuilt.go @@ -35,11 +35,12 @@ var ( blueprint.RuleParams{ Command: `rm -rf "$out" && ` + `${extract_apks} -o "${out}" -allow-prereleased=${allow-prereleased} ` + - `-sdk-version=${sdk-version} -abis=${abis} -screen-densities=all -extract-single ` + + `-sdk-version=${sdk-version} -skip-sdk-check=${skip-sdk-check} -abis=${abis} ` + + `-screen-densities=all -extract-single ` + `${in}`, CommandDeps: []string{"${extract_apks}"}, }, - "abis", "allow-prereleased", "sdk-version") + "abis", "allow-prereleased", "sdk-version", "skip-sdk-check") ) type prebuilt interface { @@ -845,6 +846,7 @@ func (p *prebuiltApexExtractorModule) GenerateAndroidBuildActions(ctx android.Mo "abis": strings.Join(abis, ","), "allow-prereleased": strconv.FormatBool(proptools.BoolDefault(p.properties.Prerelease, defaultAllowPrerelease)), "sdk-version": ctx.Config().PlatformSdkVersion().String(), + "skip-sdk-check": strconv.FormatBool(ctx.Config().IsEnvTrue("SOONG_SKIP_APPSET_SDK_CHECK")), }, }) } |