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

Merge "Improve abidump generating logic for non-REL build" am: 29737cfc94

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1374297

Change-Id: Id2d8ba83012f795cf7a36e83b6e9799527295e07
This commit is contained in:
Treehugger Robot
2020-08-13 12:11:42 +00:00
committed by Automerger Merge Worker
parent 8acd131453 29737cfc94
commit 0c8d7c6958
1 changed files with 4 additions and 18 deletions
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) {
if library.sAbiOutputFile.Valid() {
entries.SetString("LOCAL_ADDITIONAL_DEPENDENCIES",
"$(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())
}
if library.sAbiDiff.Valid() && !library.static() {
entries.AddStrings("LOCAL_ADDITIONAL_DEPENDENCIES", library.sAbiDiff.String())
}
}
// TODO(ccross): remove this once apex/androidmk.go is converted to AndroidMkEntries
func (library *libraryDecorator) androidMkWriteAdditionalDependenciesForSourceAbiDiff(w io.Writer) {
if library.sAbiOutputFile.Valid() {
fmt.Fprintln(w, "LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_ADDITIONAL_DEPENDENCIES) ",
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())
}
if library.sAbiDiff.Valid() && !library.static() {
fmt.Fprintln(w, "LOCAL_ADDITIONAL_DEPENDENCIES +=", library.sAbiDiff.String())
}
}