diff options
| author | 2021-03-05 23:34:37 +0000 | |
|---|---|---|
| committer | 2021-03-05 23:34:37 +0000 | |
| commit | cd2df5dec64bec4196c8433c640d7e73d48d8013 (patch) | |
| tree | 19769074cdb8e7fae7e21f13cbd1436beb1f49a0 /java | |
| parent | 3903d401d0c16fa90a36b180db3d99de2294b48c (diff) | |
| parent | 2669e7edf00ccce9a264381140d51cd4f22b429e (diff) | |
Merge "Exempt framework-res from UseApiFingerprint"
Diffstat (limited to 'java')
| -rw-r--r-- | java/android_manifest.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/android_manifest.go b/java/android_manifest.go index c76bb2fda..b30f3d2c8 100644 --- a/java/android_manifest.go +++ b/java/android_manifest.go @@ -91,7 +91,7 @@ func manifestFixer(ctx android.ModuleContext, manifest android.Path, sdkContext if err != nil { ctx.ModuleErrorf("invalid targetSdkVersion: %s", err) } - if UseApiFingerprint(ctx) { + if UseApiFingerprint(ctx) && ctx.ModuleName() != "framework-res" { targetSdkVersion = ctx.Config().PlatformSdkCodename() + fmt.Sprintf(".$$(cat %s)", ApiFingerprintPath(ctx).String()) deps = append(deps, ApiFingerprintPath(ctx)) } @@ -100,7 +100,7 @@ func manifestFixer(ctx android.ModuleContext, manifest android.Path, sdkContext if err != nil { ctx.ModuleErrorf("invalid minSdkVersion: %s", err) } - if UseApiFingerprint(ctx) { + if UseApiFingerprint(ctx) && ctx.ModuleName() != "framework-res" { minSdkVersion = ctx.Config().PlatformSdkCodename() + fmt.Sprintf(".$$(cat %s)", ApiFingerprintPath(ctx).String()) deps = append(deps, ApiFingerprintPath(ctx)) } |