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 "Improve abidump generating logic for non-REL build"

This commit is contained in:
Treehugger Robot 2020-08-13 11:53:05 +00:00 committed by Gerrit Code Review
parent d59540234c eb912dcce8
commit 29737cfc94
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cc/androidmk.go
View File

@ -206,29 +206,15 @@ func (library *libraryDecorator) androidMkWriteExportedFlags(entries *android.An
} }
func (library *libraryDecorator) androidMkEntriesWriteAdditionalDependenciesForSourceAbiDiff(entries *android.AndroidMkEntries) { func (library *libraryDecorator) androidMkEntriesWriteAdditionalDependenciesForSourceAbiDiff(entries *android.AndroidMkEntries) {
if library.sAbiOutputFile.Valid() { if library.sAbiDiff.Valid() && !library.static() {
entries.SetString("LOCAL_ADDITIONAL_DEPENDENCIES", entries.AddStrings("LOCAL_ADDITIONAL_DEPENDENCIES", library.sAbiDiff.String())
"$(LOCAL_ADDITIONAL_DEPENDENCIES) "+library.sAbiOutputFile.String())
if library.sAbiDiff.Valid() && !library.static() {
entries.SetString("LOCAL_ADDITIONAL_DEPENDENCIES",
"$(LOCAL_ADDITIONAL_DEPENDENCIES) "+library.sAbiDiff.String())
entries.SetString("HEADER_ABI_DIFFS",
"$(HEADER_ABI_DIFFS) "+library.sAbiDiff.String())
}
} }
} }
// TODO(ccross): remove this once apex/androidmk.go is converted to AndroidMkEntries // TODO(ccross): remove this once apex/androidmk.go is converted to AndroidMkEntries
func (library *libraryDecorator) androidMkWriteAdditionalDependenciesForSourceAbiDiff(w io.Writer) { func (library *libraryDecorator) androidMkWriteAdditionalDependenciesForSourceAbiDiff(w io.Writer) {
if library.sAbiOutputFile.Valid() { if library.sAbiDiff.Valid() && !library.static() {
fmt.Fprintln(w, "LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_ADDITIONAL_DEPENDENCIES) ", fmt.Fprintln(w, "LOCAL_ADDITIONAL_DEPENDENCIES +=", library.sAbiDiff.String())
library.sAbiOutputFile.String())
if library.sAbiDiff.Valid() && !library.static() {
fmt.Fprintln(w, "LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_ADDITIONAL_DEPENDENCIES) ",
library.sAbiDiff.String())
fmt.Fprintln(w, "HEADER_ABI_DIFFS := $(HEADER_ABI_DIFFS) ",
library.sAbiDiff.String())
}
} }
} }