diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-09 08:06:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-09 08:06:35 +0000 |
| commit | ab222e8a7fe2c1d4945419436614e4c0665c2a29 (patch) | |
| tree | cdafb2b5d1e6df310bb25c17690a4bf04d2675b7 | |
| parent | ab45f8b97c46c883127109f30f6bf9183f89a855 (diff) | |
| parent | 897cfaee465b8d29061bcacab847a6b0ca9f7f80 (diff) | |
| download | build-temp_sam_168057903.tar.gz | |
Merge "Add test_mainline_modules option support in mk" am: 897cfaee46temp_sam_168057903
Original change: https://android-review.googlesource.com/c/platform/build/+/1413947
Change-Id: I1688ae7c3bb013eed0a3b5fa148811e0d7c50e04
| -rw-r--r-- | core/base_rules.mk | 1 | ||||
| -rw-r--r-- | core/clear_vars.mk | 1 | ||||
| -rw-r--r-- | core/tasks/module-info.mk | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index cb6cadc7ed..1b418983d0 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -986,6 +986,7 @@ ALL_MODULES.$(my_register_name).MODULE_NAME := $(LOCAL_MODULE) ALL_MODULES.$(my_register_name).COMPATIBILITY_SUITES := $(LOCAL_COMPATIBILITY_SUITE) ALL_MODULES.$(my_register_name).TEST_CONFIG := $(test_config) ALL_MODULES.$(my_register_name).EXTRA_TEST_CONFIGS := $(LOCAL_EXTRA_FULL_TEST_CONFIGS) +ALL_MODULES.$(my_register_name).TEST_MAINLINE_MODULES := $(LOCAL_TEST_MAINLINE_MODULES) test_config := INSTALLABLE_FILES.$(LOCAL_INSTALLED_MODULE).MODULE := $(my_register_name) diff --git a/core/clear_vars.mk b/core/clear_vars.mk index 9c29974204..d515db3ce4 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -300,6 +300,7 @@ LOCAL_SYSTEM_SHARED_LIBRARIES:=none LOCAL_TARGET_REQUIRED_MODULES:= LOCAL_TEST_CONFIG:= LOCAL_TEST_DATA:= +LOCAL_TEST_MAINLINE_MODULES:= LOCAL_TEST_MODULE_TO_PROGUARD_WITH:= LOCAL_TIDY:= LOCAL_TIDY_CHECKS:= diff --git a/core/tasks/module-info.mk b/core/tasks/module-info.mk index d9aebedf07..cf32d652c5 100644 --- a/core/tasks/module-info.mk +++ b/core/tasks/module-info.mk @@ -19,6 +19,7 @@ $(MODULE_INFO_JSON): '"srcs": [$(foreach w,$(sort $(ALL_MODULES.$(m).SRCS)),"$(w)", )], ' \ '"srcjars": [$(foreach w,$(sort $(ALL_MODULES.$(m).SRCJARS)),"$(w)", )], ' \ '"classes_jar": [$(foreach w,$(sort $(ALL_MODULES.$(m).CLASSES_JAR)),"$(w)", )], ' \ + '"test_mainline_modules": [$(foreach w,$(sort $(ALL_MODULES.$(m).TEST_MAINLINE_MODULES)),"$(w)", )], ' \ '},\n' \ ) | sed -e 's/, *\]/]/g' -e 's/, *\}/ }/g' -e '$$s/,$$//' >> $@ $(hide) echo '}' >> $@ |