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

Merge "Don't strip oat files on host." am: 3799533b87 am: 51ba0cf62a am: 5f1a60b3ff am: 3329a4e764 am: 032c8074b1 am: b603b627a7

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

Change-Id: I05ce41cb4231c763f70c901919c9042e1bb76dcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Nicolas Geoffray
2023-06-30 14:54:34 +00:00
committed by Automerger Merge Worker
parent ddf027b4a0 b603b627a7
commit b37e2183a3
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/dexpreopt_bootjars.go
View File

@@ -789,7 +789,6 @@ func buildBootImageVariant(ctx android.ModuleContext, image *bootImageVariant, p
Flag("--generate-build-id"). Flag("--generate-build-id").
Flag("--image-format=lz4hc"). Flag("--image-format=lz4hc").
FlagWithArg("--oat-symbols=", symbolsFile.String()). FlagWithArg("--oat-symbols=", symbolsFile.String()).
Flag("--strip").
FlagWithArg("--oat-file=", outputPath.String()). FlagWithArg("--oat-file=", outputPath.String()).
FlagWithArg("--oat-location=", oatLocation). FlagWithArg("--oat-location=", oatLocation).
FlagWithArg("--image=", imagePath.String()). FlagWithArg("--image=", imagePath.String()).
@@ -799,6 +798,11 @@ func buildBootImageVariant(ctx android.ModuleContext, image *bootImageVariant, p
Flag("--force-determinism"). Flag("--force-determinism").
Flag("--abort-on-hard-verifier-error") Flag("--abort-on-hard-verifier-error")
// We don't strip on host to make perf tools work.
if image.target.Os == android.Android {
cmd.Flag("--strip")
}
// If the image is profile-guided but the profile is disabled, we omit "--compiler-filter" to // If the image is profile-guided but the profile is disabled, we omit "--compiler-filter" to
// leave the decision to dex2oat to pick the compiler filter. // leave the decision to dex2oat to pick the compiler filter.
if !(image.isProfileGuided() && global.DisableGenerateProfile) { if !(image.isProfileGuided() && global.DisableGenerateProfile) {