Merge "Don't enforce <uses-library> checks if dexpreopt for apps is disabled." am: f682410cbf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655690 Change-Id: I436a5de532d12e7abcebfd898482524a5c896435
This commit is contained in:
committed by
Automerger Merge Worker
commit
1012c230b2
@@ -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
|
// 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
|
// 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).
|
// 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
|
return inputFile
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user