openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "[trivial] Remove dead code" 

am: fccc52f46b

Change-Id: Ieac00d1f29b5077836e68748f2e2e41df17315ec
This commit is contained in:
Inseob Kim 2019-07-08 17:27:49 -07:00 committed by android-build-merger
parent f0cb835ebf fccc52f46b
commit f23a2bfa6f
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cc/library.go
View File

@ -113,8 +113,6 @@ type LibraryProperties struct {
} }
type LibraryMutatedProperties struct { type LibraryMutatedProperties struct {
VariantName string `blueprint:"mutated"`
// Build a static variant // Build a static variant
BuildStatic bool `blueprint:"mutated"` BuildStatic bool `blueprint:"mutated"`
// Build a shared variant // 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 var versioningMacroNamesListMutex sync.Mutex
@ -633,7 +631,7 @@ func (library *libraryDecorator) linkStatic(ctx ModuleContext,
library.objects = deps.WholeStaticLibObjs.Copy() library.objects = deps.WholeStaticLibObjs.Copy()
library.objects = library.objects.Append(objs) library.objects = library.objects.Append(objs)
fileName := ctx.ModuleName() + library.MutatedProperties.VariantName + staticLibraryExtension fileName := ctx.ModuleName() + staticLibraryExtension
outputFile := android.PathForModuleOut(ctx, fileName) outputFile := android.PathForModuleOut(ctx, fileName)
builderFlags := flagsToBuilderFlags(flags) builderFlags := flagsToBuilderFlags(flags)
@ -651,8 +649,7 @@ func (library *libraryDecorator) linkStatic(ctx ModuleContext,
TransformObjToStaticLib(ctx, library.objects.objFiles, builderFlags, outputFile, objs.tidyFiles) TransformObjToStaticLib(ctx, library.objects.objFiles, builderFlags, outputFile, objs.tidyFiles)
library.coverageOutputFile = TransformCoverageFilesToZip(ctx, library.objects, library.coverageOutputFile = TransformCoverageFilesToZip(ctx, library.objects, ctx.ModuleName())
ctx.ModuleName()+library.MutatedProperties.VariantName)
library.wholeStaticMissingDeps = ctx.GetMissingDependencies() library.wholeStaticMissingDeps = ctx.GetMissingDependencies()