diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2019-05-08 15:37:44 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-08 15:37:44 -0700 |
| commit | cecb32f2af7c92eb6c007a6d81b90cd5f1f9332a (patch) | |
| tree | 507bc5927ac99bad143065438b1089a40fe00eb9 | |
| parent | df24a30b5d282ceed4dac4114c0413d657610766 (diff) | |
| parent | 2cfbde6f38ddafc7c4f0fb519001fdcbe0f16ca6 (diff) | |
| download | build-temp_b_131756210_stage-aosp-master.tar.gz | |
Merge "Deprecate next set of make module types"temp_b_131756210_stage-aosp-master
am: 2cfbde6f38
Change-Id: I316acef9e09e909a255ef3dcbcea808023fabf4a
| -rw-r--r-- | Deprecation.md | 17 | ||||
| -rw-r--r-- | core/deprecation.mk | 14 | ||||
| -rw-r--r-- | core/host_static_test_lib.mk | 2 |
3 files changed, 20 insertions, 13 deletions
diff --git a/Deprecation.md b/Deprecation.md index 01825b2f8c..405a39e5b2 100644 --- a/Deprecation.md +++ b/Deprecation.md @@ -12,11 +12,18 @@ have any problems converting, please contact us via: [build/make/core/deprecation.mk] is the source of truth, but for easy browsing: -| Module type | State | -| -------------------------- | --------- | -| `BUILD_HOST_TEST_CONFIG` | Error | -| `BUILD_TARGET_TEST_CONFIG` | Error | -| `BUILD_*` | Available | +| Module type | State | +| -------------------------------- | --------- | +| `BUILD_AUX_EXECUTABLE` | Warning | +| `BUILD_AUX_STATIC_LIBRARY` | Warning | +| `BUILD_HOST_FUZZ_TEST` | Warning | +| `BUILD_HOST_NATIVE_TEST` | Warning | +| `BUILD_HOST_STATIC_TEST_LIBRARY` | Warning | +| `BUILD_HOST_TEST_CONFIG` | Error | +| `BUILD_NATIVE_BENCHMARK` | Warning | +| `BUILD_STATIC_TEST_LIBRARY` | Warning | +| `BUILD_TARGET_TEST_CONFIG` | Error | +| `BUILD_*` | Available | ## Module Type Deprecation Process diff --git a/core/deprecation.mk b/core/deprecation.mk index 9d57527d95..0b668ac97a 100644 --- a/core/deprecation.mk +++ b/core/deprecation.mk @@ -1,7 +1,5 @@ # These module types can still be used without warnings or errors. AVAILABLE_BUILD_MODULE_TYPES :=$= \ - BUILD_AUX_EXECUTABLE \ - BUILD_AUX_STATIC_LIBRARY \ BUILD_COPY_HEADERS \ BUILD_EXECUTABLE \ BUILD_FUZZ_TEST \ @@ -9,17 +7,13 @@ AVAILABLE_BUILD_MODULE_TYPES :=$= \ BUILD_HOST_DALVIK_JAVA_LIBRARY \ BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY \ BUILD_HOST_EXECUTABLE \ - BUILD_HOST_FUZZ_TEST \ BUILD_HOST_JAVA_LIBRARY \ - BUILD_HOST_NATIVE_TEST \ BUILD_HOST_PREBUILT \ BUILD_HOST_SHARED_LIBRARY \ BUILD_HOST_SHARED_TEST_LIBRARY \ BUILD_HOST_STATIC_LIBRARY \ - BUILD_HOST_STATIC_TEST_LIBRARY \ BUILD_JAVA_LIBRARY \ BUILD_MULTI_PREBUILT \ - BUILD_NATIVE_BENCHMARK \ BUILD_NATIVE_TEST \ BUILD_NOTICE_FILE \ BUILD_PACKAGE \ @@ -30,13 +24,19 @@ AVAILABLE_BUILD_MODULE_TYPES :=$= \ BUILD_SHARED_TEST_LIBRARY \ BUILD_STATIC_JAVA_LIBRARY \ BUILD_STATIC_LIBRARY \ - BUILD_STATIC_TEST_LIBRARY \ # These are BUILD_* variables that will throw a warning when used. This is # generally a temporary state until all the devices are marked with the # relevant BUILD_BROKEN_USES_BUILD_* variables, then these would move to # DEFAULT_ERROR_BUILD_MODULE_TYPES. DEFAULT_WARNING_BUILD_MODULE_TYPES :=$= \ + BUILD_AUX_EXECUTABLE \ + BUILD_AUX_STATIC_LIBRARY \ + BUILD_HOST_FUZZ_TEST \ + BUILD_HOST_NATIVE_TEST \ + BUILD_HOST_STATIC_TEST_LIBRARY \ + BUILD_NATIVE_BENCHMARK \ + BUILD_STATIC_TEST_LIBRARY \ # These are BUILD_* variables that are errors to reference, but you can set # BUILD_BROKEN_USES_BUILD_* in your BoardConfig.mk in order to turn them back diff --git a/core/host_static_test_lib.mk b/core/host_static_test_lib.mk index a24cd62e6d..a9e39b1baf 100644 --- a/core/host_static_test_lib.mk +++ b/core/host_static_test_lib.mk @@ -6,4 +6,4 @@ $(call record-module-type,HOST_STATIC_TEST_LIBRARY) include $(BUILD_SYSTEM)/host_test_internal.mk -include $(BUILD_HOST_STATIC_LIBRARY) +include $(BUILD_SYSTEM)/host_static_library.mk |