diff options
| -rw-r--r-- | cc/prebuilt.go | 17 | ||||
| -rw-r--r-- | filesystem/aconfig_files.go | 7 |
2 files changed, 5 insertions, 19 deletions
diff --git a/cc/prebuilt.go b/cc/prebuilt.go index ba4c662c6..96a07bc35 100644 --- a/cc/prebuilt.go +++ b/cc/prebuilt.go @@ -16,7 +16,6 @@ package cc import ( "path/filepath" - "strings" "github.com/google/blueprint/depset" "github.com/google/blueprint/proptools" @@ -120,22 +119,6 @@ func (p *prebuiltLibraryLinker) link(ctx ModuleContext, // Stub variants will create a stub .so file from stub .c files if p.buildStubs() && objs.objFiles != nil { // TODO (b/275273834): Make objs.objFiles == nil a hard error when the symbol files have been added to module sdk. - - // The map.txt files of libclang_rt.* contain version information, but the checked in .so files do not. - // e.g. libclang_rt.* libs impl - // $ nm -D prebuilts/../libclang_rt.hwasan-aarch64-android.so - // __hwasan_init - - // stubs generated from .map.txt - // $ nm -D out/soong/.intermediates/../<stubs>/libclang_rt.hwasan-aarch64-android.so - // __hwasan_init@@LIBCLANG_RT_ASAN - - // Special-case libclang_rt.* libs to account for this discrepancy. - // TODO (spandandas): Remove this special case https://r.android.com/3236596 has been submitted, and a new set of map.txt - // files of libclang_rt.* libs have been generated. - if strings.Contains(ctx.ModuleName(), "libclang_rt.") { - p.versionScriptPath = android.OptionalPathForPath(nil) - } return p.linkShared(ctx, flags, deps, objs) } diff --git a/filesystem/aconfig_files.go b/filesystem/aconfig_files.go index 608fccdad..7de404f2d 100644 --- a/filesystem/aconfig_files.go +++ b/filesystem/aconfig_files.go @@ -52,6 +52,8 @@ func (f *filesystem) buildAconfigFlagsFiles(ctx android.ModuleContext, builder * sb.WriteString(aconfigToolPath.String()) sb.WriteString(" dump-cache --dedup --format protobuf --out ") sb.WriteString(installAconfigFlagsPath.String()) + sb.WriteString(" --filter container:") + sb.WriteString(f.PartitionType()) sb.WriteString(" \\\n") sb.WriteString(sbCaches.String()) cmd.ImplicitOutput(installAconfigFlagsPath) @@ -71,8 +73,9 @@ func (f *filesystem) buildAconfigFlagsFiles(ctx android.ModuleContext, builder * sb.WriteString(fileType) sb.WriteString(" --out ") sb.WriteString(outputPath.String()) - sb.WriteString(" \\\n") - sb.WriteString(sbCaches.String()) + sb.WriteString(" --cache ") + sb.WriteString(installAconfigFlagsPath.String()) + sb.WriteRune('\n') cmd.ImplicitOutput(outputPath) f.appendToEntry(ctx, outputPath) } |