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

Commit 079be45d authored by Dan Pasanen's avatar Dan Pasanen
Browse files

Merge tag 'android-7.1.2_r2' into cm-14.1 

Android 7.1.2 Release 2 (N2G47E)

Change-Id: Ie3d3e9ea5c8dd67f44e43b2ed5a97e844c19888d
parents 28032f6b 5f6e0300

core/Makefile

+8 −2
Original line number Diff line number Diff line
@@ -853,6 +853,7 @@ define generate-userimage-prop-dictionary 
$(if $(INTERNAL_USERIMAGES_EXT_VARIANT),$(hide) echo "fs_type=$(INTERNAL_USERIMAGES_EXT_VARIANT)" >> $(1))

$(if $(BOARD_SYSTEMIMAGE_PARTITION_SIZE),$(hide) echo "system_size=$(BOARD_SYSTEMIMAGE_PARTITION_SIZE)" >> $(1))

$(if $(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE),$(hide) echo "system_fs_type=$(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE)" >> $(1))

$(if $(BOARD_SYSTEMIMAGE_EXTFS_INODE_COUNT),$(hide) echo "system_extfs_inode_count=$(BOARD_SYSTEMIMAGE_EXTFS_INODE_COUNT)" >> $(1))

$(if $(BOARD_SYSTEMIMAGE_JOURNAL_SIZE),$(hide) echo "system_journal_size=$(BOARD_SYSTEMIMAGE_JOURNAL_SIZE)" >> $(1))

$(if $(BOARD_HAS_EXT4_RESERVED_BLOCKS),$(hide) echo "has_ext4_reserved_blocks=$(BOARD_HAS_EXT4_RESERVED_BLOCKS)" >> $(1))

$(if $(BOARD_SYSTEMIMAGE_SQUASHFS_COMPRESSOR),$(hide) echo "system_squashfs_compressor=$(BOARD_SYSTEMIMAGE_SQUASHFS_COMPRESSOR)" >> $(1))
@@ -867,6 +868,7 @@ $(if $(BOARD_USERDATAEXTRAIMAGE_PARTITION_NAME),$(hide) echo "userdataextra_name 
$(if $(BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE),$(hide) echo "cache_fs_type=$(BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE)" >> $(1))

$(if $(BOARD_CACHEIMAGE_PARTITION_SIZE),$(hide) echo "cache_size=$(BOARD_CACHEIMAGE_PARTITION_SIZE)" >> $(1))

$(if $(BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE),$(hide) echo "vendor_fs_type=$(BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE)" >> $(1))

$(if $(BOARD_VENDORIMAGE_EXTFS_INODE_COUNT),$(hide) echo "vendor_extfs_inode_count=$(BOARD_VENDORIMAGE_EXTFS_INODE_COUNT)" >> $(1))

$(if $(BOARD_VENDORIMAGE_PARTITION_SIZE),$(hide) echo "vendor_size=$(BOARD_VENDORIMAGE_PARTITION_SIZE)" >> $(1))

$(if $(BOARD_VENDORIMAGE_JOURNAL_SIZE),$(hide) echo "vendor_journal_size=$(BOARD_VENDORIMAGE_JOURNAL_SIZE)" >> $(1))

$(if $(BOARD_VENDORIMAGE_SQUASHFS_COMPRESSOR),$(hide) echo "vendor_squashfs_compressor=$(BOARD_VENDORIMAGE_SQUASHFS_COMPRESSOR)" >> $(1))
@@ -876,6 +878,7 @@ $(if $(BOARD_VENDORIMAGE_SQUASHFS_DISABLE_4K_ALIGN),$(hide) echo "vendor_squashf 
$(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VENDOR_BASE_FS_PATH),$(hide) echo "vendor_base_fs_file=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VENDOR_BASE_FS_PATH)" >> $(1))

$(if $(BOARD_OEMIMAGE_PARTITION_SIZE),$(hide) echo "oem_size=$(BOARD_OEMIMAGE_PARTITION_SIZE)" >> $(1))

$(if $(BOARD_OEMIMAGE_JOURNAL_SIZE),$(hide) echo "oem_journal_size=$(BOARD_OEMIMAGE_JOURNAL_SIZE)" >> $(1))

$(if $(BOARD_OEMIMAGE_EXTFS_INODE_COUNT),$(hide) echo "oem_extfs_inode_count=$(BOARD_OEMIMAGE_EXTFS_INODE_COUNT)" >> $(1))

$(if $(INTERNAL_USERIMAGES_SPARSE_EXT_FLAG),$(hide) echo "extfs_sparse_flag=$(INTERNAL_USERIMAGES_SPARSE_EXT_FLAG)" >> $(1))

$(if $(mkyaffs2_extra_flags),$(hide) echo "mkyaffs2_extra_flags=$(mkyaffs2_extra_flags)" >> $(1))

$(if $(INTERNAL_USERIMAGES_SPARSE_SQUASHFS_FLAG),$(hide) echo "squashfs_sparse_flag=$(INTERNAL_USERIMAGES_SPARSE_SQUASHFS_FLAG)" >> $(1))
@@ -1251,7 +1254,8 @@ $(INSTALLED_FILES_FILE): $(FULL_SYSTEMIMAGE_DEPS) 
	@echo Installed file list: $@

	@mkdir -p $(dir $@)

	@rm -f $@

	$(hide) build/tools/fileslist.py $(TARGET_OUT) > $@

	$(hide) build/tools/fileslist.py $(TARGET_OUT) > $(@:.txt=.json)

	$(hide) build/tools/fileslist_util.py -c $(@:.txt=.json) > $@



.PHONY: installed-file-list

installed-file-list: $(INSTALLED_FILES_FILE)
@@ -1653,7 +1657,8 @@ $(INSTALLED_FILES_FILE_VENDOR) : $(INTERNAL_VENDORIMAGE_FILES) 
	@echo Installed file list: $@

	@mkdir -p $(dir $@)

	@rm -f $@

	$(hide) build/tools/fileslist.py $(TARGET_OUT_VENDOR) > $@

	$(hide) build/tools/fileslist.py $(TARGET_OUT_VENDOR) > $(@:.txt=.json)

	$(hide) build/tools/fileslist_util.py -c $(@:.txt=.json) > $@



vendorimage_intermediates := \

    $(call intermediates-dir-for,PACKAGING,vendor)
@@ -1741,6 +1746,7 @@ OTATOOLS := $(HOST_OUT_EXECUTABLES)/minigzip \ 
  $(HOST_OUT_EXECUTABLES)/e2fsck \

  $(HOST_OUT_EXECUTABLES)/build_verity_tree \

  $(HOST_OUT_EXECUTABLES)/verity_signer \

  $(HOST_OUT_EXECUTABLES)/verity_verifier \

  $(HOST_OUT_EXECUTABLES)/append2simg \

  $(HOST_OUT_EXECUTABLES)/img2simg \

  $(HOST_OUT_EXECUTABLES)/boot_signer \

core/base_rules.mk

+5 −1
Original line number Diff line number Diff line
@@ -210,7 +210,11 @@ ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE)) 
  # Apk and its attachments reside in its own subdir.

  ifeq ($(LOCAL_MODULE_CLASS),APPS)

  # framework-res.apk doesn't like the additional layer.

  ifeq ($(filter true,$(LOCAL_NO_STANDARD_LIBRARIES) $(LOCAL_IGNORE_SUBDIR)),)

  ifeq ($(LOCAL_NO_STANDARD_LIBRARIES),true)

  # Neither do Runtime Resource Overlay apks, which contain just the overlaid resources.

  else ifeq ($(LOCAL_IS_RUNTIME_RESOURCE_OVERLAY),true)

  else ifeq ($(LOCAL_IGNORE_SUBDIR),true)

  else

    my_module_path := $(my_module_path)/$(LOCAL_MODULE)

  endif

  endif

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.



export BUILD_ID=NOF27B
 
export BUILD_ID=N2G47E

core/build_rro_package.mk

0 → 100644
+25 −0
Original line number Diff line number Diff line 
#############################################################################

## Standard rules for installing runtime resouce overlay APKs.

##

## Set LOCAL_RRO_THEME to the theme name if the package should apply only to

## a particular theme as set by ro.boot.vendor.overlay.theme system property.

##

## If LOCAL_RRO_THEME is not set, the package will apply always, independent

## of themes.

##

#############################################################################



LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true



ifneq ($(LOCAL_SRC_FILES),)

  $(error runtime resource overlay package should not contain sources)

endif



ifeq (S(LOCAL_RRO_THEME),)

  LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/overlay

else

  LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/overlay/$(LOCAL_RRO_THEME)

endif



include $(BUILD_SYSTEM)/package.mk

core/clear_vars.mk

+2 −0
Original line number Diff line number Diff line
@@ -367,6 +367,8 @@ LOCAL_CLANG_64:= 
LOCAL_INIT_RC_32:=

LOCAL_INIT_RC_64:=

LOCAL_JAVA_LANGUAGE_VERSION:=

LOCAL_IS_RUNTIME_RESOURCE_OVERLAY:=

LOCAL_RRO_THEME:=



LOCAL_PROTOC_OUTPUT:=