diff options
Diffstat (limited to 'java/androidmk.go')
| -rw-r--r-- | java/androidmk.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/androidmk.go b/java/androidmk.go index 081fcb25d..650d12661 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -127,8 +127,8 @@ func (library *Library) AndroidMkEntries() []android.AndroidMkEntries { entries.AddStrings("LOCAL_ADDITIONAL_CHECKED_MODULE", library.additionalCheckedModules.Strings()...) } - if library.proguardDictionary != nil { - entries.SetPath("LOCAL_SOONG_PROGUARD_DICT", library.proguardDictionary) + if library.dexer.proguardDictionary.Valid() { + entries.SetPath("LOCAL_SOONG_PROGUARD_DICT", library.dexer.proguardDictionary.Path()) } entries.SetString("LOCAL_MODULE_STEM", library.Stem()) @@ -332,8 +332,8 @@ func (app *AndroidApp) AndroidMkEntries() []android.AndroidMkEntries { if app.jacocoReportClassesFile != nil { entries.SetPath("LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR", app.jacocoReportClassesFile) } - if app.proguardDictionary != nil { - entries.SetPath("LOCAL_SOONG_PROGUARD_DICT", app.proguardDictionary) + if app.dexer.proguardDictionary.Valid() { + entries.SetPath("LOCAL_SOONG_PROGUARD_DICT", app.dexer.proguardDictionary.Path()) } if app.Name() == "framework-res" { |