Reland of Make instrumentation_test_apk depend on their apk_under_test.

build/android/gyp/write_build_config.py

Index: build/android/gyp/write_build_config.py
diff --git a/build/android/gyp/write_build_config.py b/build/android/gyp/write_build_config.py
index e86f8c09bdef2bca051c4fc31479d2a068e6b8c7..0960f63f6448bb8e4a3bea302a46195230928a0d 100755
--- a/build/android/gyp/write_build_config.py
+++ b/build/android/gyp/write_build_config.py
@@ -423,7 +423,6 @@ def main(argv):
     config['proguard'] = {}
     proguard_config = config['proguard']
     proguard_config['input_paths'] = [options.jar_path] + java_full_classpath
-    proguard_config['tested_apk_info'] = ''
 
   # An instrumentation test apk should exclude the dex files that are in the apk
   # under test.
@@ -444,7 +443,6 @@ def main(argv):
     if tested_apk_config['proguard_enabled']:
       assert proguard_enabled, ('proguard must be enabled for instrumentation'
           ' apks if it\'s enabled for the tested apk')
-      proguard_config['tested_apk_info'] = tested_apk_config['proguard_info']

[jbudorick, 2016/02/12 15:33:23]

What's the reasoning behind removing this? I can't tell (or, tbh, tell where
it's used...)

[agrieve, 2016/02/12 15:47:11]

It aligns with the change to the proguard rule in GN.

The "why change it this way", is that I thought it was just a bit too subtle the
way it was. By enforcing that build configs store only values for themselves, it
forces the GN rules to have to reach into apk_under_test's build_config to get
this value. This makes it more obvious in the GN rules that the dependency
exists.

[jbudorick, 2016/02/12 16:33:28]

Makes sense.

 
   # Dependencies for the final dex file of an apk or a 'deps_dex'.
   if options.type in ['android_apk', 'deps_dex']: