diff options
| author | Kevin Cheng <kevcheng@google.com> | 2017-11-28 15:04:40 -0800 |
|---|---|---|
| committer | Kevin Cheng <kevcheng@google.com> | 2017-11-28 15:27:04 -0800 |
| commit | 226091843476186071515ce95425f40ef117ee9a (patch) | |
| tree | 369c4fd82e6a02ee3ac586ea4814a27019151087 | |
| parent | 824958e880e5feedfbf4cea7de7fb93f283c5eb5 (diff) | |
| download | build-226091843476186071515ce95425f40ef117ee9a.tar.gz | |
Add local compatibilty suite info to module-info.json.
Test: m out/target/product/<lunch target>/module-info.json
And I see the following line in module-info.json:
"CtsSampleHostTestCases": { "class": ["JAVA_LIBRARIES"], "path":
["cts/hostsidetests/sample"], "tags": ["tests"], "installed":
["out/host/linux-x86/framework/CtsSampleHostTestCases.jar"],
"compatibility_suites": ["cts", "general-tests", "vts"] },
Change-Id: I67a78de4153c762977b145ed62ca8b6ecd0b7947
| -rw-r--r-- | core/base_rules.mk | 1 | ||||
| -rw-r--r-- | core/tasks/module-info.mk | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index 592650d792..ee3ed6c572 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -611,6 +611,7 @@ ifdef LOCAL_2ND_ARCH_VAR_PREFIX ALL_MODULES.$(my_register_name).FOR_2ND_ARCH := true endif ALL_MODULES.$(my_register_name).FOR_HOST_CROSS := $(my_host_cross) +ALL_MODULES.$(my_register_name).COMPATIBILITY_SUITES := $(LOCAL_COMPATIBILITY_SUITE) INSTALLABLE_FILES.$(LOCAL_INSTALLED_MODULE).MODULE := $(my_register_name) diff --git a/core/tasks/module-info.mk b/core/tasks/module-info.mk index e9b2ac7a93..f6d688caa9 100644 --- a/core/tasks/module-info.mk +++ b/core/tasks/module-info.mk @@ -11,6 +11,7 @@ $(MODULE_INFO_JSON): '"path": [$(foreach w,$(sort $(ALL_MODULES.$(m).PATH)),"$(w)", )], ' \ '"tags": [$(foreach w,$(sort $(ALL_MODULES.$(m).TAGS)),"$(w)", )], ' \ '"installed": [$(foreach w,$(sort $(ALL_MODULES.$(m).INSTALLED)),"$(w)", )], ' \ + '"compatibility_suites": [$(foreach w,$(sort $(ALL_MODULES.$(m).COMPATIBILITY_SUITES)),"$(w)", )], ' \ '},\n' \ ) | sed -e 's/, *\]/]/g' -e 's/, *\}/ }/g' -e '$$s/,$$//' >> $@ $(hide) echo '}' >> $@ |