StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Relax preprocessed apk check for non-privileged apps" into main am: 9064761816

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2670157

Change-Id: I9fb5b04444c2b86733808484f7c1ee586ca99a4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-07-21 04:30:54 +00:00
committed by Automerger Merge Worker
parent 3c1dd65ce0 9064761816
commit ea7d85fc37
1 changed files with 37 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
java/app_import.go
View File

@@ -51,9 +51,9 @@ var (
Description: "Uncompress dex files",
})
checkJniAndDexLibsAreUncompressedRule = pctx.AndroidStaticRule("check-jni-and-dex-libs-are-uncompressed", blueprint.RuleParams{
checkDexLibsAreUncompressedRule = pctx.AndroidStaticRule("check-dex-libs-are-uncompressed", blueprint.RuleParams{
// grep -v ' stor ' will search for lines that don't have ' stor '. stor means the file is stored uncompressed
Command: "if (zipinfo $in 'lib/*.so' '*.dex' 2>/dev/null | grep -v ' stor ' >/dev/null) ; then " +
Command: "if (zipinfo $in '*.dex' 2>/dev/null | grep -v ' stor ' >/dev/null) ; then " +
"echo $in: Contains compressed JNI libraries and/or dex files >&2;" +
"exit 1; " +
"else " +
@@ -61,6 +61,17 @@ var (
"fi",
Description: "Check for compressed JNI libs or dex files",
})
checkJniLibsAreUncompressedRule = pctx.AndroidStaticRule("check-jni-libs-are-uncompressed", blueprint.RuleParams{
// grep -v ' stor ' will search for lines that don't have ' stor '. stor means the file is stored uncompressed
Command: "if (zipinfo $in 'lib/*.so' 2>/dev/null | grep -v ' stor ' >/dev/null) ; then " +
"echo $in: Contains compressed JNI libraries >&2;" +
"exit 1; " +
"else " +
"touch $out; " +
"fi",
Description: "Check for compressed JNI libs or dex files",
})
)
func RegisterAppImportBuildComponents(ctx android.RegistrationContext) {
@@ -384,26 +395,40 @@ func (a *AndroidAppImport) generateAndroidBuildActions(ctx android.ModuleContext
}
func (a *AndroidAppImport) validatePreprocessedApk(ctx android.ModuleContext, srcApk android.Path, dstApk android.WritablePath) {
var validations android.Paths
alignmentStamp := android.PathForModuleOut(ctx, "validated-prebuilt", "alignment.stamp")
ctx.Build(pctx, android.BuildParams{
Rule: checkZipAlignment,
Input: srcApk,
Output: alignmentStamp,
})
compressionStamp := android.PathForModuleOut(ctx, "validated-prebuilt", "compression.stamp")
validations = append(validations, alignmentStamp)
jniCompressionStamp := android.PathForModuleOut(ctx, "validated-prebuilt", "jni_compression.stamp")
ctx.Build(pctx, android.BuildParams{
Rule: checkJniAndDexLibsAreUncompressedRule,
Rule: checkJniLibsAreUncompressedRule,
Input: srcApk,
Output: compressionStamp,
Output: jniCompressionStamp,
})
validations = append(validations, jniCompressionStamp)
if a.Privileged() {
// It's ok for non-privileged apps to have compressed dex files, see go/gms-uncompressed-jni-slides
dexCompressionStamp := android.PathForModuleOut(ctx, "validated-prebuilt", "dex_compression.stamp")
ctx.Build(pctx, android.BuildParams{
Rule: checkDexLibsAreUncompressedRule,
Input: srcApk,
Output: dexCompressionStamp,
})
validations = append(validations, dexCompressionStamp)
}
ctx.Build(pctx, android.BuildParams{
Rule: android.Cp,
Input: srcApk,
Output: dstApk,
Validations: []android.Path{
alignmentStamp,
compressionStamp,
},
Rule: android.Cp,
Input: srcApk,
Output: dstApk,
Validations: validations,
})
}