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

Commit 275919a7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove BUILD_BROKEN_ENG_DEBUG_TAGS"

parents a0ee5dee e048f7ef

Changes.md

+2 −2
Original line number Diff line number Diff line
@@ -49,9 +49,9 @@ files to be split out into a separate static library that chooses `arm` over 
Modules that build for Windows (our only `HOST_CROSS` OS currently) must now be

defined in `Android.bp` files.



## `LOCAL_MODULE_TAGS := eng debug` deprecation  {#LOCAL_MODULE_TAGS}

## `LOCAL_MODULE_TAGS := eng debug` are obsolete {#LOCAL_MODULE_TAGS}



`LOCAL_MODULE_TAGS` value `eng` and `debug` are being deprecated. They allowed

`LOCAL_MODULE_TAGS` value `eng` and `debug` are now obsolete. They allowed

modules to specify that they should always be installed on `-eng`, or `-eng`

and `-userdebug` builds. This conflicted with the ability for products to

specify which modules should be installed, effectively making it impossible to

core/base_rules.mk

+3 −8
Original line number Diff line number Diff line
@@ -167,19 +167,14 @@ ifdef my_bad_module_tags 
  ifeq (true,$(LOCAL_UNINSTALLABLE_MODULE))

    $(call pretty-warning,LOCAL_MODULE_TAGS := $(my_bad_module_tags) does not do anything for uninstallable modules)

  endif

  ifneq ($(BUILD_BROKEN_ENG_DEBUG_TAGS),true)

  $(call pretty-error,LOCAL_MODULE_TAGS := $(my_bad_module_tags) is obsolete. See $(CHANGES_URL)#LOCAL_MODULE_TAGS)

  else

    $(call pretty-warning,LOCAL_MODULE_TAGS := $(my_bad_module_tags) is deprecated. See $(CHANGES_URL)#LOCAL_MODULE_TAGS)

  endif

  my_bad_module_tags :=

endif



# Only the tags mentioned in this test are expected to be set by module

# makefiles. Anything else is either a typo or a source of unexpected

# behaviors.

ifneq ($(filter-out debug eng tests optional samples,$(my_module_tags)),)

$(call pretty-error,unusual tags: $(filter-out debug eng tests optional samples,$(my_module_tags)))

ifneq ($(filter-out tests optional samples,$(my_module_tags)),)

$(call pretty-error,unusual tags: $(filter-out tests optional samples,$(my_module_tags)))

endif



# Add implicit tags.

core/board_config.mk

+0 −1
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ _board_strip_readonly_list += $(_dynamic_partitions_var_list) 
_build_broken_var_list := \

  BUILD_BROKEN_ANDROIDMK_EXPORTS \

  BUILD_BROKEN_DUP_RULES \

  BUILD_BROKEN_ENG_DEBUG_TAGS \

  BUILD_BROKEN_USES_NETWORK \



_build_broken_var_list += \

core/config.mk

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ $(KATI_obsolete_var TARGET_ROOT_OUT_SBIN,/sbin has been removed, use /system/bin 
$(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)

$(KATI_obsolete_var BUILD_BROKEN_ENG_DEBUG_TAGS)



# 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)

core/main.mk

+0 −1
Original line number Diff line number Diff line
@@ -1450,7 +1450,6 @@ modules_to_install := $(sort \ 
    $(ALL_DEFAULT_INSTALLED_MODULES) \

    $(product_target_FILES) \

    $(product_host_FILES) \

    $(call get-tagged-modules,$(tags_to_install)) \

    $(CUSTOM_MODULES) \

  )