Make test apks only dex files not in tested apk (proguard version)

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 34 matching lines @@
 #  R_package - A custom Java package to generate the resource file R.java in.
 #    By default, the package given in AndroidManifest.xml will be used.
 #  use_chromium_linker - Enable the content dynamic linker that allows sharing the
 #    RELRO section of the native libraries between the different processes.
 #  enable_chromium_linker_tests - Enable the content dynamic linker test support
 #    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.
 {
   'variables': {
+    'tested_apk_obfuscated_jar_path%': '/',
     'tested_apk_dex_path%': '/',
     '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)',
     # aapt generates this proguard.txt.
     'generated_proguard_file': '<(intermediate_dir)/proguard.txt',
@@ skipping 86 matching lines @@
     'emma_instrument%': '<(emma_instrument)',
     'apk_package_native_libs_dir': '<(apk_package_native_libs_dir)',
     'unsigned_standalone_apk_path': '<(unsigned_standalone_apk_path)',
     'extra_native_libs': [],
     'apk_dex_input_paths': [ '>@(library_dexed_jars_paths)' ],
   },
   # Pass the jar path to the apk's "fake" jar target.  This would be better as
   # direct_dependent_settings, but a variable set by a direct_dependent_settings
   # cannot be lifted in a dependent to all_dependent_settings.
   'all_dependent_settings': {
+    'conditions': [
+      ['proguard_enabled == "true"', {
+        'variables': {
+          'proguard_enabled': 'true',
+        }
+      }],
+    ],
     'variables': {
       'apk_output_jar_path': '<(jar_path)',
+      'tested_apk_obfuscated_jar_path': '<(obfuscated_jar_path)',
       'tested_apk_dex_path': '<(dex_path)',
     },
   },
   'conditions': [
     ['resource_dir!=""', {
       'variables': {
         'resource_input_paths': [ '<!@(find <(resource_dir) -name "*")' ]
       },
     }],
     ['R_package != ""', {
@@ skipping 424 matching lines @@
         '--jar-path=<(jar_path)',
         '--excluded-classes=<(jar_excluded_classes)',
         '--stamp=<(jar_stamp)',
       ]
     },
     {
       'action_name': 'obfuscate_<(_target_name)',
       'message': 'Obfuscating <(_target_name)',
       'variables': {
         'additional_obfuscate_options': [],
+        'additional_obfuscate_input_paths': [],
         'proguard_out_dir': '<(intermediate_dir)/proguard',
         'proguard_input_jar_paths': [
           '>@(input_jars_paths)',
           '<(jar_path)',
         ],
-        'conditions': [
+        'target_conditions': [
           ['is_test_apk == 1', {
             'additional_obfuscate_options': [
               '--testapp',
             ],
           }],
+          ['is_test_apk == 1 and tested_apk_obfuscated_jar_path != "/"', {
+            'additional_obfuscate_options': [
+              '--tested-apk-obfuscated-jar-path', '>(tested_apk_obfuscated_jar_path)',
+            ],
+            'additional_obfuscate_input_paths': [
+              '>(tested_apk_obfuscated_jar_path).info',
+            ],
+          }],
           ['proguard_enabled == "true"', {
             'additional_obfuscate_options': [
               '--proguard-enabled',
             ],
           }],
         ],
+        'obfuscate_input_jars_paths': [
+          '>@(input_jars_paths)',
+          '<(jar_path)',
+        ],
       },
       'conditions': [
         ['is_test_apk == 1', {
           'outputs': [
             '<(test_jar_path)',
           ],
         }],
       ],
       'inputs': [
         '<(DEPTH)/build/android/gyp/apk_obfuscate.py',
         '<(DEPTH)/build/android/gyp/util/build_utils.py',
         '>@(proguard_flags_paths)',
-        '>@(proguard_input_jar_paths)',
+        '>@(obfuscate_input_jars_paths)',
+        '>@(additional_obfuscate_input_paths)',
+        '<(instr_stamp)',
       ],
       'outputs': [
-        # This lists obfuscate_stamp instead of obfuscated_jar_path because
-        # ant only writes the latter if the md5 of the inputs changes.
         '<(obfuscate_stamp)',
 
         # In non-Release builds, these paths will all be empty files.
         '<(obfuscated_jar_path)',
+        '<(obfuscated_jar_path).info',
         '<(obfuscated_jar_path).dump',
         '<(obfuscated_jar_path).seeds',
         '<(obfuscated_jar_path).mapping',
         '<(obfuscated_jar_path).usage',
       ],
       'action': [
         'python', '<(DEPTH)/build/android/gyp/apk_obfuscate.py',
 
         '--configuration-name', '<(CONFIGURATION_NAME)',
 
         '--android-sdk', '<(android_sdk)',
         '--android-sdk-tools', '<(android_sdk_tools)',
         '--android-sdk-jar', '<(android_sdk_jar)',
 
         '--input-jars-paths=>(proguard_input_jar_paths)',
+        '--proguard-configs=>(proguard_flags_paths)',
+
+
         '--test-jar-path', '<(test_jar_path)',
         '--obfuscated-jar-path', '<(obfuscated_jar_path)',
 
         '--proguard-jar-path', '<(android_sdk_root)/tools/proguard/lib/proguard.jar',
 
-        '--proguard-config-files=<(proguard_flags_paths)',
         '--stamp', '<(obfuscate_stamp)',
 
-        '<@(additional_obfuscate_options)',
+        '>@(additional_obfuscate_options)',
       ],
     },
     {
       'action_name': 'dex_<(_target_name)',
       'variables': {
         'output_path': '<(dex_path)',
         'dex_input_paths': [
           '>@(apk_dex_input_paths)',
           '<(jar_path)',
         ],
         'proguard_enabled_input_path': '<(obfuscated_jar_path)',
       },
       'target_conditions': [
         ['emma_instrument != 0', {
           'dex_no_locals': 1,
           'dex_input_paths': [
             '<(emma_device_jar)'
           ],
         }],
         ['is_test_apk == 1 and tested_apk_dex_path != "/"', {
           'variables': {
             'dex_additional_options': [
               '--excluded-paths-file', '>(tested_apk_dex_path).inputs'
             ],
           },
           'inputs': [
             '>(tested_apk_dex_path).inputs',
           ],
         }],
-      ],
-      'conditions': [
         ['proguard_enabled == "true"', {
           'inputs': [ '<(obfuscate_stamp)' ]
         }, {
           'inputs': [ '<(instr_stamp)' ]
         }],
       ],
       'includes': [ 'android/dex_action.gypi' ],
     },
     {
       'action_name': 'package_resources',
@@ skipping 78 matching lines @@
         '-DEMMA_INSTRUMENT=<(emma_instrument)',
         '-DEMMA_DEVICE_JAR=<(emma_device_jar)',
 
         '-Dbasedir=.',
         '-buildfile',
         '<(DEPTH)/build/android/ant/apk-package.xml',
       ]
     },
   ],
 }