From 74b00521f8808b620d9e95ce4af2901ec0ab1e27 Mon Sep 17 00:00:00 2001
From: kellyhung <kellyhung@google.com>
Date: Mon, 17 Aug 2020 18:46:00 +0800
Subject: [PATCH] Add test_mainline_module option.

Bug: 165425972

Test: m HelloWorldTests
Change-Id: I6e60b3895328c4f7aef0bfb30dcdefc30ee1d8ed
---
 cc/androidmk.go   | 1 +
 java/androidmk.go | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/cc/androidmk.go b/cc/androidmk.go
index c899cdd72..380b4e92f 100644
--- a/cc/androidmk.go
+++ b/cc/androidmk.go
@@ -377,6 +377,7 @@ func (test *testBinary) AndroidMkEntries(ctx AndroidMkContext, entries *android.
 		if !BoolDefault(test.Properties.Auto_gen_config, true) {
 			entries.SetBool("LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG", true)
 		}
+		entries.AddStrings("LOCAL_TEST_MAINLINE_MODULES", test.Properties.Test_mainline_modules...)
 	})
 
 	androidMkWriteTestData(test.data, ctx, entries)
diff --git a/java/androidmk.go b/java/androidmk.go
index 2c02e5f38..a503d2a5f 100644
--- a/java/androidmk.go
+++ b/java/androidmk.go
@@ -166,6 +166,7 @@ func (j *Test) AndroidMkEntries() []android.AndroidMkEntries {
 		if !BoolDefault(j.testProperties.Auto_gen_config, true) {
 			entries.SetString("LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG", "true")
 		}
+		entries.AddStrings("LOCAL_TEST_MAINLINE_MODULES", j.testProperties.Test_mainline_modules...)
 	})
 
 	return entriesList
@@ -440,6 +441,7 @@ func (a *AndroidTest) AndroidMkEntries() []android.AndroidMkEntries {
 		}
 		androidMkWriteExtraTestConfigs(a.extraTestConfigs, entries)
 		androidMkWriteTestData(a.data, entries)
+		entries.AddStrings("LOCAL_TEST_MAINLINE_MODULES", a.testProperties.Test_mainline_modules...)
 	})
 
 	return entriesList