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

Commit 4af387c2 authored May 16, 2019 by Colin Cross

Move manifest_fixer to a python_binary_host module

In preparation for making it use multiple files so that some
implementation can be shared with a new tool.

Also make manifest_fixer_test a python_test_host, and add it
to TEST_MAPPING.

Test: m checkbuild
Change-Id: Iaae177efcb978187b126d90359b82cdfd3176857

parent f0cbace3

java/config/config.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -142,7 +142,7 @@ func init() {

		hostBinToolVariableWithPrebuilt("Aapt2Cmd", "prebuilts/sdk/tools", "aapt2")

		pctx.SourcePathVariable("ManifestFixerCmd", "build/soong/scripts/manifest_fixer.py")
		pctx.HostBinToolVariable("ManifestFixerCmd", "manifest_fixer")

		pctx.HostBinToolVariable("ManifestMergerCmd", "manifest-merger")

scripts/Android.bp

0 → 100644

+33 −0

Original line number	Diff line number	Diff line
		python_binary_host {
		name: "manifest_fixer",
		main: "manifest_fixer.py",
		srcs: [
		"manifest_fixer.py",
		],
		version: {
		py2: {
		enabled: true,
		},
		py3: {
		enabled: false,
		},
		},
		}

		python_test_host {
		name: "manifest_fixer_test",
		main: "manifest_fixer_test.py",
		srcs: [
		"manifest_fixer_test.py",
		"manifest_fixer.py",
		],
		version: {
		py2: {
		enabled: true,
		},
		py3: {
		enabled: false,
		},
		},
		test_suites: ["general-tests"],
		}

scripts/TEST_MAPPING

0 → 100644

+8 −0

Original line number	Diff line number	Diff line
		{
		"presubmit" : [
		{
		"name": "manifest_fixer_test",
		"host": true
		}
		]
		}

scripts/manifest_fixer_test.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -425,4 +425,4 @@ class AddExtractNativeLibsTest(unittest.TestCase):


		if __name__ == '__main__':
		unittest.main()
		unittest.main(verbosity=2)