Merge "build: clean up proguard_flag_files" am: 7cd5386b51
am: 95f4a845d4

Change-Id: I87f54711150bcdd315b31e469cd2aba490f1de61
diff --git a/core/java.mk b/core/java.mk
index e290d5c..717e02d 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -739,6 +739,7 @@
 endif # !USE_R8
 
 else  # LOCAL_PROGUARD_ENABLED not defined
+proguard_flag_files :=
 full_classes_proguard_jar := $(full_classes_pre_proguard_jar)
 endif # LOCAL_PROGUARD_ENABLED defined