commit 96e7f85b51c5a0874aa3e42c50aeea6611aa08e9
author Colin Cross <ccross@android.com> Tue May 22 11:10:24 2018 -0700
committer Colin Cross <ccross@android.com> Tue May 22 12:51:27 2018 -0700
tree 20e9612d9104521ec86ed61f5d77664298a4a4e9
parent 1a6e5c0c15f7981f37a114fa55d9b1dd29ed89ca

Fix optimize.proguard_flags_files typo

LOCAL_PROGUARD_FLAG_FILES should convert to
optimize.proguard_flags_files, not optimize.proguard_flag_files.

Test: m checkbuild
Change-Id: I1471afc006a2a3892af37d2cb73c51636f05d7f7

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.