diff options
Diffstat (limited to 'apex/apex.go')
| -rw-r--r-- | apex/apex.go | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/apex/apex.go b/apex/apex.go index 33188cbcb..0bc48be23 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -399,14 +399,14 @@ type apexBundle struct { // vendor/google/build/build_unbundled_mainline_module.sh for more detail. bundleModuleFile android.WritablePath - // Target path to install this APEX. Usually out/target/product/<device>/<partition>/apex. + // Target directory to install this APEX. Usually out/target/product/<device>/<partition>/apex. installDir android.InstallPath - // 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 + // Path where this APEX was installed. + installedFile android.InstallPath + + // Installed locations of symlinks for backward compatibility. + compatSymlinks android.InstallPaths // Text file having the list of individual files that are included in this APEX. Used for // debugging purpose. @@ -431,6 +431,10 @@ 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 @@ -2086,7 +2090,9 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) { a.linkToSystemLib = false } - a.compatSymlinks = makeCompatSymlinks(a.BaseModuleName(), ctx) + if a.properties.ApexType != zipApex { + a.compatSymlinks = makeCompatSymlinks(a.BaseModuleName(), ctx, a.primaryApexType) + } //////////////////////////////////////////////////////////////////////////////////////////// // 4) generate the build rules to create the APEX. This is done in builder.go. |