Revert of Disable excluding of tested apk's code in test apks

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 144 matching lines @@
     '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',
+          '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': [
@@ skipping 530 matching lines @@
       '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'
+              '--excluded-paths-file', '>(tested_apk_dex_path).inputs'
             ],
           },
           'inputs': [
             '>(tested_apk_dex_path).inputs',
           ],
         }],
         ['proguard_enabled == "true"', {
           'inputs': [ '<(obfuscate_stamp)' ]
         }, {
           'inputs': [ '<(instr_stamp)' ]
@@ skipping 84 matching lines @@
         '-DEMMA_INSTRUMENT=<(emma_instrument)',
         '-DEMMA_DEVICE_JAR=<(emma_device_jar)',
 
         '-Dbasedir=.',
         '-buildfile',
         '<(DEPTH)/build/android/ant/apk-package.xml',
       ]
     },
   ],
 }