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

Commit b60ccd66 authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

am ae65e2eb: am d73ec26a: Merge "Make default 64-bit primary, 32-bit secondary" 

* commit 'ae65e2eb':
  Make default 64-bit primary, 32-bit secondary
parents 5c1d21b4 ae65e2eb

CleanSpec.mk

+3 −0
Original line number Diff line number Diff line
@@ -250,6 +250,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) 
# Switching to 32-bit-by-default host multilib build

$(call add-clean-step, rm -rf $(HOST_OUT_INTERMEDIATES))



# Change ro.zygote for core_64_bit.mk from zygote32_64 to zygote64_32

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/default.prop)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/default.prop)

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

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

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

core/config.mk

+1 −1
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ endif 
#

# Note that this assumes that the 2ND_CPU_ABI for a 64 bit target

# is always 32 bits. If this isn't the case, these variables should

# be overriden in the boarc configuration.

# be overriden in the board configuration.

ifeq (,$(TARGET_CPU_ABI_LIST_64_BIT))

  ifeq (true|true,$(TARGET_IS_64_BIT)|$(TARGET_SUPPORTS_64_BIT_APPS))

    TARGET_CPU_ABI_LIST_64_BIT := $(TARGET_CPU_ABI) $(TARGET_CPU_ABI2)

target/product/core_64_bit.mk

+4 −4
Original line number Diff line number Diff line
@@ -22,12 +22,12 @@ 
# For now this will allow 64-bit apps, but still compile all apps with JNI

# for 32-bit only.



# Copy the 32-bit primary, 64-bit secondary zygote startup script

PRODUCT_COPY_FILES += system/core/rootdir/init.zygote32_64.rc:root/init.zygote32_64.rc

# Copy the 64-bit primary, 32-bit secondary zygote startup script

PRODUCT_COPY_FILES += system/core/rootdir/init.zygote64_32.rc:root/init.zygote64_32.rc



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

# 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

PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote32_64

PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote64_32



TARGET_SUPPORTS_32_BIT_APPS := true

TARGET_SUPPORTS_64_BIT_APPS := true

target/product/full_x86_64.mk

+0 −4
Original line number Diff line number Diff line
@@ -23,10 +23,6 @@ 
# that isn't a wifi connection. This will instruct init.rc to enable the

# network connection so that you can use it with ADB



PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote64_32

PRODUCT_COPY_FILES += system/core/rootdir/init.zygote64_32.rc:root/init.zygote64_32.rc





$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_64/device.mk)