Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39dd0a4b authored by Ulya Trafimovich's avatar Ulya Trafimovich
Browse files

Don't enforce <uses-library> checks if dexpreopt for apps is disabled. 

Otherwise the check fails, as it depend on non-existent dexpreopt.config
files. This CL fixes broken build cf_x86_phone-userdebug_coverage.

Bug: 183931403
Bug: 132357300
Test: forrest build for cf_x86_phone-userdebug_coverage.
Change-Id: Id3ffeb742c1b82c677795fa701a7b5a867eabbbd
parent cb745601

java/app.go

+2 −1
Original line number Diff line number Diff line
@@ -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

	}