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

Commit 75b29ae0 authored by Colin Cross's avatar Colin Cross
Browse files

build: add core_64_bit.mk 

Add a new product, core_64_bit.mk, that products can inherit from
to configure zygote and the rest of the build system for a standard
64-bit product.

Make the 64-bit emulator targets for arm64, mips64, and x86_64
inherit from it.

Change-Id: I7e809264db39472f554cd5290529f3d6499345d4
parent 2a4f0ff3

target/product/aosp_arm64.mk

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
# build quite specifically for the emulator, and might not be

# entirely appropriate to inherit from for on-device configurations.



$(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_arm64/device.mk)

target/product/core_64_bit.mk

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

# Copyright (C) 2014 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.

#



# Inherit from this product for devices that support 64-bit apps using:

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

# The inheritance for this must come before the inheritance chain that leads

# to core_minimal.mk



# 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



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

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

PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote32_64



# Temporary hack to prefer launching processes as 32 bit

# instead of 64 bit.

#

# STOPSHIP: Revert this to allow products to select it themselves

TARGET_PREFER_32_BIT_APPS := true



# Temporarily leave these unset to keep all apps with JNI building as 32-bit

# TARGET_SUPPORTS_32_BIT_APPS := true

# TARGET_SUPPORTS_64_BIT_APPS := true

target/product/full_mips64.mk

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
# mips64 build quite specifically for the emulator, and might not be

# entirely appropriate to inherit from for on-device configurations.



$(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_mips64/device.mk)

target/product/full_x86_64.mk

+1 −3
Original line number Diff line number Diff line
@@ -23,9 +23,7 @@ 
# that isn't a wifi connection. This will instruct init.rc to enable the

# network connection so that you can use it with ADB



# Override and force 64-bit Zygote. Must come first.

PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote64



$(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)