Merge "Export provenance metadata for prebuilt APKs and APEXes." am: c055d88c16
am: c41308e05e
am: d58ecd96a8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2045371 Change-Id: Idd4f83b79dd05e7f299cd26110bdc1f22d7b2e49 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -22,6 +22,7 @@ import (
|
||||
"github.com/google/blueprint/proptools"
|
||||
|
||||
"android/soong/android"
|
||||
"android/soong/provenance"
|
||||
)
|
||||
|
||||
func init() {
|
||||
@@ -57,6 +58,8 @@ type AndroidAppImport struct {
|
||||
installPath android.InstallPath
|
||||
|
||||
hideApexVariantFromMake bool
|
||||
|
||||
provenanceMetaDataFile android.OutputPath
|
||||
}
|
||||
|
||||
type AndroidAppImportProperties struct {
|
||||
@@ -349,6 +352,8 @@ func (a *AndroidAppImport) generateAndroidBuildActions(ctx android.ModuleContext
|
||||
|
||||
if apexInfo.IsForPlatform() {
|
||||
a.installPath = ctx.InstallFile(installDir, apkFilename, a.outputFile)
|
||||
artifactPath := android.PathForModuleSrc(ctx, *a.properties.Apk)
|
||||
a.provenanceMetaDataFile = provenance.GenerateArtifactProvenanceMetaData(ctx, artifactPath, a.installPath)
|
||||
}
|
||||
|
||||
// TODO: androidmk converter jni libs
|
||||
@@ -374,6 +379,10 @@ func (a *AndroidAppImport) Certificate() Certificate {
|
||||
return a.certificate
|
||||
}
|
||||
|
||||
func (a *AndroidAppImport) ProvenanceMetaDataFile() android.OutputPath {
|
||||
return a.provenanceMetaDataFile
|
||||
}
|
||||
|
||||
var dpiVariantGroupType reflect.Type
|
||||
var archVariantGroupType reflect.Type
|
||||
var supportedDpis = []string{"ldpi", "mdpi", "hdpi", "xhdpi", "xxhdpi", "xxxhdpi"}
|
||||
|
Reference in New Issue
Block a user