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

base/base.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     '../build/win_precompile.gypi',
@@ skipping 1471 matching lines @@
         {
           # GN: //base:base_multidex_gen
           'target_name': 'base_multidex_gen',
           'type': 'none',
           'sources': [
             'android/java/templates/ChromiumMultiDex.template',
           ],
           'variables': {
             'package_name': 'org/chromium/base/multidex',
             'template_deps': [],
+            'additional_gcc_preprocess_options': [
+              '--defines', 'MULTIDEX_CONFIGURATION_<(CONFIGURATION_NAME)',
+            ],
           },
           'includes': ['../build/android/java_cpp_template.gypi'],
         },
         {
           # GN: //base:base_android_java_enums_srcjar
           'target_name': 'base_java_library_process_type',
           'type': 'none',
           'variables': {
             'source_file': 'android/library_loader/library_loader_hooks.h',
           },
           'includes': [ '../build/android/java_cpp_enum.gypi' ],
         },
         {
           # GN: //base:base_java
           'target_name': 'base_java',
           'type': 'none',
           'variables': {
             'java_in_dir': 'android/java',
-            'jar_excluded_classes': [
-              '*/ChromiumMultiDex.class',
-              '*/NativeLibraries.class',
-            ],
+            'jar_excluded_classes': [ '*/NativeLibraries.class' ],
           },
           'dependencies': [
             'base_java_application_state',
             'base_java_library_load_from_apk_status_codes',
             'base_java_library_process_type',
             'base_java_memory_pressure_level',
             'base_multidex_gen',
             'base_native_libraries_gen',
             '../third_party/android_tools/android_tools.gyp:android_support_multidex_javalib',
             '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib',
           ],
-          'all_dependent_settings': {
-            'variables': {
-              'generate_multidex_config': 1,
-            },
-          },
           'includes': [ '../build/java.gypi' ],
         },
         {
           # GN: //base:base_java_unittest_support
           'target_name': 'base_java_unittest_support',
           'type': 'none',
           'dependencies': [
             'base_java',
           ],
           'variables': {
@@ skipping 41 matching lines @@
           },
           'includes': [ '../build/java.gypi' ],
         },
         {
           # TODO(jbudorick): Remove this once we roll to robolectric 3.0 and pull
           # in the multidex shadow library. crbug.com/522043
           # GN: //base:base_junit_test_support
           'target_name': 'base_junit_test_support',
           'type': 'none',
           'dependencies': [
-            'base_multidex_gen',
             '../testing/android/junit/junit_test.gyp:junit_test_support',
             '../third_party/android_tools/android_tools.gyp:android_support_multidex_javalib',
           ],
           'variables': {
             'src_paths': [
               '../base/test/android/junit/src/org/chromium/base/test/shadows/ShadowMultiDex.java',
             ],
           },
           'includes': [ '../build/host_jar.gypi' ]
         },
@@ skipping 140 matching lines @@
             '../build/isolate.gypi',
           ],
           'sources': [
             'base_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }