StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change bool, and string properties to *bool, and *string for cc

Browse Source 
there's no use case for prepending/appending to bool, and string
properties within module struct. Declearing "*bool" and "*string" almost
cover everything user need.

I did see one case that user specify relative_install_path as
path prefix in cc_defaults, and concatenate with the one in real module
to get the final relative install path in Android.bp <bionic/tests/libs>.

Test: m -j checkbuild
Bug: b/68853585
Change-Id: If3a7a2689c3fc307aae136af6bc9c57f27a1e1a0
This commit is contained in:
Nan Zhang
2017-11-07 10:57:05 -08:00
parent 4647be4afe
commit 0007d810e2
21 changed files with 116 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cc/object.go
View File

@@ -83,9 +83,9 @@ func (object *objectLinker) link(ctx ModuleContext,
if len(objs.objFiles) == 1 {
outputFile = objs.objFiles[0]
if object.Properties.Prefix_symbols != "" {
if String(object.Properties.Prefix_symbols) != "" {
output := android.PathForModuleOut(ctx, ctx.ModuleName()+objectExtension)
TransformBinaryPrefixSymbols(ctx, object.Properties.Prefix_symbols, outputFile,
TransformBinaryPrefixSymbols(ctx, String(object.Properties.Prefix_symbols), outputFile,
builderFlags, output)
outputFile = output
}
@@ -93,9 +93,9 @@ func (object *objectLinker) link(ctx ModuleContext,
output := android.PathForModuleOut(ctx, ctx.ModuleName()+objectExtension)
outputFile = output
if object.Properties.Prefix_symbols != "" {
if String(object.Properties.Prefix_symbols) != "" {
input := android.PathForModuleOut(ctx, "unprefixed", ctx.ModuleName()+objectExtension)
TransformBinaryPrefixSymbols(ctx, object.Properties.Prefix_symbols, input,
TransformBinaryPrefixSymbols(ctx, String(object.Properties.Prefix_symbols), input,
builderFlags, output)
output = input
}