summaryrefslogtreecommitdiff
path: root/java/app_import.go
diff options
context:
space:
mode:
author Rupert Shuttleworth <ruperts@google.com> 2021-11-03 10:39:39 -0400
committer Rupert Shuttleworth <ruperts@google.com> 2021-11-03 10:46:15 -0400
commit8eab869bfebf007e334f4c710f5a92ca19efa5df (patch)
treeb2f19dff29988002b91873c71a32b3591692b686 /java/app_import.go
parent4a3a8e7469b61b45f832caaddf3f1297e30b10de (diff)
Add ability to set --rotation-min-sdk-version for signapk via Android.bp files.
(vs via Android.mk files, done earlier in http://ag/16094391) Bug: 197787352 Test: Added unit tests. Change-Id: I3ccd2f2134b069fb4c4a90fe384c23c1814c2ba2
Diffstat (limited to 'java/app_import.go')
-rw-r--r--java/app_import.go8
1 files changed, 7 insertions, 1 deletions
diff --git a/java/app_import.go b/java/app_import.go
index 3e5f972a4..faf471634 100644
--- a/java/app_import.go
+++ b/java/app_import.go
@@ -77,6 +77,9 @@ type AndroidAppImportProperties struct {
// Name of the signing certificate lineage file or filegroup module.
Lineage *string `android:"path"`
+ // For overriding the --rotation-min-sdk-version property of apksig
+ RotationMinSdkVersion *string
+
// Sign with the default system dev certificate. Must be used judiciously. Most imported apps
// need to either specify a specific certificate or be presigned.
Default_dev_cert *bool
@@ -330,7 +333,10 @@ func (a *AndroidAppImport) generateAndroidBuildActions(ctx android.ModuleContext
if lineage := String(a.properties.Lineage); lineage != "" {
lineageFile = android.PathForModuleSrc(ctx, lineage)
}
- SignAppPackage(ctx, signed, jnisUncompressed, certificates, nil, lineageFile)
+
+ rotationMinSdkVersion := String(a.properties.RotationMinSdkVersion)
+
+ SignAppPackage(ctx, signed, jnisUncompressed, certificates, nil, lineageFile, rotationMinSdkVersion)
a.outputFile = signed
} else {
alignedApk := android.PathForModuleOut(ctx, "zip-aligned", apkFilename)