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

Commit 722581a5 authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

Merge commit 'd54f8c2d' into HEAD 

Change-Id: I3cf53f083dee277a450dac36b011bc83180f6294
parents 18ee9e5e d54f8c2d

CleanSpec.mk

+3 −0
Original line number Diff line number Diff line
@@ -205,6 +205,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)



# 4.4.1

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)



# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

core/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -1262,6 +1262,7 @@ ifdef PRODUCT_EXTRA_RECOVERY_KEYS 
endif

	$(hide) echo 'mkbootimg_args=$(BOARD_MKBOOTIMG_ARGS)' >> $(zip_root)/META/misc_info.txt

	$(hide) echo "use_set_metadata=1" >> $(zip_root)/META/misc_info.txt

	$(hide) echo "update_rename_support=1" >> $(zip_root)/META/misc_info.txt

	$(call generate-userimage-prop-dictionary, $(zip_root)/META/misc_info.txt)

	@# Zip everything up, preserving symlinks

	$(hide) (cd $(zip_root) && zip -qry ../$(notdir $@) .)

core/copy_headers.mk

+3 −1
Original line number Diff line number Diff line
@@ -15,7 +15,9 @@ endif 
$(foreach header,$(LOCAL_COPY_HEADERS), \

  $(eval _chFrom := $(LOCAL_PATH)/$(header)) \

  $(eval _chTo := \

      $($(my_prefix)OUT_HEADERS)/$(LOCAL_COPY_HEADERS_TO)/$(notdir $(header))) \

      $(if $(LOCAL_COPY_HEADERS_TO),\

        $($(my_prefix)OUT_HEADERS)/$(LOCAL_COPY_HEADERS_TO)/$(notdir $(header)),\

        $($(my_prefix)OUT_HEADERS)/$(notdir $(header)))) \

  $(eval $(call copy-one-header,$(_chFrom),$(_chTo))) \

  $(eval all_copied_headers: $(_chTo)) \

 )

target/product/base.mk

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ PRODUCT_PACKAGES += \ 
    android.test.runner \

    app_process \

    applypatch \

    blkid \

    bmgr \

    bugreport \

    content \

target/product/core_minimal.mk

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ PRODUCT_PACKAGES += \ 
    bu \

    com.android.location.provider \

    com.android.location.provider.xml \

    com.android.media.remotedisplay \

    com.android.media.remotedisplay.xml \

    drmserver \

    framework-res \

    installd \