diff options
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/api_level.go | 6 | ||||
| -rw-r--r-- | cc/strip.go | 12 |
2 files changed, 10 insertions, 8 deletions
diff --git a/cc/api_level.go b/cc/api_level.go index deca72366..fa8dfaf2f 100644 --- a/cc/api_level.go +++ b/cc/api_level.go @@ -31,11 +31,7 @@ func MinApiForArch(ctx android.EarlyModuleContext, case android.Arm64, android.X86_64: return android.FirstLp64Version case android.Riscv64: - apiLevel, err := android.ApiLevelFromUser(ctx, "VanillaIceCream") - if err != nil { - panic(err) - } - return apiLevel + return android.FutureApiLevel default: panic(fmt.Errorf("Unknown arch %q", arch)) } diff --git a/cc/strip.go b/cc/strip.go index a950df898..32ea38df1 100644 --- a/cc/strip.go +++ b/cc/strip.go @@ -23,8 +23,9 @@ import ( // StripProperties defines the type of stripping applied to the module. type StripProperties struct { Strip struct { - // Device and host modules default to stripping enabled leaving mini debuginfo. - // This can be disabled by setting none to true. + // Device modules default to stripping enabled leaving mini debuginfo. + // Host modules default to stripping disabled, but can be enabled by setting any other + // strip boolean property. None *bool `android:"arch_variant"` // all forces stripping everything, including the mini debug info. @@ -50,7 +51,12 @@ type Stripper struct { // NeedsStrip determines if stripping is required for a module. func (stripper *Stripper) NeedsStrip(actx android.ModuleContext) bool { forceDisable := Bool(stripper.StripProperties.Strip.None) - return !forceDisable + // Strip is enabled by default for device variants. + defaultEnable := actx.Device() + forceEnable := Bool(stripper.StripProperties.Strip.All) || + Bool(stripper.StripProperties.Strip.Keep_symbols) || + Bool(stripper.StripProperties.Strip.Keep_symbols_and_debug_frame) + return !forceDisable && (forceEnable || defaultEnable) } func (stripper *Stripper) strip(actx android.ModuleContext, in android.Path, out android.ModuleOutPath, |