diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/androidmk.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/java/androidmk.go b/java/androidmk.go index 304b1c42d..095acd7de 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -91,6 +91,10 @@ func (library *Library) AndroidMk() android.AndroidMkData { 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 // to be used for droiddoc // TODO(ccross): remove this once droiddoc is in soong @@ -373,9 +377,6 @@ func (a *AndroidLibrary) AndroidMk() android.AndroidMkData { if a.aarFile != nil { 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" { fmt.Fprintln(w, "LOCAL_MODULE_PATH := $(TARGET_OUT_JAVA_LIBRARIES)") |