diff options
| author | 2022-05-17 20:21:50 +0000 | |
|---|---|---|
| committer | 2022-06-28 22:07:23 +0000 | |
| commit | 5a082f9a3310a425115061578ed8955ff342ef56 (patch) | |
| tree | ca0ed9c72c744035e289b862697798a2f46ffac9 /java/rro.go | |
| parent | 78ce8c23def25e30fba5e2cdb124ad3f0409751c (diff) | |
Propagate max_sdk_version to manifest_fixer
If max_sdk_version is included in Android.bp that value will now be
propagated to manifest_fixer.py. This value will then be used to
override any maxSdkVersion attribute set on permission or
uses-permission tags in the android manifest if maxSdkVersion="-1".
Bug: 223902327
Test: add max_sdk_version to Android.bp for test app
Test: create permission in test app manifest with maxSdkVersion="-1"
Test: run test to check maxSdkVersion=max_sdk_version
Change-Id: Ic533ef2a41b9ecc9ee68c69399026df47ee945b7
Diffstat (limited to 'java/rro.go')
| -rw-r--r-- | java/rro.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/java/rro.go b/java/rro.go index be84afffc..7952c2cc4 100644 --- a/java/rro.go +++ b/java/rro.go @@ -173,6 +173,10 @@ func (r *RuntimeResourceOverlay) MinSdkVersion(ctx android.EarlyModuleContext) a return r.SdkVersion(ctx) } +func (r *RuntimeResourceOverlay) ReplaceMaxSdkVersionPlaceholder(ctx android.EarlyModuleContext) android.SdkSpec { + return android.SdkSpecFrom(ctx, "") +} + func (r *RuntimeResourceOverlay) TargetSdkVersion(ctx android.EarlyModuleContext) android.SdkSpec { return r.SdkVersion(ctx) } |