From c4bdff5f7e8d0f60e7084cb83abe759fb3b65363 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Wed, 19 Feb 2020 18:06:54 -0800 Subject: [PATCH] Mark the current BUILD_* warnings as errors by default This switches: BUILD_COPY_HEADERS / LOCAL_COPY_HEADERS BUILD_HOST_EXECUTABLE BUILD_HOST_SHARED_LIBRARY BUILD_HOST_STATIC_LIBRARY to errors by default. Devices can set BUILD_BROKEN_USES_BUILD_HOST_EXECUTABLE (etc) to turn these errors back to warnings. I've done that for all of our internal devices. Bug: 130719878 Bug: 130696912 Bug: 130722971 Bug: 130723227 Test: remove the BUILD_BROKEN_USES_* lines from a device, see errors Change-Id: I1aecf97f64e281df3682ff0a0fb3ac4283790acd --- Deprecation.md | 8 ++++---- core/board_config.mk | 10 +++++----- core/deprecation.mk | 8 ++++---- core/host_shared_library.mk | 4 +++- core/host_static_library.mk | 4 +++- core/shared_library.mk | 4 +++- core/static_library.mk | 4 +++- 7 files changed, 25 insertions(+), 17 deletions(-) diff --git a/Deprecation.md b/Deprecation.md index 5e2649270..2f936e354 100644 --- a/Deprecation.md +++ b/Deprecation.md @@ -16,13 +16,13 @@ have any problems converting, please contact us via: | -------------------------------- | --------- | | `BUILD_AUX_EXECUTABLE` | Error | | `BUILD_AUX_STATIC_LIBRARY` | Error | -| `BUILD_COPY_HEADERS` | Warning | -| `BUILD_HOST_EXECUTABLE` | Warning | +| `BUILD_COPY_HEADERS` | Error | +| `BUILD_HOST_EXECUTABLE` | Error | | `BUILD_HOST_FUZZ_TEST` | Error | | `BUILD_HOST_NATIVE_TEST` | Error | -| `BUILD_HOST_SHARED_LIBRARY` | Warning | +| `BUILD_HOST_SHARED_LIBRARY` | Error | | `BUILD_HOST_SHARED_TEST_LIBRARY` | Error | -| `BUILD_HOST_STATIC_LIBRARY` | Warning | +| `BUILD_HOST_STATIC_LIBRARY` | Error | | `BUILD_HOST_STATIC_TEST_LIBRARY` | Error | | `BUILD_HOST_TEST_CONFIG` | Error | | `BUILD_NATIVE_BENCHMARK` | Error | diff --git a/core/board_config.mk b/core/board_config.mk index 91d4fd6e5..e0f532556 100644 --- a/core/board_config.mk +++ b/core/board_config.mk @@ -621,16 +621,16 @@ endif ########################################### # Handle BUILD_BROKEN_USES_BUILD_* -$(foreach m,$(filter-out BUILD_COPY_HEADERS,$(DEFAULT_WARNING_BUILD_MODULE_TYPES)),\ +$(foreach m,$(DEFAULT_WARNING_BUILD_MODULE_TYPES),\ $(if $(filter false,$(BUILD_BROKEN_USES_$(m))),\ $(KATI_obsolete_var $(m),Please convert to Soong),\ $(KATI_deprecated_var $(m),Please convert to Soong))) -$(if $(filter false,$(BUILD_BROKEN_USES_BUILD_COPY_HEADERS)),\ - $(KATI_obsolete_var BUILD_COPY_HEADERS,See $(CHANGES_URL)#copy_headers),\ - $(KATI_deprecated_var BUILD_COPY_HEADERS,See $(CHANGES_URL)#copy_headers)) +$(if $(filter true,$(BUILD_BROKEN_USES_BUILD_COPY_HEADERS)),\ + $(KATI_deprecated_var BUILD_COPY_HEADERS,See $(CHANGES_URL)#copy_headers),\ + $(KATI_obsolete_var BUILD_COPY_HEADERS,See $(CHANGES_URL)#copy_headers)) -$(foreach m,$(DEFAULT_ERROR_BUILD_MODULE_TYPES),\ +$(foreach m,$(filter-out BUILD_COPY_HEADERS,$(DEFAULT_ERROR_BUILD_MODULE_TYPES)),\ $(if $(filter true,$(BUILD_BROKEN_USES_$(m))),\ $(KATI_deprecated_var $(m),Please convert to Soong),\ $(KATI_obsolete_var $(m),Please convert to Soong))) diff --git a/core/deprecation.mk b/core/deprecation.mk index cc620a32d..19bd4cfb9 100644 --- a/core/deprecation.mk +++ b/core/deprecation.mk @@ -24,10 +24,6 @@ AVAILABLE_BUILD_MODULE_TYPES :=$= \ # relevant BUILD_BROKEN_USES_BUILD_* variables, then these would move to # DEFAULT_ERROR_BUILD_MODULE_TYPES. DEFAULT_WARNING_BUILD_MODULE_TYPES :=$= \ - BUILD_COPY_HEADERS \ - BUILD_HOST_EXECUTABLE \ - BUILD_HOST_SHARED_LIBRARY \ - BUILD_HOST_STATIC_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 @@ -35,8 +31,12 @@ DEFAULT_WARNING_BUILD_MODULE_TYPES :=$= \ DEFAULT_ERROR_BUILD_MODULE_TYPES :=$= \ BUILD_AUX_EXECUTABLE \ BUILD_AUX_STATIC_LIBRARY \ + BUILD_COPY_HEADERS \ + BUILD_HOST_EXECUTABLE \ BUILD_HOST_FUZZ_TEST \ BUILD_HOST_NATIVE_TEST \ + BUILD_HOST_SHARED_LIBRARY \ + BUILD_HOST_STATIC_LIBRARY \ BUILD_HOST_STATIC_TEST_LIBRARY \ BUILD_HOST_TEST_CONFIG \ BUILD_NATIVE_BENCHMARK \ diff --git a/core/host_shared_library.mk b/core/host_shared_library.mk index c22af97a2..fbe6442e2 100644 --- a/core/host_shared_library.mk +++ b/core/host_shared_library.mk @@ -38,6 +38,8 @@ my_module_arch_supported := ## Copy headers to the install tree ########################################################### ifdef LOCAL_COPY_HEADERS -$(call pretty-warning,LOCAL_COPY_HEADERS is deprecated. See $(CHANGES_URL)#copy_headers) +$(if $(filter true,$(BUILD_BROKEN_USES_BUILD_COPY_HEADERS)),\ + $(call pretty-warning,LOCAL_COPY_HEADERS is deprecated. See $(CHANGES_URL)#copy_headers),\ + $(call pretty-error,LOCAL_COPY_HEADERS is obsolete. See $(CHANGES_URL)#copy_headers)) include $(BUILD_SYSTEM)/copy_headers.mk endif diff --git a/core/host_static_library.mk b/core/host_static_library.mk index 3dbd14496..23d809c68 100644 --- a/core/host_static_library.mk +++ b/core/host_static_library.mk @@ -38,6 +38,8 @@ my_module_arch_supported := ## Copy headers to the install tree ########################################################### ifdef LOCAL_COPY_HEADERS -$(call pretty-warning,LOCAL_COPY_HEADERS is deprecated. See $(CHANGES_URL)#copy_headers) +$(if $(filter true,$(BUILD_BROKEN_USES_BUILD_COPY_HEADERS)),\ + $(call pretty-warning,LOCAL_COPY_HEADERS is deprecated. See $(CHANGES_URL)#copy_headers),\ + $(call pretty-error,LOCAL_COPY_HEADERS is obsolete. See $(CHANGES_URL)#copy_headers)) include $(BUILD_SYSTEM)/copy_headers.mk endif diff --git a/core/shared_library.mk b/core/shared_library.mk index ca17151c4..29d8276a0 100644 --- a/core/shared_library.mk +++ b/core/shared_library.mk @@ -57,6 +57,8 @@ my_module_arch_supported := ## Copy headers to the install tree ########################################################### ifdef LOCAL_COPY_HEADERS -$(call pretty-warning,LOCAL_COPY_HEADERS is deprecated. See $(CHANGES_URL)#copy_headers) +$(if $(filter true,$(BUILD_BROKEN_USES_BUILD_COPY_HEADERS)),\ + $(call pretty-warning,LOCAL_COPY_HEADERS is deprecated. See $(CHANGES_URL)#copy_headers),\ + $(call pretty-error,LOCAL_COPY_HEADERS is obsolete. See $(CHANGES_URL)#copy_headers)) include $(BUILD_SYSTEM)/copy_headers.mk endif diff --git a/core/static_library.mk b/core/static_library.mk index 78908cf37..a45009269 100644 --- a/core/static_library.mk +++ b/core/static_library.mk @@ -42,6 +42,8 @@ my_module_arch_supported := ## Copy headers to the install tree ########################################################### ifdef LOCAL_COPY_HEADERS -$(call pretty-warning,LOCAL_COPY_HEADERS is deprecated. See $(CHANGES_URL)#copy_headers) +$(if $(filter true,$(BUILD_BROKEN_USES_BUILD_COPY_HEADERS)),\ + $(call pretty-warning,LOCAL_COPY_HEADERS is deprecated. See $(CHANGES_URL)#copy_headers),\ + $(call pretty-error,LOCAL_COPY_HEADERS is obsolete. See $(CHANGES_URL)#copy_headers)) include $(BUILD_SYSTEM)/copy_headers.mk endif