Predex java libraries

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 35 matching lines @@
 #    By default, the package given in AndroidManifest.xml will be used.
 #  java_strings_grd - The name of the grd file from which to generate localized
 #    strings.xml files, if any.
 #  library_manifest_paths'- Paths to additional AndroidManifest.xml files from
 #    libraries.
 
 {
   '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',
     'native_libs_paths': [],
     'jar_name': 'chromium_apk_<(_target_name).jar',
     'resource_dir%':'<(DEPTH)/build/android/ant/empty/res',
     'R_package%':'',
@@ skipping 239 matching lines @@
     },
     {
       'action_name': 'dex_<(_target_name)',
       'message': 'Dexing <(_target_name) jar',
       'variables': {
         'conditions': [
           ['proguard_enabled==1', {
             'dex_inputs': [ '<(obfuscated_jar_path)' ],
           }, {
             'dex_inputs': [
-              '>@(input_jars_paths)',
+              '>@(library_dexed_jars_paths)',
               '<(classes_dir)',
             ],
           }],
         ],
       },
       'inputs': [
         '<(DEPTH)/build/android/pylib/build_utils.py',
         '<(DEPTH)/build/android/dex.py',
         '<(compile_stamp)',
         '>@(dex_inputs)',
@@ skipping 58 matching lines @@
         # TODO(newt): remove this once crbug.com/177552 is fixed in ninja.
         '-DTHIS_IS_IGNORED=>!(echo \'>(_inputs)\' | md5sum)',
 
         '-Dbasedir=.',
         '-buildfile',
         '<(DEPTH)/build/android/ant/apk-package.xml',
       ]
     },
   ],
 }