Revert of [Android] Rework multidex and enable multidex for unit_tests_apk.

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 56 matching lines @@
 #    code. This allows a test APK to inject a Linker.TestRunner instance at
 #    runtime. Should only be used by the chromium_linker_test_apk target!!
 #  never_lint - Set to 1 to not run lint on this target.
 #  java_in_dir_suffix - To override the /src suffix on java_in_dir.
 #  app_manifest_version_name - set the apps 'human readable' version number.
 #  app_manifest_version_code - set the apps version number.
 #  dependencies_locale_zip_alternative_paths - a list of paths that used to
 #    replace dependencies_locale_zip_paths of all_dependent_settings.
 {
   'variables': {
-    'tested_apk_path%': '/',
     'tested_apk_obfuscated_jar_path%': '/',
     'tested_apk_dex_path%': '/',
     'tested_apk_is_multidex%': 0,
     'additional_input_paths': [],
     'additional_locale_input_paths': [],
     'create_density_splits%': 0,
     'language_splits': [],
     'library_jars_paths': [],
     'input_jars_paths': [],
     'library_dexed_jars_paths': [],
@@ skipping 27 matching lines @@
     'package_input_paths': [],
     'ordered_libraries_file': '<(intermediate_dir)/native_libraries.json',
     'additional_ordered_libraries_file': '<(intermediate_dir)/additional_native_libraries.json',
     'native_libraries_template': '<(DEPTH)/base/android/java/templates/NativeLibraries.template',
     'native_libraries_java_dir': '<(intermediate_dir)/native_libraries_java/',
     'native_libraries_java_file': '<(native_libraries_java_dir)/NativeLibraries.java',
     'native_libraries_java_stamp': '<(intermediate_dir)/native_libraries_java.stamp',
     'native_libraries_template_data_dir': '<(intermediate_dir)/native_libraries/',
     'native_libraries_template_data_file': '<(native_libraries_template_data_dir)/native_libraries_array.h',
     'native_libraries_template_version_file': '<(native_libraries_template_data_dir)/native_libraries_version.h',
-    'generate_multidex_config%': 0,
-    'multidex_config_template': '<(DEPTH)/base/android/java/templates/ChromiumMultiDex.template',
-    'multidex_config_java_dir': '<(intermediate_dir)/multidex_config/',
-    'multidex_config_java_file': '<(multidex_config_java_dir)/ChromiumMultiDex.java',
-    'multidex_config_java_stamp': '<(intermediate_dir)/multidex_config_java.stamp',
     'compile_stamp': '<(intermediate_dir)/compile.stamp',
     'lint_stamp': '<(intermediate_dir)/lint.stamp',
     'lint_result': '<(intermediate_dir)/lint_result.xml',
     'lint_config': '<(intermediate_dir)/lint_config.xml',
     'never_lint%': 0,
     'findbugs_stamp': '<(intermediate_dir)/findbugs.stamp',
     'run_findbugs%': 0,
     'java_in_dir_suffix%': '/src',
     'emma_instr_stamp': '<(intermediate_dir)/emma_instr.stamp',
     'jar_stamp': '<(intermediate_dir)/jar.stamp',
@@ skipping 653 matching lines @@
           'action': [
             'python', '<(DEPTH)/build/android/findbugs_diff.py',
             '--auxclasspath-gyp', '>(input_jars_paths)',
             '--stamp', '<(findbugs_stamp)',
             '<@(additional_findbugs_args)',
             '<(jar_path)',
           ],
         },
       ],
     }],
-  ],
-  'target_conditions': [
-    ['generate_multidex_config == 1 and is_test_apk == 0', {
-      'variables': {
-        'generated_src_dirs': ['<(multidex_config_java_dir)'],
-      },
+    ['enable_multidex == 1', {
       'actions': [
         {
+          'action_name': 'main_dex_list_for_<(_target_name)',
+          'variables': {
+            'jar_paths': ['>@(input_jars_paths)', '<(javac_jar_path)'],
+            'output_path': '<(main_dex_list_path)',
+          },
+          'includes': [ 'android/main_dex_action.gypi' ],
+        },
+        {
           'action_name': 'configure_multidex_for_<(_target_name)',
           'inputs': [
             '<(DEPTH)/build/android/gyp/configure_multidex.py',
-            '<(multidex_config_template)',
           ],
           'outputs': [
             '<(multidex_configuration_path)',
-            '<(multidex_config_java_stamp)',
           ],
           'variables': {
             'additional_multidex_config_options': [],
-            'enabled_configurations': '>(enable_multidex_configurations)',
-            'conditions': [
-              ['enable_multidex == 1', {
-                'additional_multidex_config_options': ['--enable-multidex'],
-              }],
-            ],
+            'enabled_configurations': ['>@(enable_multidex_configurations)'],
           },
           'action': [
             'python', '<(DEPTH)/build/android/gyp/configure_multidex.py',
             '--configuration-name', '<(CONFIGURATION_NAME)',
             '--enabled-configurations', '<(enabled_configurations)',
             '--multidex-configuration-path', '<(multidex_configuration_path)',
-            '--multidex-config-java-template', '<(multidex_config_template)',
-            '--multidex-config-java-file', '<(multidex_config_java_file)',
-            '--multidex-config-java-stamp', '<(multidex_config_java_stamp)',
             '>@(additional_multidex_config_options)',
           ],
         },
       ],
-      'conditions': [
-        ['enable_multidex == 1', {
-          'actions': [
-            {
-              'action_name': 'main_dex_list_for_<(_target_name)',
-              'variables': {
-                'jar_paths': ['>@(input_jars_paths)', '<(javac_jar_path)'],
-                'output_path': '<(main_dex_list_path)',
-              },
-              'includes': [ 'android/main_dex_action.gypi' ],
-            },
-          ]
-        }]
-      ],
     }],
   ],
   'dependencies': [
     '<(DEPTH)/tools/android/md5sum/md5sum.gyp:md5sum',
   ],
   'actions': [
     {
       'action_name': 'process_resources',
       'message': 'processing resources for <(_target_name)',
       'variables': {
@@ skipping 110 matching lines @@
         '<(DEPTH)/build/android/gyp/javac.py',
         '>@(java_sources)',
         '>@(input_jars_paths)',
         '<(codegen_stamp)',
         '<@(extra_inputs)',
       ],
       'conditions': [
         ['native_lib_target != ""', {
           'inputs': [ '<(native_libraries_java_stamp)' ],
         }],
-        ['generate_multidex_config == 1', {
-          'inputs': [ '<(multidex_config_java_stamp)' ],
-        }],
       ],
       'outputs': [
         '<(compile_stamp)',
         '<(javac_jar_path)',
       ],
       'action': [
         'python', '<(DEPTH)/build/android/gyp/javac.py',
         '--bootclasspath=<(android_sdk_jar)',
         '--classpath=>(input_jars_paths) <(android_sdk_jar) >(library_jars_paths)',
         '--src-gendirs=>(gen_src_dirs)',
@@ skipping 239 matching lines @@
             'native_libs_dir': '<(apk_package_native_libs_dir)',
           }, {
             'native_libs_dir': '<(DEPTH)/build/android/ant/empty/res',
           }],
         ],
       },
       'includes': ['android/apkbuilder_action.gypi'],
     },
   ],
 }