commit c80828d567c9f09d68ed2ceacfd214648bc8c2ce
author Colin Cross <ccross@android.com> Wed May 06 22:29:10 2020 -0700
committer Colin Cross <ccross@android.com> Thu May 07 12:06:14 2020 -0700
tree 8301a5daa5e37c2c5cb06158c443c9536958b17e
parent 7500f46b95d347f758d2fb579bf7d7926dbc8cc8

Skip dexpreopting android_test_import modules

android_test_import modules should be labelled as tests so they are
not dexpreopted.

Bug: 155778135
Test: m CtsCorruptApkTests_Compressed_Q
Change-Id: I7baa5405d03df03920b01616b030ba77f882a77e

java/app.go

diff --git a/java/app.go b/java/app.go
index 48ef90b..43bdc91 100755
--- a/java/app.go
+++ b/java/app.go
@@ -1398,6 +1398,8 @@
 		module.processVariants(ctx)
 	})
 
+	module.dexpreopter.isTest = true
+
 	android.InitApexModule(module)
 	android.InitAndroidMultiTargetsArchModule(module, android.DeviceSupported, android.MultilibCommon)
 	android.InitDefaultableModule(module)