Updates to Android.mk generation.

platform_tools/android/tests/var_dict_tests.py

Index: platform_tools/android/tests/var_dict_tests.py
diff --git a/platform_tools/android/tests/var_dict_tests.py b/platform_tools/android/tests/var_dict_tests.py
index 8cd96770682cfc30d9c38c22d5fbfe9a206c559a..94f0492b6f074ce93591a965922ad4a0d463526c 100644
--- a/platform_tools/android/tests/var_dict_tests.py
+++ b/platform_tools/android/tests/var_dict_tests.py
@@ -60,29 +60,9 @@ class VarsDictTest(unittest.TestCase):
     for i in range(RANGE):
       v_dict = VarsDict()
       # Add something common to each field, as well as a unique entry
-      v_dict.LOCAL_CFLAGS.add('cflag')
-      v_dict.LOCAL_CFLAGS.add(str(i))
-
-      v_dict.LOCAL_CPPFLAGS.add('cppflag')
-      v_dict.LOCAL_CPPFLAGS.add(str(i))
-
-      v_dict.LOCAL_SRC_FILES.add('src')
-      v_dict.LOCAL_SRC_FILES.add(str(i))
-
-      v_dict.LOCAL_SHARED_LIBRARIES.add('shared')
-      v_dict.LOCAL_SHARED_LIBRARIES.add(str(i))
-
-      v_dict.LOCAL_STATIC_LIBRARIES.add('static')
-      v_dict.LOCAL_STATIC_LIBRARIES.add(str(i))
-
-      v_dict.LOCAL_C_INCLUDES.add('includes')
-      v_dict.LOCAL_C_INCLUDES.add(str(i))
-
-      v_dict.LOCAL_EXPORT_C_INCLUDE_DIRS.add('exports')
-      v_dict.LOCAL_EXPORT_C_INCLUDE_DIRS.add(str(i))
-
-      v_dict.KNOWN_TARGETS.add('known')
-      v_dict.KNOWN_TARGETS.add(str(i))
+      for key in v_dict.keys():
+        v_dict[key].add(key.lower())
+        v_dict[key].add(str(i))
 
       self.assert_consistency(v_dict)