Merging under test java into instrumentation test java.

base/android/base_proguard_config.flags

 # Keep line number information, useful for stack traces.
 -keepattributes SourceFile,LineNumberTable
 
-# Keep all runtime visible annotations
--keepattributes RuntimeVisibleAnnotations
+# Keep all annotation related attributes
+-keepattributes *Annotation*

[agrieve, 2016/07/28 01:30:57]

From what I can tell here:
http://proguard.sourceforge.net/manual/attributes.html

This will keep things like @VisibleForTesting

Unless it's the case that dexing then removes them? Might be worth a mention
that this does not cause VisibleForTesting to affect dex size (besides the
annotation class itself)

[smaier, 2016/07/28 15:27:18]

Done.

 
 # Keep the annotations, because if we don't, the ProGuard rules that use them
 # will not be respected. These classes then show up in our final dex, which we
 # do not want - see crbug.com/628226.
 -keep @interface org.chromium.base.annotations.AccessedByNative
 -keep @interface org.chromium.base.annotations.CalledByNative
 -keep @interface org.chromium.base.annotations.CalledByNativeUnchecked
 -keep @interface org.chromium.base.annotations.RemovableInRelease
 -keep @interface org.chromium.base.annotations.UsedByReflection
 
@@ skipping 44 matching lines @@
 # ~1.1%, and reduces the method count by ~4.3%.
 -allowaccessmodification
 
 # Keep all enum values and valueOf methods. See
 # http://proguard.sourceforge.net/index.html#manual/examples.html
 # for the reason for this. Also, see http://crbug.com/248037.
 -keepclassmembers enum * {
     public static **[] values();
     public static ** valueOf(java.lang.String);
 }