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

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

Merge changes from topic "from-pi-gsi" into pie-gsi 

* changes:
  Enable dynamic image size on aosp_arm_64b_ab
  Add aosp_arm_64b_ab product
  Fix unbundled branch by not having it pick up goldfish dependency
  Add emulator audio policy config in /vendor not /system
  emulator: factor vendor partition out of emulator.mk
  Enable dyanmic image size for GSI
  Split PRODUCT_USE_LOGICAL_PARTITIONS into sub-flags.
  Remove vr_hwc from GSI image.
  ro.boot.logical_partitions moved to product image
  Build image for super partition
  Add PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS.
  Build GSIs (aosp_$arch products) in sparse format
  Add more ro.vendor.build.*
  Fix check on BOARD_SUPER_PARTITION_SIZE.
  build_image.py recognize BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE
  releasetools: Rename the ramdisk_dir in prop dict to root_dir.
  Add A/B update to GSI
  Move some BoardConfig settings from EmuCommon to GsiCommon
  Create extra symbolic links at root for arm64 GSI
  Add USE_XML_AUDIO_POLICY_CONF to GSI
  Refactor BoardConfig.mk for emulator products
  Add BOARD_SUPER_PARTITION_*
  build_image.py recognize BOARD_VENDORIMAGE_PARTITION_RESERVED_SIZE
  build_image.py recognize BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE
  androidboot.lrap => logical_partitions
  generate-image-prop-dictionary only generates relevant variables
  Add ro.boot.logical_partitions
  Remove unnecessary branch for BOARD_HAS_EXT4_RESERVED_BLOCKS.
  Add PRODUCT_USE_LOGICAL_PARTITIONS
parents 29acab88 07d5e43e

CleanSpec.mk

+2 −0
Original line number Diff line number Diff line
@@ -488,6 +488,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Launcher3) 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/Launcher3)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher3_intermediates)



$(call add-clean-step, find $(PRODUCT_OUT) -type f -name "vr_hwc*" -print0 | xargs -0 rm -f)



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

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

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

core/Makefile

+226 −79

File changed.

Preview size limit exceeded, changes collapsed.

core/config.mk

+57 −0

File changed.

Preview size limit exceeded, changes collapsed.

core/main.mk

+16 −0
Original line number Diff line number Diff line
@@ -146,6 +146,15 @@ endif 


ADDITIONAL_BUILD_PROPERTIES :=



#

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

# Validate ADDITIONAL_PRODUCT_PROPERTIES.

ifneq ($(ADDITIONAL_PRODUCT_PROPERTIES),)

$(error ADDITIONAL_PRODUCT_PROPERTIES must not be set before here: $(ADDITIONAL_PRODUCT_PROPERTIES))

endif



ADDITIONAL_PRODUCT_PROPERTIES :=



#

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

# Add the product-defined properties to the build properties.
@@ -233,6 +242,8 @@ else 
ADDITIONAL_DEFAULT_PROPERTIES += ro.actionable_compatible_property.enabled=${PRODUCT_COMPATIBLE_PROPERTY}

endif



ADDITIONAL_PRODUCT_PROPERTIES += ro.boot.logical_partitions=$(USE_LOGICAL_PARTITIONS)



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

###

### In this section we set up the things that are different
@@ -397,6 +408,8 @@ ADDITIONAL_DEFAULT_PROPERTIES := $(strip $(ADDITIONAL_DEFAULT_PROPERTIES)) 
.KATI_READONLY := ADDITIONAL_DEFAULT_PROPERTIES

ADDITIONAL_BUILD_PROPERTIES := $(strip $(ADDITIONAL_BUILD_PROPERTIES))

.KATI_READONLY := ADDITIONAL_BUILD_PROPERTIES

ADDITIONAL_PRODUCT_PROPERTIES := $(strip $(ADDITIONAL_PRODUCT_PROPERTIES))

.KATI_READONLY := ADDITIONAL_PRODUCT_PROPERTIES



ifneq ($(PRODUCT_ENFORCE_RRO_TARGETS),)

ENFORCE_RRO_SOURCES :=
@@ -1095,6 +1108,9 @@ productimage: $(INSTALLED_PRODUCTIMAGE_TARGET) 
.PHONY: systemotherimage

systemotherimage: $(INSTALLED_SYSTEMOTHERIMAGE_TARGET)



.PHONY: superimage

superimage: $(INSTALLED_SUPERIMAGE_TARGET)



.PHONY: bootimage

bootimage: $(INSTALLED_BOOTIMAGE_TARGET)

core/product.mk

+12 −0

File changed.

Preview size limit exceeded, changes collapsed.