From cb49d9986b41a93c0fc77a69ce03772ffbc93c25 Mon Sep 17 00:00:00 2001 From: Dan Shi Date: Fri, 21 Aug 2020 16:48:37 -0700 Subject: [PATCH] Remove name appendix of .TEST_CONFIG aosp/1401989 has a bug to add .TEST_CONFIG after the config file path. It should be removed. Bug: 163344047 Test: build and check module-info.json Change-Id: I5c60250ce26204acf98b79084c5c2839b2adcb56 --- core/tasks/module-info.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/tasks/module-info.mk b/core/tasks/module-info.mk index b2bd47aa3..d9aebedf0 100644 --- a/core/tasks/module-info.mk +++ b/core/tasks/module-info.mk @@ -14,7 +14,7 @@ $(MODULE_INFO_JSON): '"compatibility_suites": [$(foreach w,$(sort $(ALL_MODULES.$(m).COMPATIBILITY_SUITES)),"$(w)", )], ' \ '"auto_test_config": [$(ALL_MODULES.$(m).auto_test_config)], ' \ '"module_name": "$(ALL_MODULES.$(m).MODULE_NAME)", ' \ - '"test_config": [$(foreach w,$(strip $(ALL_MODULES.$(m).TEST_CONFIG) $(ALL_MODULES.$(m).EXTRA_TEST_CONFIGS)).TEST_CONFIG,"$(w)", )], ' \ + '"test_config": [$(foreach w,$(strip $(ALL_MODULES.$(m).TEST_CONFIG) $(ALL_MODULES.$(m).EXTRA_TEST_CONFIGS)),"$(w)", )], ' \ '"dependencies": [$(foreach w,$(sort $(ALL_DEPS.$(m).ALL_DEPS)),"$(w)", )], ' \ '"srcs": [$(foreach w,$(sort $(ALL_MODULES.$(m).SRCS)),"$(w)", )], ' \ '"srcjars": [$(foreach w,$(sort $(ALL_MODULES.$(m).SRCJARS)),"$(w)", )], ' \