diff options
| author | Liz Kammer <eakammer@google.com> | 2020-06-12 16:38:45 -0700 |
|---|---|---|
| committer | Liz Kammer <eakammer@google.com> | 2020-07-27 09:14:06 -0700 |
| commit | dd849a81f30d38db789499e1e404def6d3f71783 (patch) | |
| tree | 69b046c4a98914ffd496fdfbacab0db3d78f5cef /python/python_test.go | |
| parent | 41b4d79dab95b97352dfbc894e65eec7832211ed (diff) | |
Add `data_native_bins` property to java_test_host
When multiple os/arch variants are supported, java_test_host could not
find a matching arch due to java having arch:common, whereas native
binaries support a specific architecture. This change adds the property
`data_native_bins` in order to support binaries with the appropriate
os/arch variants.
Test: m FirmwareDtboVerification with data_native_bins
Test: forrest
Bug: 153848038
Change-Id: I45adebff0fde2811d5ef5620c697b97b768c951f
Diffstat (limited to 'python/python_test.go')
| -rw-r--r-- | python/python_test.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/python/python_test.go b/python/python_test.go index 1245ca184..23db24e8f 100644 --- a/python/python_test.go +++ b/python/python_test.go @@ -301,7 +301,7 @@ var ( filepath.Join("dir", "file2.py"): nil, filepath.Join("dir", "bin.py"): nil, filepath.Join("dir", "file4.py"): nil, - stubTemplateHost: []byte(`PYTHON_BINARY = '%interpreter%' + StubTemplateHost: []byte(`PYTHON_BINARY = '%interpreter%' MAIN_FILE = '%main%'`), }, expectedBinaries: []pyModule{ @@ -330,9 +330,7 @@ func TestPythonModule(t *testing.T) { t.Run(d.desc, func(t *testing.T) { config := android.TestConfig(buildDir, nil, "", d.mockFiles) ctx := android.NewTestContext() - ctx.PreDepsMutators(func(ctx android.RegisterMutatorsContext) { - ctx.BottomUp("version_split", versionSplitMutator()).Parallel() - }) + ctx.PreDepsMutators(RegisterPythonPreDepsMutators) ctx.RegisterModuleType("python_library_host", PythonLibraryHostFactory) ctx.RegisterModuleType("python_binary_host", PythonBinaryHostFactory) ctx.RegisterModuleType("python_defaults", defaultsFactory) |