From 0ce291ebeef5df57f29733ee6b17717e67b56d8c Mon Sep 17 00:00:00 2001 From: Inseob Kim Date: Thu, 4 Jul 2019 14:38:27 +0900 Subject: [PATCH] [trivial] Remove dead code Bug: N/A Test: m Change-Id: Ia278008249f5fc1cf5fd7d29e55e2e54f1d6f3ca --- cc/library.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/cc/library.go b/cc/library.go index 5fbb36ed6..6ac0c39bc 100644 --- a/cc/library.go +++ b/cc/library.go @@ -113,8 +113,6 @@ type LibraryProperties struct { } type LibraryMutatedProperties struct { - VariantName string `blueprint:"mutated"` - // Build a static variant BuildStatic bool `blueprint:"mutated"` // Build a shared variant @@ -528,7 +526,7 @@ func (library *libraryDecorator) getLibName(ctx ModuleContext) string { } } - return name + library.MutatedProperties.VariantName + return name } var versioningMacroNamesListMutex sync.Mutex @@ -633,7 +631,7 @@ func (library *libraryDecorator) linkStatic(ctx ModuleContext, library.objects = deps.WholeStaticLibObjs.Copy() library.objects = library.objects.Append(objs) - fileName := ctx.ModuleName() + library.MutatedProperties.VariantName + staticLibraryExtension + fileName := ctx.ModuleName() + staticLibraryExtension outputFile := android.PathForModuleOut(ctx, fileName) builderFlags := flagsToBuilderFlags(flags) @@ -651,8 +649,7 @@ func (library *libraryDecorator) linkStatic(ctx ModuleContext, TransformObjToStaticLib(ctx, library.objects.objFiles, builderFlags, outputFile, objs.tidyFiles) - library.coverageOutputFile = TransformCoverageFilesToZip(ctx, library.objects, - ctx.ModuleName()+library.MutatedProperties.VariantName) + library.coverageOutputFile = TransformCoverageFilesToZip(ctx, library.objects, ctx.ModuleName()) library.wholeStaticMissingDeps = ctx.GetMissingDependencies()