summaryrefslogtreecommitdiff
path: root/apex/prebuilt.go
diff options
context:
space:
mode:
author Spandan Das <spandandas@google.com> 2024-08-21 22:47:53 +0000
committer Spandan Das <spandandas@google.com> 2024-08-26 20:58:10 +0000
commit746161db0ced6241ec190e747ec37820e93ac018 (patch)
treea9e6b70017e4fa2817f208683b84f0bc2571adb6 /apex/prebuilt.go
parenta18d42d324bd4dc65042f1f6172a564406fd6b12 (diff)
Move installation rules of dexpreopt'd apex systemserver jars to soong
This will eventually allow us to build devices by skipping `katiBuild` and moving straight to `katiPackaging`. Implementation details - Replace ctx.PackageFile with ctx.InstallFile. These makes these rules available to both make and soong packaging systems. This will be done inside d.dexpreopt function - Add InstallDepNeeded on the dependency tags in this chain (apex --> sscp_fragment --> (java_library|java_sdk_library)). This is necessary for the soong packaging system. - Remove `LOCAL_SOONG_INSTALLED_MODULE=""`. A non-empty string ensures that kati honors the installation rules generated by soong. Bug: 355509400 Test: lunch aosp_cf_x86_64_phone-trunk_staging-userdebug (mainline source) Test: lunch cf_x86_64_only_phone-ap3a-userdebug (mainline prebuilts) (no diff in system_intermediates/file_list.txt in both cases) Change-Id: I190a919e9480e7d9981a6b9b96a50d9c33ceea02
Diffstat (limited to 'apex/prebuilt.go')
-rw-r--r--apex/prebuilt.go1
1 files changed, 0 insertions, 1 deletions
diff --git a/apex/prebuilt.go b/apex/prebuilt.go
index 449510a6e..9aa6b03d2 100644
--- a/apex/prebuilt.go
+++ b/apex/prebuilt.go
@@ -195,7 +195,6 @@ func (p *prebuiltCommon) initApexFilesForAndroidMk(ctx android.ModuleContext) {
// If this apex contains a system server jar, then the dexpreopt artifacts should be added as required
for _, install := range p.Dexpreopter.DexpreoptBuiltInstalledForApex() {
p.requiredModuleNames = append(p.requiredModuleNames, install.FullModuleName())
- install.PackageFile(ctx)
}
}