Support multiple proguard flags from java_apk.gypi. Proguard supports multiple proguard configurati…

build/java_apk.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This file is meant to be included into a target to provide a rule
 # to build Android APKs in a consistent manner.
 #
 # To use this, create a gyp target with the following form:
 # {
 #   'target_name': 'my_package_apk',
@@ skipping 41 matching lines @@
 {
   'variables': {
     'additional_input_paths': [],
     'input_jars_paths': [],
     'library_dexed_jars_paths': [],
     'additional_src_dirs': [],
     'generated_src_dirs': [],
     'app_manifest_version_name%': '<(android_app_version_name)',
     'app_manifest_version_code%': '<(android_app_version_code)',
     'proguard_enabled%': 'false',
-    'proguard_flags_path%': '<(DEPTH)/build/android/empty_proguard.flags',
+    'proguard_flags_paths%': ['<(DEPTH)/build/android/empty_proguard.flags'],
     'native_libs_paths': [],
     'jar_name': 'chromium_apk_<(_target_name).jar',
     'resource_dir%':'<(DEPTH)/build/android/ant/empty/res',
     'R_package%':'',
     'additional_res_dirs': [],
     'additional_res_packages': [],
     'is_test_apk%': 0,
     'java_strings_grd%': '',
     'library_manifest_paths' : [],
     'resource_input_paths': [],
@@ skipping 266 matching lines @@
         '--ignore=>!(echo \'>(_inputs)\' | md5sum)',
       ]
     },
     {
       'action_name': 'ant_obfuscate_<(_target_name)',
       'message': 'Obfuscating <(_target_name)',
       'inputs': [
         '<(DEPTH)/build/android/ant/apk-obfuscate.xml',
         '<(DEPTH)/build/android/ant/create-test-jar.js',
         '<(compile_stamp)',
-        '<(proguard_flags_path)',
+        '>@(proguard_flags_paths)',
       ],
       'outputs': [
         '<(obfuscate_stamp)',
       ],
       'action': [
         'ant', '-quiet',
         '-DADDITIONAL_SRC_DIRS=>(additional_src_dirs)',
         '-DANDROID_SDK_JAR=<(android_sdk_jar)',
         '-DANDROID_SDK_ROOT=<(android_sdk_root)',
         '-DANDROID_SDK_VERSION=<(android_sdk_version)',
         '-DAPK_NAME=<(apk_name)',
         '-DCREATE_TEST_JAR_PATH=<(DEPTH)/build/android/ant/create-test-jar.js',
         '-DCONFIGURATION_NAME=<(CONFIGURATION_NAME)',
         '-DGENERATED_SRC_DIRS=>(generated_src_dirs)',
         '-DINPUT_JARS_PATHS=>(input_jars_paths)',
         '-DIS_TEST_APK=<(is_test_apk)',
         '-DJAR_PATH=<(PRODUCT_DIR)/lib.java/<(jar_name)',
         '-DOBFUSCATED_JAR_PATH=<(obfuscated_jar_path)',
         '-DOUT_DIR=<(intermediate_dir)',
         '-DPROGUARD_ENABLED=<(proguard_enabled)',
-        '-DPROGUARD_FLAGS=<(proguard_flags_path)',
+        '-DPROGUARD_FLAGS=<(proguard_flags_paths)',
         '-DTEST_JAR_PATH=<(PRODUCT_DIR)/test.lib.java/<(apk_name).jar',
 
         '-DSTAMP=<(obfuscate_stamp)',
         '-Dbasedir=.',
         '-buildfile',
         '<(DEPTH)/build/android/ant/apk-obfuscate.xml',
 
         # Add list of inputs to the command line, so if inputs change
         # (e.g. if a Java file is removed), the command will be re-run.
         # TODO(newt): remove this once crbug.com/177552 is fixed in ninja.
@@ skipping 85 matching lines @@
 
         # Add list of inputs to the command line, so if inputs change
         # (e.g. if a Java file is removed), the command will be re-run.
         # TODO(newt): remove this once crbug.com/177552 is fixed in ninja.
         '-DTHIS_IS_IGNORED=>!(echo \'>(_inputs)\' | md5sum)',
 
       ]
     },
   ],
 }