87163300c2
This reverts commit 6e96487968.
Reason for revert: build_test broken by this change.
Change-Id: I0f48bb84dc8c521540c745814daa11c2900ac2c8
37 lines
1.5 KiB
Makefile
37 lines
1.5 KiB
Makefile
#
|
|
# Copyright (C) 2017 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.
|
|
#
|
|
|
|
# PRODUCT_PROPERTY_OVERRIDES cannot be used here because sysprops will be at
|
|
# /vendor/[build|default].prop when build split is on. In order to have sysprops
|
|
# on the generic system image, place them in build/make/target/board/
|
|
# treble_system.prop.
|
|
|
|
include build/make/target/product/treble_common.mk
|
|
|
|
# For now this will allow 64-bit apps, but still compile all apps with JNI
|
|
# for 32-bit only.
|
|
|
|
# Copy different zygote settings for vendor.img to select by setting property
|
|
# ro.zygote=zygote64_32 or ro.zygote=zygote32_64:
|
|
# 1. 64-bit primary, 32-bit secondary OR
|
|
# 2. 32-bit primary, 64-bit secondary
|
|
# 3. 64-bit only is currently forbidden (b/64280459#comment6)
|
|
PRODUCT_COPY_FILES += \
|
|
system/core/rootdir/init.zygote64_32.rc:root/init.zygote64_32.rc \
|
|
system/core/rootdir/init.zygote32_64.rc:root/init.zygote32_64.rc
|
|
|
|
TARGET_SUPPORTS_32_BIT_APPS := true
|
|
TARGET_SUPPORTS_64_BIT_APPS := true
|