Change bool, and string properties to *bool, and *string for cc
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:
12
cc/strip.go
12
cc/strip.go
@@ -14,12 +14,14 @@
|
||||
|
||||
package cc
|
||||
|
||||
import "android/soong/android"
|
||||
import (
|
||||
"android/soong/android"
|
||||
)
|
||||
|
||||
type StripProperties struct {
|
||||
Strip struct {
|
||||
None bool
|
||||
Keep_symbols bool
|
||||
None *bool
|
||||
Keep_symbols *bool
|
||||
}
|
||||
}
|
||||
|
||||
@@ -28,7 +30,7 @@ type stripper struct {
|
||||
}
|
||||
|
||||
func (stripper *stripper) needsStrip(ctx ModuleContext) bool {
|
||||
return !ctx.AConfig().EmbeddedInMake() && !stripper.StripProperties.Strip.None
|
||||
return !ctx.AConfig().EmbeddedInMake() && !Bool(stripper.StripProperties.Strip.None)
|
||||
}
|
||||
|
||||
func (stripper *stripper) strip(ctx ModuleContext, in, out android.ModuleOutPath,
|
||||
@@ -36,7 +38,7 @@ func (stripper *stripper) strip(ctx ModuleContext, in, out android.ModuleOutPath
|
||||
if ctx.Darwin() {
|
||||
TransformDarwinStrip(ctx, in, out)
|
||||
} else {
|
||||
flags.stripKeepSymbols = stripper.StripProperties.Strip.Keep_symbols
|
||||
flags.stripKeepSymbols = Bool(stripper.StripProperties.Strip.Keep_symbols)
|
||||
// TODO(ccross): don't add gnu debuglink for user builds
|
||||
flags.stripAddGnuDebuglink = true
|
||||
TransformStrip(ctx, in, out, flags)
|
||||
|
Reference in New Issue
Block a user