Deprecate next set of make module types

BUILD_AUX_EXECUTABLE
 BUILD_AUX_STATIC_LIBRARY

These shouldn't be used anymore, they were an intermediate state to
build some firmware that is no longer being built in Android.

 BUILD_HOST_FUZZ_TEST
 BUILD_HOST_NATIVE_TEST
 BUILD_HOST_STATIC_TEST_LIBRARY
 BUILD_NATIVE_BENCHMARK
 BUILD_STATIC_TEST_LIBRARY

There are no users of these left.

Bug: 130735607
Bug: 130735003
Bug: 130691889
Bug: 130723134
Bug: 130722660
Bug: 130734558
Bug: 130735594
Test: build_test & check logs
Change-Id: I8a9385040316495f7e7262d045be871e91712920
This commit is contained in:
Dan Willemsen 2019-05-02 15:42:42 -07:00
parent 246a30a1cb
commit fd84a92b82
3 changed files with 20 additions and 13 deletions

View file

@ -13,8 +13,15 @@ have any problems converting, please contact us via:
[build/make/core/deprecation.mk] is the source of truth, but for easy browsing: [build/make/core/deprecation.mk] is the source of truth, but for easy browsing:
| Module type | State | | 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_HOST_TEST_CONFIG` | Error |
| `BUILD_NATIVE_BENCHMARK` | Warning |
| `BUILD_STATIC_TEST_LIBRARY` | Warning |
| `BUILD_TARGET_TEST_CONFIG` | Error | | `BUILD_TARGET_TEST_CONFIG` | Error |
| `BUILD_*` | Available | | `BUILD_*` | Available |

View file

@ -1,7 +1,5 @@
# These module types can still be used without warnings or errors. # These module types can still be used without warnings or errors.
AVAILABLE_BUILD_MODULE_TYPES :=$= \ AVAILABLE_BUILD_MODULE_TYPES :=$= \
BUILD_AUX_EXECUTABLE \
BUILD_AUX_STATIC_LIBRARY \
BUILD_COPY_HEADERS \ BUILD_COPY_HEADERS \
BUILD_EXECUTABLE \ BUILD_EXECUTABLE \
BUILD_FUZZ_TEST \ BUILD_FUZZ_TEST \
@ -9,17 +7,13 @@ AVAILABLE_BUILD_MODULE_TYPES :=$= \
BUILD_HOST_DALVIK_JAVA_LIBRARY \ BUILD_HOST_DALVIK_JAVA_LIBRARY \
BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY \ BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY \
BUILD_HOST_EXECUTABLE \ BUILD_HOST_EXECUTABLE \
BUILD_HOST_FUZZ_TEST \
BUILD_HOST_JAVA_LIBRARY \ BUILD_HOST_JAVA_LIBRARY \
BUILD_HOST_NATIVE_TEST \
BUILD_HOST_PREBUILT \ BUILD_HOST_PREBUILT \
BUILD_HOST_SHARED_LIBRARY \ BUILD_HOST_SHARED_LIBRARY \
BUILD_HOST_SHARED_TEST_LIBRARY \ BUILD_HOST_SHARED_TEST_LIBRARY \
BUILD_HOST_STATIC_LIBRARY \ BUILD_HOST_STATIC_LIBRARY \
BUILD_HOST_STATIC_TEST_LIBRARY \
BUILD_JAVA_LIBRARY \ BUILD_JAVA_LIBRARY \
BUILD_MULTI_PREBUILT \ BUILD_MULTI_PREBUILT \
BUILD_NATIVE_BENCHMARK \
BUILD_NATIVE_TEST \ BUILD_NATIVE_TEST \
BUILD_NOTICE_FILE \ BUILD_NOTICE_FILE \
BUILD_PACKAGE \ BUILD_PACKAGE \
@ -30,13 +24,19 @@ AVAILABLE_BUILD_MODULE_TYPES :=$= \
BUILD_SHARED_TEST_LIBRARY \ BUILD_SHARED_TEST_LIBRARY \
BUILD_STATIC_JAVA_LIBRARY \ BUILD_STATIC_JAVA_LIBRARY \
BUILD_STATIC_LIBRARY \ BUILD_STATIC_LIBRARY \
BUILD_STATIC_TEST_LIBRARY \
# These are BUILD_* variables that will throw a warning when used. This is # 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 # generally a temporary state until all the devices are marked with the
# relevant BUILD_BROKEN_USES_BUILD_* variables, then these would move to # relevant BUILD_BROKEN_USES_BUILD_* variables, then these would move to
# DEFAULT_ERROR_BUILD_MODULE_TYPES. # DEFAULT_ERROR_BUILD_MODULE_TYPES.
DEFAULT_WARNING_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 # 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 # BUILD_BROKEN_USES_BUILD_* in your BoardConfig.mk in order to turn them back

View file

@ -6,4 +6,4 @@ $(call record-module-type,HOST_STATIC_TEST_LIBRARY)
include $(BUILD_SYSTEM)/host_test_internal.mk include $(BUILD_SYSTEM)/host_test_internal.mk
include $(BUILD_HOST_STATIC_LIBRARY) include $(BUILD_SYSTEM)/host_static_library.mk