diff options
| author | 2021-09-16 06:15:39 +0000 | |
|---|---|---|
| committer | 2021-09-16 06:25:26 +0000 | |
| commit | 519c5c82e596959b683570d387aba43bae8fd65a (patch) | |
| tree | ddf50ea990f4c9a1e00db3adde1b5dca22276be1 /java/androidmk.go | |
| parent | 92346c483249726164f4bd140413d60391121763 (diff) | |
Revert^2 "Preopt APEX system server jars."
This reverts commit 92346c483249726164f4bd140413d60391121763.
Reason for revert: Fixed build error.
The build error is fixed by ag/15841934. This CL remains unchanged. This
CL will be submitted AFTER ag/15841934 is submitted.
Bug: 200024131
Test: 1. Patch this CL and ag/15841934 into internal master.
2. sudo vendor/google/build/build_test.bash
Change-Id: I5f2b8357846fc7dda56e25ebe6ffb095e8047ec8
Diffstat (limited to 'java/androidmk.go')
| -rw-r--r-- | java/androidmk.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/java/androidmk.go b/java/androidmk.go index 68ccd82e9..71370c9b1 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -61,7 +61,13 @@ 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 Make module + // 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...) + } 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. |