Export strip information to Make am: 7517ed0b46

am: 0d3a8db293

Change-Id: I356c11662f0b787eb12ad1a28e2c2478e8d1877c
This commit is contained in:
Dan Willemsen
2016-06-11 01:49:18 +00:00
committed by android-build-merger

View File

@@ -79,6 +79,8 @@ func (library *baseLinker) AndroidMk(ret *android.AndroidMkData) {
func (library *libraryLinker) AndroidMk(ret *android.AndroidMkData) { func (library *libraryLinker) AndroidMk(ret *android.AndroidMkData) {
library.baseLinker.AndroidMk(ret) library.baseLinker.AndroidMk(ret)
library.stripper.AndroidMk(ret)
ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) error { ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) error {
var exportedIncludes []string var exportedIncludes []string
for _, flag := range library.exportedFlags() { for _, flag := range library.exportedFlags() {
@@ -110,6 +112,8 @@ func (object *objectLinker) AndroidMk(ret *android.AndroidMkData) {
} }
func (binary *binaryLinker) AndroidMk(ret *android.AndroidMkData) { func (binary *binaryLinker) AndroidMk(ret *android.AndroidMkData) {
binary.stripper.AndroidMk(ret)
ret.Class = "EXECUTABLES" ret.Class = "EXECUTABLES"
ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) error { ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) error {
fmt.Fprintln(w, "LOCAL_CXX_STL := none") fmt.Fprintln(w, "LOCAL_CXX_STL := none")
@@ -137,6 +141,18 @@ func (library *toolchainLibraryLinker) AndroidMk(ret *android.AndroidMkData) {
}) })
} }
func (stripper *stripper) AndroidMk(ret *android.AndroidMkData) {
ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) error {
if stripper.StripProperties.Strip.None {
fmt.Fprintln(w, "LOCAL_STRIP_MODULE := false")
} else if stripper.StripProperties.Strip.Keep_symbols {
fmt.Fprintln(w, "LOCAL_STRIP_MODULE := keep_symbols")
}
return nil
})
}
func (installer *baseInstaller) AndroidMk(ret *android.AndroidMkData) { func (installer *baseInstaller) AndroidMk(ret *android.AndroidMkData) {
ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) error { ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) error {
path := installer.path.RelPathString() path := installer.path.RelPathString()