openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

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
Merged-In: I1aecf97f64e281df3682ff0a0fb3ac4283790acd
(cherry picked from commit c4bdff5f7e)
This commit is contained in:
Dan Willemsen 2020-02-19 18:06:54 -08:00
parent 055d7286ee
commit 97ec812708
7 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Deprecation.md
View File

@ -16,13 +16,13 @@ have any problems converting, please contact us via:
| -------------------------------- | --------- | | -------------------------------- | --------- |
| `BUILD_AUX_EXECUTABLE` | Error | | `BUILD_AUX_EXECUTABLE` | Error |
| `BUILD_AUX_STATIC_LIBRARY` | Error | | `BUILD_AUX_STATIC_LIBRARY` | Error |
| `BUILD_COPY_HEADERS` | Warning | | `BUILD_COPY_HEADERS` | Error |
| `BUILD_HOST_EXECUTABLE` | Warning | | `BUILD_HOST_EXECUTABLE` | Error |
| `BUILD_HOST_FUZZ_TEST` | Error | | `BUILD_HOST_FUZZ_TEST` | Error |
| `BUILD_HOST_NATIVE_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_SHARED_TEST_LIBRARY` | Error |
| `BUILD_HOST_STATIC_LIBRARY` | Warning | | `BUILD_HOST_STATIC_LIBRARY` | Error |
| `BUILD_HOST_STATIC_TEST_LIBRARY` | Error | | `BUILD_HOST_STATIC_TEST_LIBRARY` | Error |
| `BUILD_HOST_TEST_CONFIG` | Error | | `BUILD_HOST_TEST_CONFIG` | Error |
| `BUILD_NATIVE_BENCHMARK` | Error | | `BUILD_NATIVE_BENCHMARK` | Error |

10
core/board_config.mk
View File

@ -624,16 +624,16 @@ endif
########################################### ###########################################
# Handle BUILD_BROKEN_USES_BUILD_* # 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))),\ $(if $(filter false,$(BUILD_BROKEN_USES_$(m))),\
$(KATI_obsolete_var $(m),Please convert to Soong),\ $(KATI_obsolete_var $(m),Please convert to Soong),\
$(KATI_deprecated_var $(m),Please convert to Soong))) $(KATI_deprecated_var $(m),Please convert to Soong)))
$(if $(filter false,$(BUILD_BROKEN_USES_BUILD_COPY_HEADERS)),\ $(if $(filter true,$(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),\
$(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))),\ $(if $(filter true,$(BUILD_BROKEN_USES_$(m))),\
$(KATI_deprecated_var $(m),Please convert to Soong),\ $(KATI_deprecated_var $(m),Please convert to Soong),\
$(KATI_obsolete_var $(m),Please convert to Soong))) $(KATI_obsolete_var $(m),Please convert to Soong)))

8
core/deprecation.mk
View File

@ -24,10 +24,6 @@ AVAILABLE_BUILD_MODULE_TYPES :=$= \
# 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_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 # 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
@ -35,8 +31,12 @@ DEFAULT_WARNING_BUILD_MODULE_TYPES :=$= \
DEFAULT_ERROR_BUILD_MODULE_TYPES :=$= \ DEFAULT_ERROR_BUILD_MODULE_TYPES :=$= \
BUILD_AUX_EXECUTABLE \ BUILD_AUX_EXECUTABLE \
BUILD_AUX_STATIC_LIBRARY \ BUILD_AUX_STATIC_LIBRARY \
BUILD_COPY_HEADERS \
BUILD_HOST_EXECUTABLE \
BUILD_HOST_FUZZ_TEST \ BUILD_HOST_FUZZ_TEST \
BUILD_HOST_NATIVE_TEST \ BUILD_HOST_NATIVE_TEST \
BUILD_HOST_SHARED_LIBRARY \
BUILD_HOST_STATIC_LIBRARY \
BUILD_HOST_STATIC_TEST_LIBRARY \ BUILD_HOST_STATIC_TEST_LIBRARY \
BUILD_HOST_TEST_CONFIG \ BUILD_HOST_TEST_CONFIG \
BUILD_NATIVE_BENCHMARK \ BUILD_NATIVE_BENCHMARK \

4
core/host_shared_library.mk
View File

@ -38,6 +38,8 @@ my_module_arch_supported :=
## Copy headers to the install tree ## Copy headers to the install tree
########################################################### ###########################################################
ifdef LOCAL_COPY_HEADERS 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 include $(BUILD_SYSTEM)/copy_headers.mk
endif endif

4
core/host_static_library.mk
View File

@ -38,6 +38,8 @@ my_module_arch_supported :=
## Copy headers to the install tree ## Copy headers to the install tree
########################################################### ###########################################################
ifdef LOCAL_COPY_HEADERS 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 include $(BUILD_SYSTEM)/copy_headers.mk
endif endif

4
core/shared_library.mk
View File

@ -57,6 +57,8 @@ my_module_arch_supported :=
## Copy headers to the install tree ## Copy headers to the install tree
########################################################### ###########################################################
ifdef LOCAL_COPY_HEADERS 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 include $(BUILD_SYSTEM)/copy_headers.mk
endif endif

4
core/static_library.mk
View File

@ -42,6 +42,8 @@ my_module_arch_supported :=
## Copy headers to the install tree ## Copy headers to the install tree
########################################################### ###########################################################
ifdef LOCAL_COPY_HEADERS 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 include $(BUILD_SYSTEM)/copy_headers.mk
endif endif