commit 0ba6ec6f49be8ca24333ca4e402605f6cce82d50
author kellyhung <kellyhung@google.com> Fri Aug 28 00:19:53 2020 +0800
committer Kelly Hung <kellyhung@google.com> Thu Sep 03 02:37:44 2020 +0000
tree bcd07058fb43e1e72b8f19db172b1d7e5c6a9439
parent 5c9667d1ac3ab6edae99f0b9376ec89fae89289d

Add test_mainline_modules option support in mk

Bug: 165425972
Test: Apply aosp/1418212
      atest -b hello_world_test
      Check module-info.json for hello_world_test HelloWorldTests and
HelloWorldHostTest

Change-Id: Ie30a09a54b0ae927ca4d8d1aaba2ac0cdb15233a

core/base_rules.mk

diff --git a/core/base_rules.mk b/core/base_rules.mk
index 7397470..da6991e 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -981,6 +981,7 @@
 ALL_MODULES.$(my_register_name).COMPATIBILITY_SUITES := $(LOCAL_COMPATIBILITY_SUITE)
 ALL_MODULES.$(my_register_name).TEST_CONFIG := $(test_config)
 ALL_MODULES.$(my_register_name).EXTRA_TEST_CONFIGS := $(LOCAL_EXTRA_FULL_TEST_CONFIGS)
+ALL_MODULES.$(my_register_name).TEST_MAINLINE_MODULES := $(LOCAL_TEST_MAINLINE_MODULES)
 test_config :=
 
 INSTALLABLE_FILES.$(LOCAL_INSTALLED_MODULE).MODULE := $(my_register_name)