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
This commit is contained in:
parent
f0cbace3b2
commit
4af387c20e
|
@ -142,7 +142,7 @@ func init() {
|
||||||
|
|
||||||
hostBinToolVariableWithPrebuilt("Aapt2Cmd", "prebuilts/sdk/tools", "aapt2")
|
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")
|
pctx.HostBinToolVariable("ManifestMergerCmd", "manifest-merger")
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,33 @@
|
||||||
|
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"],
|
||||||
|
}
|
|
@ -0,0 +1,8 @@
|
||||||
|
{
|
||||||
|
"presubmit" : [
|
||||||
|
{
|
||||||
|
"name": "manifest_fixer_test",
|
||||||
|
"host": true
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
|
@ -425,4 +425,4 @@ class AddExtractNativeLibsTest(unittest.TestCase):
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
unittest.main()
|
unittest.main(verbosity=2)
|
||||||
|
|
Loading…
Reference in New Issue