commit 22bc099c020181d377f814fa4d6ab8a3655e6a0f
author Dan Shi <dshi@google.com> Wed Sep 16 15:51:28 2020 -0700
committer Dan Shi <dshi@google.com> Wed Sep 16 15:52:13 2020 -0700
tree 04262b689838b4c999cfb2a2865e8f0e5c7e44c9
parent a51b1b857bc4581d11f10ba35692eadcaf80ab7d

Force extra config file to be .config

TradeFed only supports .config file as test config.

Bug: 163344047
Test: m HelloWorldTests

Change-Id: Ib963d04fc308b9c319d5b59f50f9ca9b5b575b72

core/base_rules.mk

diff --git a/core/base_rules.mk b/core/base_rules.mk
index 1b41898..58be7a2 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -766,7 +766,7 @@
     $(foreach test_config_file, $(LOCAL_EXTRA_FULL_TEST_CONFIGS), \
       $(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \
         $(eval my_compat_dist_config_$(suite) += $(foreach dir, $(call compatibility_suite_dirs,$(suite)), \
-          $(test_config_file):$(dir)/$(notdir $(test_config_file))))))
+          $(test_config_file):$(dir)/$(basename $(notdir $(test_config_file))).config))))
   endif
 
   ifneq (,$(wildcard $(LOCAL_PATH)/DynamicConfig.xml))