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

Commit c271afeb authored by Xin Li's avatar Xin Li Committed by Gerrit Code Review
Browse files

Merge "DO NOT MERGE - Merge Android 10 into master"

parents 2fc007eb 7a05ffb2

CleanSpec.mk

+7 −0
Original line number Diff line number Diff line
@@ -614,6 +614,10 @@ $(call add-clean-step, rm -rf $(HOST_OUT)/framework/vts-tradefed.jar) 
# Clean up old location of system_other.avbpubkey

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/security/avb/)



# Clean up bufferhub files

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/hw/android.frameworks.bufferhub@1.0-service)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/init/android.frameworks.bufferhub@1.0-service.rc)



$(call add-clean-step, rm -rf $(PRODUCT_OUT)/super.img)



$(call add-clean-step, find $(PRODUCT_OUT) -type f -name "generated_*_image_info.txt" -print0 | xargs -0 rm -f)
@@ -635,6 +639,9 @@ $(call add-clean-step, rm -rf $(HOST_OUT_EXECUTABLES)/build_verity_metadata.py) 


$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libc_malloc*)



# Clean up old location of soft OMX plugins

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libstagefright_soft*)



# Move odm build.prop to /odm/etc/.

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

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

core/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -502,6 +502,7 @@ endif 
	$(hide) echo ro.vendor.product.cpu.abilist64="$(TARGET_CPU_ABI_LIST_64_BIT)">>$@

	$(hide) echo ro.product.board="$(TARGET_BOOTLOADER_BOARD_NAME)">>$@

	$(hide) echo ro.board.platform="$(TARGET_BOARD_PLATFORM)">>$@

	$(hide) echo ro.hwui.use_vulkan="$(TARGET_USES_VULKAN)">>$@

ifdef TARGET_SCREEN_DENSITY

	$(hide) echo ro.sf.lcd_density="$(TARGET_SCREEN_DENSITY)">>$@

endif
@@ -3600,7 +3601,7 @@ endif 
ifeq ($(build_otatools_package),true)



INTERNAL_OTATOOLS_MODULES := \

  aapt \

  aapt2 \

  add_img_to_target_files \

  append2simg \

  avbtool \

core/build_id.mk

+1 −1
Original line number Diff line number Diff line
@@ -18,4 +18,4 @@ 
# (like "CRB01").  It must be a single word, and is

# capitalized by convention.



BUILD_ID=PI
 
BUILD_ID=QT

core/config.mk

+1 −1
Original line number Diff line number Diff line
@@ -808,7 +808,7 @@ BUILD_DATETIME_FROM_FILE := $$(cat $(BUILD_DATETIME_FILE)) 
# is made which breaks compatibility with the previous platform sepolicy version,

# not just on every increase in PLATFORM_SDK_VERSION.  The minor version should

# be reset to 0 on every bump of the PLATFORM_SDK_VERSION.

sepolicy_major_vers := 28

sepolicy_major_vers := 29

sepolicy_minor_vers := 0



ifneq ($(sepolicy_major_vers), $(PLATFORM_SDK_VERSION))

core/definitions.mk

+1 −1
Original line number Diff line number Diff line
@@ -2302,7 +2302,7 @@ endef 
ifeq ($(HOST_OS),linux)

# Runs appcompat and store logs in $(PRODUCT_OUT)/appcompat

define extract-package

$(AAPT2) dump $@ | awk -F ' |=' '/^Package/{print $$3}' >> $(PRODUCT_OUT)/appcompat/$(PRIVATE_MODULE).log &&

$(AAPT2) dump resources $@ | awk -F ' |=' '/^Package/{print $$3}' >> $(PRODUCT_OUT)/appcompat/$(PRIVATE_MODULE).log &&

endef

define appcompat-header

$(hide) \