From 2b0e4908c223860d61ba8b7ed8918621acf9c3a1 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Tue, 16 Feb 2021 06:52:39 +0900 Subject: [PATCH] Revert "`data` dependency of java_test_host can be arch-specific" This reverts commit cdd9b8392d669731fef6e1415496b181ae80ede9. Reason: this doesn't work. java_test_host is a multi target module. Therefore, `arch..data` is not collapsed to `data` by the arch mutator. Bug: N/A Test: N/A Change-Id: I755b06718bacfe1513f6ad1e734e5a0d0ac57cd8 --- java/java.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/java.go b/java/java.go index 338140bbf..c2cd45746 100644 --- a/java/java.go +++ b/java/java.go @@ -2426,7 +2426,7 @@ type testProperties struct { // list of files or filegroup modules that provide data that should be installed alongside // the test - Data []string `android:"path,arch_variant"` + Data []string `android:"path"` // Flag to indicate whether or not to create test config automatically. If AndroidTest.xml // doesn't exist next to the Android.bp, this attribute doesn't need to be set to true