commit 8f09cd34b69f81b4d520bdbd06594112d1adbaa5
author Colin Cross <ccross@android.com> Thu May 24 17:18:31 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 24 17:18:31 2018 +0000
tree 8e47a1977099abb16a5456a3827379b63e688632
parent 78a01965d077fef952a228ab4a9a0cd1cb51670a
parent 96e7f85b51c5a0874aa3e42c50aeea6611aa08e9

Merge "Fix optimize.proguard_flags_files typo"

androidmk/cmd/androidmk/android.go

diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go
index 37877c8..ed6a356 100644
--- a/androidmk/cmd/androidmk/android.go
+++ b/androidmk/cmd/androidmk/android.go
@@ -147,7 +147,7 @@
 			"LOCAL_ANNOTATION_PROCESSOR_CLASSES": "annotation_processor_classes",
 
 			"LOCAL_PROGUARD_FLAGS":      "optimize.proguard_flags",
-			"LOCAL_PROGUARD_FLAG_FILES": "optimize.proguard_flag_files",
+			"LOCAL_PROGUARD_FLAG_FILES": "optimize.proguard_flags_files",
 
 			// These will be rewritten to libs/static_libs by bpfix, after their presence is used to convert
 			// java_library_static to android_library.