Revert "Move apex module installation into Soong"

This reverts commit e3d156a622.

Reason for revert: b/206119621

Bug: 204136549
Change-Id: I380223b86660c27bea8f5dcc2d61f32df2704c02
Fixes: 206119621
This commit is contained in:
Colin Cross
2021-11-12 19:01:29 +00:00
parent e3d156a622
commit ccba23db44
5 changed files with 94 additions and 96 deletions

View File

@@ -399,14 +399,14 @@ type apexBundle struct {
// vendor/google/build/build_unbundled_mainline_module.sh for more detail.
bundleModuleFile android.WritablePath
// Target directory to install this APEX. Usually out/target/product/<device>/<partition>/apex.
// Target path to install this APEX. Usually out/target/product/<device>/<partition>/apex.
installDir android.InstallPath
// Path where this APEX was installed.
installedFile android.InstallPath
// Installed locations of symlinks for backward compatibility.
compatSymlinks android.InstallPaths
// List of commands to create symlinks for backward compatibility. These commands will be
// attached as LOCAL_POST_INSTALL_CMD to apex package itself (for unflattened build) or
// apex_manifest (for flattened build) so that compat symlinks are always installed
// regardless of TARGET_FLATTEN_APEX setting.
compatSymlinks []string
// Text file having the list of individual files that are included in this APEX. Used for
// debugging purpose.
@@ -431,10 +431,6 @@ type apexBundle struct {
modulePaths []string
}
func (*apexBundle) InstallBypassMake() bool {
return true
}
// apexFileClass represents a type of file that can be included in APEX.
type apexFileClass int
@@ -2090,9 +2086,7 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) {
a.linkToSystemLib = false
}
if a.properties.ApexType != zipApex {
a.compatSymlinks = makeCompatSymlinks(a.BaseModuleName(), ctx, a.primaryApexType)
}
a.compatSymlinks = makeCompatSymlinks(a.BaseModuleName(), ctx)
////////////////////////////////////////////////////////////////////////////////////////////
// 4) generate the build rules to create the APEX. This is done in builder.go.