Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84ded863 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Support LOCAL_SOONG_PROGUARD_DICT in soong_java_prebuilt.mk" am: 7d9b575f am: 063c5449

am: d1a54664

Change-Id: Ic1955498780122291a0059c1d435361913f3ffee
parents ceeace34 d1a54664
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -51,6 +51,13 @@ ifdef LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR
    $(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