commit 691335af219438b276dc8e6bc77a9d3e9e363db1
author Colin Cross <ccross@android.com> Tue Apr 23 13:02:43 2019 -0700
committer Colin Cross <ccross@android.com> Tue Apr 23 20:05:35 2019 +0000
tree 9304d733bb75ede6d050dfd0c22f52e6b1ddb15e
parent f6105e595b3635a4af83b935b184450d076f6f28

Support LOCAL_SOONG_PROGUARD_DICT in soong_java_prebuilt.mk

Test: m checkbuild
Change-Id: I60a14be7d8bc4992b0519397b0e1933819f6e773

core/soong_java_prebuilt.mk

diff --git a/core/soong_java_prebuilt.mk b/core/soong_java_prebuilt.mk
index 9692a99..6a76fc4 100644
--- a/core/soong_java_prebuilt.mk
+++ b/core/soong_java_prebuilt.mk
@@ -51,6 +51,13 @@
     $(intermediates.COMMON)/jacoco-report-classes.jar)
 endif
 
+ifdef LOCAL_SOONG_PROGUARD_DICT
+  $(eval $(call copy-one-file,$(LOCAL_SOONG_PROGUARD_DICT),\
+    $(intermediates.COMMON)/proguard_dictionary))
+  $(call add-dependency,$(LOCAL_BUILT_MODULE),\
+    $(intermediates.COMMON)/proguard_dictionary)
+endif
+
 ifdef LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE
   my_res_package := $(intermediates.COMMON)/package-res.apk