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

Revert "Preopt APEX system server jars."

Browse Source 
This reverts commit ca9bc98e0c.

Reason for revert: breaks build
Bug: 200024131

Change-Id: Ide07b4c4d267370ae31107b1598b2f878c701282
This commit is contained in:
Adrian Roos
2021-09-15 14:11:07 +00:00
parent ca9bc98e0c
commit 92346c4832
9 changed files with 54 additions and 518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/androidmk.go
View File

@@ -61,13 +61,7 @@ func (library *Library) AndroidMkEntries() []android.AndroidMkEntries {
var entriesList []android.AndroidMkEntries
if library.hideApexVariantFromMake {
// For a java library built for an APEX, we don't need a Make module for itself. Otherwise, it
// will conflict with the platform variant because they have the same module name in the
// makefile. However, we need to add its dexpreopt outputs as sub-modules, if it is preopted.
dexpreoptEntries := library.dexpreopter.AndroidMkEntriesForApex()
if len(dexpreoptEntries) > 0 {
entriesList = append(entriesList, dexpreoptEntries...)
}
// For a java library built for an APEX we don't need Make module
entriesList = append(entriesList, android.AndroidMkEntries{Disabled: true})
} else if !library.ApexModuleBase.AvailableFor(android.AvailableToPlatform) {
// Platform variant. If not available for the platform, we don't need Make module.