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

Commit 69cabb96 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge changes from topics "obsolete_broken_dup_copy_headers", "obsolete_broken_phony_targets" 

am: 0b683a8f

Change-Id: Id0b3df7ea67ce7d14fd74478831ec1c974b30cb8
parents e0ea6c8c 0b683a8f

core/Makefile

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

endif



# -----------------------------------------------------------------

# docs/index.html

core/board_config.mk

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

core/config.mk

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