Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74b00521 authored by kellyhung's avatar kellyhung Committed by Kelly Hung
Browse files

Add test_mainline_module option. 

Bug: 165425972

Test: m HelloWorldTests
Change-Id: I6e60b3895328c4f7aef0bfb30dcdefc30ee1d8ed
parent daf73528

cc/androidmk.go

+1 −0
Original line number Diff line number Diff line
@@ -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)

java/androidmk.go

+2 −0
Original line number Diff line number Diff line
@@ -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