Merge "For Q APEXes default target_sdk_version and min_sdk_version to 29"

2020-02-20 22:10:50 +00:00 · 2020-02-20 22:10:50 +00:00 · 19fed2b4b9
parent 96574500db db10c13bdf
commit 19fed2b4b9
1 changed files with 10 additions and 0 deletions
--- a/apex/builder.go
+++ b/apex/builder.go
@ -383,6 +383,16 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) {

 		targetSdkVersion := ctx.Config().DefaultAppTargetSdk()
 		minSdkVersion := ctx.Config().DefaultAppTargetSdk()
+
+		if proptools.Bool(a.properties.Legacy_android10_support) {
+			if !java.UseApiFingerprint(ctx, targetSdkVersion) {
+				targetSdkVersion = "29"
+			}
+			if !java.UseApiFingerprint(ctx, minSdkVersion) {
+				minSdkVersion = "29"
+			}
+		}
+
 		if java.UseApiFingerprint(ctx, targetSdkVersion) {
 			targetSdkVersion += fmt.Sprintf(".$$(cat %s)", java.ApiFingerprintPath(ctx).String())
 			implicitInputs = append(implicitInputs, java.ApiFingerprintPath(ctx))