openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Don't enforce <uses-library> checks if dexpreopt for apps is disabled." am: f682410cbf am: 1012c230b2 am: 42983b7316 

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

Change-Id: Iea739178209de07d66eeab82794392d0ff378743
This commit is contained in:
Ulyana Trafimovich 2021-03-29 18:26:54 +00:00 committed by Automerger Merge Worker
parent e06a34d148 42983b7316
commit f48877b046
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
java/app.go
View File

@ -1294,7 +1294,8 @@ func (u *usesLibrary) verifyUsesLibraries(ctx android.ModuleContext, inputFile a
// check is not necessary, and although it is good to have, it is difficult to maintain on
// non-linux build platforms where dexpreopt is generally disabled (the check may fail due to
// various unrelated reasons, such as a failure to get manifest from an APK).
if dexpreopt.GetGlobalConfig(ctx).DisablePreopt {
global := dexpreopt.GetGlobalConfig(ctx)
if global.DisablePreopt || global.OnlyPreoptBootImageAndSystemServer {
return inputFile
}