From c80828d567c9f09d68ed2ceacfd214648bc8c2ce Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 6 May 2020 22:29:10 -0700 Subject: [PATCH] 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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/java/app.go b/java/app.go index 48ef90b16..43bdc91de 100755 --- a/java/app.go +++ b/java/app.go @@ -1398,6 +1398,8 @@ func AndroidTestImportFactory() android.Module { module.processVariants(ctx) }) + module.dexpreopter.isTest = true + android.InitApexModule(module) android.InitAndroidMultiTargetsArchModule(module, android.DeviceSupported, android.MultilibCommon) android.InitDefaultableModule(module)