Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c25ac460 authored by Colin Cross's avatar Colin Cross Committed by Android (Google) Code Review
Browse files

Merge "Mark the current BUILD_* warnings as errors by default"

parents ac79359a c4bdff5f

Deprecation.md

+4 −4
Original line number Diff line number Diff line
@@ -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     |

core/board_config.mk

+5 −5
Original line number Diff line number Diff line
@@ -622,16 +622,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)))

core/deprecation.mk

+4 −4
Original line number Diff line number Diff line
@@ -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 \

core/host_shared_library.mk

+3 −1
Original line number Diff line number Diff line
@@ -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

core/host_static_library.mk

+3 −1
Original line number Diff line number Diff line
@@ -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