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

Export proguard_dictionary for java_library modules

Browse Source 
Move exporting LOCAL_SOONG_PROGUARD_DICT from AndroidLibrary
to Library so that it is exported for java_library modules.

Test: m checkbuild
Change-Id: I27ea08ad8ba9072d0648c141cdbaf447c5268f91
This commit is contained in:
Colin Cross
2019-04-23 13:00:09 -07:00
parent 28c3eb6829
commit e8a7dc987c
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/androidmk.go
View File

@@ -91,6 +91,10 @@ func (library *Library) AndroidMk() android.AndroidMkData {
fmt.Fprintln(w, "LOCAL_ADDITIONAL_CHECKED_MODULE +=", strings.Join(library.additionalCheckedModules.Strings(), " ")) fmt.Fprintln(w, "LOCAL_ADDITIONAL_CHECKED_MODULE +=", strings.Join(library.additionalCheckedModules.Strings(), " "))
} }
if library.proguardDictionary != nil {
fmt.Fprintln(w, "LOCAL_SOONG_PROGUARD_DICT :=", library.proguardDictionary.String())
}
// Temporary hack: export sources used to compile framework.jar to Make // Temporary hack: export sources used to compile framework.jar to Make
// to be used for droiddoc // to be used for droiddoc
// TODO(ccross): remove this once droiddoc is in soong // TODO(ccross): remove this once droiddoc is in soong
@@ -373,9 +377,6 @@ func (a *AndroidLibrary) AndroidMk() android.AndroidMkData {
if a.aarFile != nil { if a.aarFile != nil {
fmt.Fprintln(w, "LOCAL_SOONG_AAR :=", a.aarFile.String()) fmt.Fprintln(w, "LOCAL_SOONG_AAR :=", a.aarFile.String())
} }
if a.proguardDictionary != nil {
fmt.Fprintln(w, "LOCAL_SOONG_PROGUARD_DICT :=", a.proguardDictionary.String())
}
if a.Name() == "framework-res" { if a.Name() == "framework-res" {
fmt.Fprintln(w, "LOCAL_MODULE_PATH := $(TARGET_OUT_JAVA_LIBRARIES)") fmt.Fprintln(w, "LOCAL_MODULE_PATH := $(TARGET_OUT_JAVA_LIBRARIES)")