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

Commit 150d81d1 authored by Christopher Ferris's avatar Christopher Ferris
Browse files

Add new build type. 

This new build type creates a system image that defaults to 64 bit
only, but all 32 bit code is present. In addition, changing the
properties on the vendor partition will allow the secondary zygote
to start as if it was a 64_32 image.

Bug: 227482437

Test: Verified that secondary doesn't start with same disk image
Test: with ro.zygote set to zygote64 and abilists set appropriately.
Test: Verified that secondary does not start when restarting netd.
Test: with ro.zygote set to zygote64_32 and abilists set appropriately.
Test: Verified that secondary does start when restarting netd.
Change-Id: I8779b548e45bd5b32bd4c8b50010ef61a5f4e99a
parent 01b1c623

AndroidProducts.mk

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
PRODUCT_MAKEFILES := \

    $(LOCAL_DIR)/aosp_redfin.mk \

    $(LOCAL_DIR)/aosp_redfin_64.mk \

    $(LOCAL_DIR)/aosp_redfin_64_with_32.mk \

    $(LOCAL_DIR)/vf/aosp_redfin_vf.mk \

    $(LOCAL_DIR)/aosp_redfin_hwasan.mk \

aosp_redfin_64_with_32.mk

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

# Copyright 2018 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.

#



# Build all of the 32 bit code, but only the vendor partition enables 64 bit.

ZYGOTE_FORCE_64 := true



$(call inherit-product, device/google/redfin/aosp_redfin.mk)



PRODUCT_NAME := aosp_redfin_64_with_32

PRODUCT_MODEL := AOSP on Redfin 64-bit only zygote with 32 bit support