From 2f83b31af7b4d33a45c0c6c2dc915f8ab0d1feba Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Thu, 20 Oct 2022 20:18:35 +0900 Subject: [PATCH] Don't add unused properties to android_test_import android_test_import is to import prebuilt test apks into the build rule. It doesn't support properties like test_config, test_config_template, and etc, but those properties were anyhow added to the module type and setting those properties didn't trigger any error. Fixing this surprising behavior by adding only the properties that are actualy being used. Bug: N/A Test: N/A Change-Id: I93e821e108861fa1249bc5e0882d706849bcf43f --- java/app_import.go | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/java/app_import.go b/java/app_import.go index 6e603c912..8c1e19c3e 100644 --- a/java/app_import.go +++ b/java/app_import.go @@ -500,7 +500,18 @@ type androidTestImportProperties struct { type AndroidTestImport struct { AndroidAppImport - testProperties testProperties + testProperties struct { + // list of compatibility suites (for example "cts", "vts") that the module should be + // installed into. + Test_suites []string `android:"arch_variant"` + + // list of files or filegroup modules that provide data that should be installed alongside + // the test + Data []string `android:"path"` + + // Install the test into a folder named for the module in all test suites. + Per_testcase_directory *bool + } testImportProperties androidTestImportProperties