diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-02-18 01:26:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-02-18 01:26:07 +0000 |
| commit | 309ee8d39856e763da0f872d857b3587c916ac4d (patch) | |
| tree | 014bad80f2a8e75ff49fd2a014018b11794a6bb0 /sh | |
| parent | 9d7d9810e2b894fe550a0c53b608b912b62be77c (diff) | |
| parent | 22bafec0425313fb49b6f64a609537ee1b60a76e (diff) | |
| download | soong-309ee8d39856e763da0f872d857b3587c916ac4d.tar.gz | |
Merge "Propagate data_bins from Soong to Make"
Diffstat (limited to 'sh')
| -rw-r--r-- | sh/sh_binary.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sh/sh_binary.go b/sh/sh_binary.go index 2ab784d52..4190e84b8 100644 --- a/sh/sh_binary.go +++ b/sh/sh_binary.go @@ -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) } |