From 407ca587bedf805bcd20321dc8d2eafebef62721 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Thu, 18 Apr 2019 09:38:25 -0700 Subject: [PATCH 1/2] Obsolete BUILD_BROKEN_PHONY_TARGETS There are no remaining users. Test: treehugger Change-Id: Ice6f25a59265305e7e5d3dd041b16cd04674dd1e --- core/board_config.mk | 1 - core/config.mk | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/core/board_config.mk b/core/board_config.mk index e4b88cb601..58f636a0a4 100644 --- a/core/board_config.mk +++ b/core/board_config.mk @@ -88,7 +88,6 @@ _build_broken_var_list := \ BUILD_BROKEN_ANDROIDMK_EXPORTS \ BUILD_BROKEN_DUP_COPY_HEADERS \ BUILD_BROKEN_DUP_RULES \ - BUILD_BROKEN_PHONY_TARGETS \ BUILD_BROKEN_ENG_DEBUG_TAGS \ BUILD_BROKEN_USES_NETWORK \ diff --git a/core/config.mk b/core/config.mk index 16cd37625f..a297f68ecd 100644 --- a/core/config.mk +++ b/core/config.mk @@ -95,6 +95,7 @@ $(KATI_obsolete_var TARGET_ANDROID_FILESYSTEM_CONFIG_H,Use TARGET_FS_CONFIG_GEN $(KATI_deprecated_var USER,Use BUILD_USERNAME instead. See $(CHANGES_URL)#USER) $(KATI_obsolete_var TARGET_ROOT_OUT_SBIN,/sbin has been removed, use /system/bin instead) $(KATI_obsolete_var TARGET_ROOT_OUT_SBIN_UNSTRIPPED,/sbin has been removed, use /system/bin instead) +$(KATI_obsolete_var BUILD_BROKEN_PHONY_TARGETS) # This is marked as obsolete in envsetup.mk after reading the BoardConfig.mk $(KATI_deprecate_export It is a global setting. See $(CHANGES_URL)#export_keyword) From 1d4a56f1a005b60c0d770ccf216268f136b5cf12 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Thu, 18 Apr 2019 09:38:25 -0700 Subject: [PATCH 2/2] Obsolete BUILD_BROKEN_DUP_COPY_HEADERS There are no remaining users. Test: treehugger Change-Id: I1fd5b933372e3ea391c121d265f41c35b832b206 --- core/Makefile | 4 +--- core/board_config.mk | 1 - core/config.mk | 1 + 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/core/Makefile b/core/Makefile index 7fa7a6be40..6602a2910c 100644 --- a/core/Makefile +++ b/core/Makefile @@ -91,9 +91,7 @@ all_copied_headers: $(ALL_COPIED_HEADERS) ifdef has_dup_copy_headers has_dup_copy_headers := - ifneq ($(BUILD_BROKEN_DUP_COPY_HEADERS),true) - $(error duplicate header copies are no longer allowed. For more information about headers, see: https://android.googlesource.com/platform/build/soong/+/master/docs/best_practices.md#headers) - endif + $(error duplicate header copies are no longer allowed. For more information about headers, see: https://android.googlesource.com/platform/build/soong/+/master/docs/best_practices.md#headers) endif # ----------------------------------------------------------------- diff --git a/core/board_config.mk b/core/board_config.mk index 58f636a0a4..bfce087f85 100644 --- a/core/board_config.mk +++ b/core/board_config.mk @@ -86,7 +86,6 @@ _board_strip_readonly_list += $(_dynamic_partitions_var_list) _build_broken_var_list := \ BUILD_BROKEN_ANDROIDMK_EXPORTS \ - BUILD_BROKEN_DUP_COPY_HEADERS \ BUILD_BROKEN_DUP_RULES \ BUILD_BROKEN_ENG_DEBUG_TAGS \ BUILD_BROKEN_USES_NETWORK \ diff --git a/core/config.mk b/core/config.mk index a297f68ecd..386c64e74d 100644 --- a/core/config.mk +++ b/core/config.mk @@ -96,6 +96,7 @@ $(KATI_deprecated_var USER,Use BUILD_USERNAME instead. See $(CHANGES_URL)#USER) $(KATI_obsolete_var TARGET_ROOT_OUT_SBIN,/sbin has been removed, use /system/bin instead) $(KATI_obsolete_var TARGET_ROOT_OUT_SBIN_UNSTRIPPED,/sbin has been removed, use /system/bin instead) $(KATI_obsolete_var BUILD_BROKEN_PHONY_TARGETS) +$(KATI_obsolete_var BUILD_BROKEN_DUP_COPY_HEADERS) # This is marked as obsolete in envsetup.mk after reading the BoardConfig.mk $(KATI_deprecate_export It is a global setting. See $(CHANGES_URL)#export_keyword)