diff options
| author | 2021-12-20 19:52:37 +0000 | |
|---|---|---|
| committer | 2021-12-20 19:52:37 +0000 | |
| commit | 880e11112d0647245e9cfbaad89b7e9795ab6890 (patch) | |
| tree | 53a8843420b9ec78d7946930089bdbe3e0b75e1d /java/androidmk.go | |
| parent | f1228f570a40b0f856b36779821ca0a86662a511 (diff) | |
| parent | 28bc9a8a7eab2e7b6666df1079677a14e4899b78 (diff) | |
Merge changes I8f4eaed1,I358a62d3
* changes:
Dexpreopt standalone system server jars from prebuilts.
Dexpreopt standalone system server jars.
Diffstat (limited to 'java/androidmk.go')
| -rw-r--r-- | java/androidmk.go | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/java/androidmk.go b/java/androidmk.go index 2284e4849..19fe7e2fb 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -182,7 +182,14 @@ func (j *TestHelperLibrary) AndroidMkEntries() []android.AndroidMkEntries { } func (prebuilt *Import) AndroidMkEntries() []android.AndroidMkEntries { - if prebuilt.hideApexVariantFromMake || !prebuilt.ContainingSdk().Unversioned() { + if prebuilt.hideApexVariantFromMake { + // For a library imported from a prebuilt APEX, we don't need a Make module for itself, as we + // don't need to install it. However, we need to add its dexpreopt outputs as sub-modules, if it + // is preopted. + dexpreoptEntries := prebuilt.dexpreopter.AndroidMkEntriesForApex() + return append(dexpreoptEntries, android.AndroidMkEntries{Disabled: true}) + } + if !prebuilt.ContainingSdk().Unversioned() { return []android.AndroidMkEntries{android.AndroidMkEntries{ Disabled: true, }} |