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

Commit ceb712df authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Propagate data_bins from Soong to Make" am: 309ee8d3 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1981828

Change-Id: I90a034143281e439737b21d8d6dfa38d0a690f43
parents ea1aae28 309ee8d3

cc/androidmk.go

+3 −0
Original line number Diff line number Diff line
@@ -399,6 +399,9 @@ func (test *testBinary) AndroidMkEntries(ctx AndroidMkContext, entries *android. 
		}



		entries.SetBoolIfTrue("LOCAL_COMPATIBILITY_PER_TESTCASE_DIRECTORY", Bool(test.Properties.Per_testcase_directory))

		if len(test.Properties.Data_bins) > 0 {

			entries.AddStrings("LOCAL_TEST_DATA_BINS", test.Properties.Data_bins...)

		}

	})



	AndroidMkWriteTestData(test.data, entries)

rust/androidmk.go

+3 −0
Original line number Diff line number Diff line
@@ -106,6 +106,9 @@ func (test *testDecorator) AndroidMk(ctx AndroidMkContext, ret *android.AndroidM 
			}

			entries.SetBoolIfTrue("LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG", !BoolDefault(test.Properties.Auto_gen_config, true))

			entries.SetBoolIfTrue("LOCAL_IS_UNIT_TEST", Bool(test.Properties.Test_options.Unit_test))

			if test.Properties.Data_bins != nil {

				entries.AddStrings("LOCAL_TEST_DATA_BINS", test.Properties.Data_bins...)

			}

		})



	cc.AndroidMkWriteTestData(test.data, ret)

sh/sh_binary.go

+3 −0
Original line number Diff line number Diff line
@@ -458,6 +458,9 @@ func (s *ShTest) AndroidMkEntries() []android.AndroidMkEntries { 
					dir := strings.TrimSuffix(s.dataModules[relPath].String(), relPath)

					entries.AddStrings("LOCAL_TEST_DATA", dir+":"+relPath)

				}

				if s.testProperties.Data_bins != nil {

					entries.AddStrings("LOCAL_TEST_DATA_BINS", s.testProperties.Data_bins...)

				}

				if Bool(s.testProperties.Test_options.Unit_test) {

					entries.SetBool("LOCAL_IS_UNIT_TEST", true)

				}