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

Commit 33f695bd authored by Christopher Ferris's avatar Christopher Ferris Committed by Automerger Merge Worker
Browse files

Add support for only starting 64 bit zygote. am: 5a564d83 

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19272311



Change-Id: Idbe2fd2b5f32bc4d5f66c900b9085951e5fa1416
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 09da19b9 5a564d83

core/sysprop.mk

+13 −4
Original line number Diff line number Diff line
@@ -47,11 +47,19 @@ define generate-common-build-props 
        echo "ro.product.$(1).model=$(PRODUCT_MODEL)" >> $(2);\

        echo "ro.product.$(1).name=$(TARGET_PRODUCT)" >> $(2);\

    )\

    $(if $(filter true,$(ZYGOTE_FORCE_64)),\

        $(if $(filter vendor,$(1)),\

            echo "ro.$(1).product.cpu.abilist=$(TARGET_CPU_ABI_LIST_64_BIT)" >> $(2);\

            echo "ro.$(1).product.cpu.abilist32=" >> $(2);\

            echo "ro.$(1).product.cpu.abilist64=$(TARGET_CPU_ABI_LIST_64_BIT)" >> $(2);\

        )\

    ,\

        $(if $(filter system vendor odm,$(1)),\

            echo "ro.$(1).product.cpu.abilist=$(TARGET_CPU_ABI_LIST)" >> $(2);\

            echo "ro.$(1).product.cpu.abilist32=$(TARGET_CPU_ABI_LIST_32_BIT)" >> $(2);\

            echo "ro.$(1).product.cpu.abilist64=$(TARGET_CPU_ABI_LIST_64_BIT)" >> $(2);\

        )\

    )\

    echo "ro.$(1).build.date=`$(DATE_FROM_FILE)`" >> $(2);\

    echo "ro.$(1).build.date.utc=`$(DATE_FROM_FILE) +%s`" >> $(2);\

    echo "ro.$(1).build.fingerprint=$(BUILD_FINGERPRINT_FROM_FILE)" >> $(2);\
@@ -282,6 +290,7 @@ $(gen_from_buildinfo_sh): $(INTERNAL_BUILD_ID_MAKEFILE) $(API_FINGERPRINT) | $(B 
	        TARGET_CPU_ABI_LIST_64_BIT="$(TARGET_CPU_ABI_LIST_64_BIT)" \

	        TARGET_CPU_ABI="$(TARGET_CPU_ABI)" \

	        TARGET_CPU_ABI2="$(TARGET_CPU_ABI2)" \

	        ZYGOTE_FORCE_64_BIT="$(ZYGOTE_FORCE_64_BIT)" \

	        bash $(BUILDINFO_SH) > $@



ifdef TARGET_SYSTEM_PROP

target/product/core_64_bit.mk

+4 −0
Original line number Diff line number Diff line
@@ -27,7 +27,11 @@ PRODUCT_COPY_FILES += system/core/rootdir/init.zygote64_32.rc:system/etc/init/hw 


# Set the zygote property to select the 64-bit primary, 32-bit secondary script

# This line must be parsed before the one in core_minimal.mk

ifeq ($(ZYGOTE_FORCE_64),true)

PRODUCT_VENDOR_PROPERTIES += ro.zygote=zygote64

else

PRODUCT_VENDOR_PROPERTIES += ro.zygote=zygote64_32

endif



TARGET_SUPPORTS_32_BIT_APPS := true

TARGET_SUPPORTS_64_BIT_APPS := true