From cbe50c7073feb8b295fbcf44dce3cb1c723f3008 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Fri, 29 May 2020 21:29:20 +0900 Subject: [PATCH] Use Stem where output file name is expected in APEX Bug: 157638999 Test: m Merged-In: I4a4892bc2941cf1301d210fc3107c02f0e7b13b7 (cherry picked from commit f1493cc0f24fcc7736623faf171ba404fb06fef8) Change-Id: I4a4892bc2941cf1301d210fc3107c02f0e7b13b7 --- apex/androidmk.go | 8 ++++---- apex/apex.go | 20 ++++++++++++-------- apex/builder.go | 4 ++-- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/apex/androidmk.go b/apex/androidmk.go index 624c47d9b..d1c2a649f 100644 --- a/apex/androidmk.go +++ b/apex/androidmk.go @@ -170,7 +170,7 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, apexName, mo // soong_java_prebuilt.mk sets LOCAL_MODULE_SUFFIX := .jar Therefore // we need to remove the suffix from LOCAL_MODULE_STEM, otherwise // we will have foo.jar.jar - fmt.Fprintln(w, "LOCAL_MODULE_STEM :=", strings.TrimSuffix(fi.builtFile.Base(), ".jar")) + fmt.Fprintln(w, "LOCAL_MODULE_STEM :=", strings.TrimSuffix(fi.Stem(), ".jar")) fmt.Fprintln(w, "LOCAL_SOONG_CLASSES_JAR :=", javaModule.ImplementationAndResourcesJars()[0].String()) fmt.Fprintln(w, "LOCAL_SOONG_HEADER_JAR :=", javaModule.HeaderJars()[0].String()) fmt.Fprintln(w, "LOCAL_SOONG_DEX_JAR :=", fi.builtFile.String()) @@ -181,13 +181,13 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, apexName, mo // soong_app_prebuilt.mk sets LOCAL_MODULE_SUFFIX := .apk Therefore // we need to remove the suffix from LOCAL_MODULE_STEM, otherwise // we will have foo.apk.apk - fmt.Fprintln(w, "LOCAL_MODULE_STEM :=", strings.TrimSuffix(fi.builtFile.Base(), ".apk")) + fmt.Fprintln(w, "LOCAL_MODULE_STEM :=", strings.TrimSuffix(fi.Stem(), ".apk")) if app, ok := fi.module.(*java.AndroidApp); ok && len(app.JniCoverageOutputs()) > 0 { fmt.Fprintln(w, "LOCAL_PREBUILT_COVERAGE_ARCHIVE :=", strings.Join(app.JniCoverageOutputs().Strings(), " ")) } fmt.Fprintln(w, "include $(BUILD_SYSTEM)/soong_app_prebuilt.mk") } else if fi.class == nativeSharedLib || fi.class == nativeExecutable || fi.class == nativeTest { - fmt.Fprintln(w, "LOCAL_MODULE_STEM :=", fi.builtFile.Base()) + fmt.Fprintln(w, "LOCAL_MODULE_STEM :=", fi.Stem()) if cc, ok := fi.module.(*cc.Module); ok { if cc.UnstrippedOutputFile() != nil { fmt.Fprintln(w, "LOCAL_SOONG_UNSTRIPPED_BINARY :=", cc.UnstrippedOutputFile().String()) @@ -199,7 +199,7 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, apexName, mo } fmt.Fprintln(w, "include $(BUILD_SYSTEM)/soong_cc_prebuilt.mk") } else { - fmt.Fprintln(w, "LOCAL_MODULE_STEM :=", fi.builtFile.Base()) + fmt.Fprintln(w, "LOCAL_MODULE_STEM :=", fi.Stem()) if fi.builtFile == a.manifestPbOut && apexType == flattenedApex { if a.primaryApexType { // Make apex_manifest.pb module for this APEX to override all other diff --git a/apex/apex.go b/apex/apex.go index ba1c1d27e..34b5595b4 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -1225,11 +1225,14 @@ func (af *apexFile) apexRelativePath(path string) string { // Path() returns path of this apex file relative to the APEX root func (af *apexFile) Path() string { - stem := af.builtFile.Base() + return af.apexRelativePath(af.Stem()) +} + +func (af *apexFile) Stem() string { if af.stem != "" { - stem = af.stem + return af.stem } - return af.apexRelativePath(stem) + return af.builtFile.Base() } // SymlinkPaths() returns paths of the symlinks (if any) relative to the APEX root @@ -1931,11 +1934,12 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) { switch depTag { case sharedLibTag: if c, ok := child.(*cc.Module); ok { + fi := apexFileForNativeLibrary(ctx, c, handleSpecialLibs) + filesInfo = append(filesInfo, fi) // bootstrap bionic libs are treated as provided by system if c.HasStubsVariants() && !cc.InstallToBootstrap(c.BaseModuleName(), ctx.Config()) { - provideNativeLibs = append(provideNativeLibs, c.OutputFile().Path().Base()) + provideNativeLibs = append(provideNativeLibs, fi.Stem()) } - filesInfo = append(filesInfo, apexFileForNativeLibrary(ctx, c, handleSpecialLibs)) return true // track transitive dependencies } else { ctx.PropertyErrorf("native_shared_libs", "%q is not a cc_library or cc_library_shared module", depName) @@ -2045,6 +2049,8 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) { // don't include it in this APEX return false } + af := apexFileForNativeLibrary(ctx, cc, handleSpecialLibs) + af.transitiveDep = true if !a.Host() && !android.DirectlyInApex(ctx.ModuleName(), ctx.OtherModuleName(cc)) && (cc.IsStubs() || cc.HasStubsVariants()) { // If the dependency is a stubs lib, don't include it in this APEX, // but make sure that the lib is installed on the device. @@ -2056,12 +2062,10 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) { if !android.DirectlyInAnyApex(ctx, cc.Name()) && !android.InList(cc.Name(), a.requiredDeps) { a.requiredDeps = append(a.requiredDeps, cc.Name()) } - requireNativeLibs = append(requireNativeLibs, cc.OutputFile().Path().Base()) + requireNativeLibs = append(requireNativeLibs, af.Stem()) // Don't track further return false } - af := apexFileForNativeLibrary(ctx, cc, handleSpecialLibs) - af.transitiveDep = true filesInfo = append(filesInfo, af) return true // track transitive dependencies } diff --git a/apex/builder.go b/apex/builder.go index cebd86aec..ee097e49f 100644 --- a/apex/builder.go +++ b/apex/builder.go @@ -395,7 +395,7 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) { var readOnlyPaths = []string{"apex_manifest.json", "apex_manifest.pb"} var executablePaths []string // this also includes dirs for _, f := range a.filesInfo { - pathInApex := filepath.Join(f.installDir, f.builtFile.Base()) + pathInApex := f.Path() if f.installDir == "bin" || strings.HasPrefix(f.installDir, "bin/") { executablePaths = append(executablePaths, pathInApex) for _, s := range f.symlinks { @@ -634,7 +634,7 @@ func (a *apexBundle) buildFilesInfo(ctx android.ModuleContext) { apexBundleName := a.Name() for _, fi := range a.filesInfo { dir := filepath.Join("apex", apexBundleName, fi.installDir) - target := ctx.InstallFile(android.PathForModuleInstall(ctx, dir), fi.builtFile.Base(), fi.builtFile) + target := ctx.InstallFile(android.PathForModuleInstall(ctx, dir), fi.Stem(), fi.builtFile) for _, sym := range fi.symlinks { ctx.InstallSymlink(android.PathForModuleInstall(ctx, dir), sym, target) }