[Android] Add an out-of-app instrumentation driver APK.

build/java.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 Java in a consistent manner.
 #
 # To use this, create a gyp target with the following form:
 # {
 #   'target_name': 'my-package_java',
@@ skipping 83 matching lines @@
         }],
         ['chromium_code != 0 and emma_coverage != 0 and emma_never_instrument == 0', {
           'emma_instrument': 1,
         }, {
           'emma_instrument': 0,
         }],
       ],
     },
     'emma_instrument': '<(emma_instrument)',
     'javac_jar_path': '<(javac_jar_path)',
+    'java_in_dir_suffix%': '/src',

[Yaron, 2015/04/18 00:22:57]

Seems unnecessary - please revert this file.

[jbudorick, 2015/04/20 19:21:38]

Done.

   },
   'conditions': [
     ['add_to_dependents_classpaths == 1', {
       # This all_dependent_settings is used for java targets only. This will add the
       # jar path to the classpath of dependent java targets.
       'all_dependent_settings': {
         'variables': {
           'input_jars_paths': ['<(jar_final_path)'],
           'library_dexed_jars_paths': ['<(dex_path)'],
         },
@@ skipping 129 matching lines @@
           ],
         },
       ],
     }],
   ],
   'actions': [
     {
       'action_name': 'javac_<(_target_name)',
       'message': 'Compiling <(_target_name) java sources',
       'variables': {
-        'java_sources': ['>!@(find >(java_in_dir)/src >(additional_src_dirs) -name "*.java")'],
+        'java_sources': ['>!@(find >(java_in_dir)>(java_in_dir_suffix) >(additional_src_dirs) -name "*.java")'],
       },
       'inputs': [
         '<(DEPTH)/build/android/gyp/util/build_utils.py',
         '<(DEPTH)/build/android/gyp/javac.py',
         '>@(java_sources)',
         '>@(input_jars_paths)',
         '>@(additional_input_paths)',
       ],
       'outputs': [
         '<(compile_stamp)',
@@ skipping 24 matching lines @@
         '<(jar_final_path)',
       ],
       'inputs': [
         '<(jar_path)',
       ],
       'includes': [ 'android/instr_action.gypi' ],
     },
     {
       'variables': {
         'src_dirs': [
-          '<(java_in_dir)/src',
+          '<(java_in_dir)<(java_in_dir_suffix)',
           '>@(additional_src_dirs)',
         ],
         'stamp_path': '<(lint_stamp)',
         'result_path': '<(lint_result)',
         'config_path': '<(lint_config)',
         'lint_jar_path': '<(jar_final_path)',
       },
       'inputs': [
         '<(jar_final_path)',
         '<(compile_stamp)',
@@ skipping 29 matching lines @@
             'dex_no_locals': 1,
           }],
         ],
         'dex_input_paths': [ '<(jar_final_path)' ],
         'output_path': '<(dex_path)',
       },
       'includes': [ 'android/dex_action.gypi' ],
     },
   ],
 }