From fe3d2e672a527148f87c9739009d72a5f394e5ed Mon Sep 17 00:00:00 2001 From: Jordan Demeulenaere Date: Mon, 7 Feb 2022 09:05:29 +0000 Subject: [PATCH] Revert "Add a core configuration that disables the zygote." Revert submission 1964759-master-I4f918502e611e950fa039e4e2ed817c97b928ba2 Reason for revert: b/217993447 Reverted Changes: I4f918502e:Add a core configuration that disables the zygote.... I4f918502e:Add a core configuration that disables the zygote.... I4f918502e:Add a core configuration that disables the zygote.... Change-Id: I5d51a021fea89a0ab6c73349d93117d60cfc9350 --- target/product/core_no_zygote.mk | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 target/product/core_no_zygote.mk diff --git a/target/product/core_no_zygote.mk b/target/product/core_no_zygote.mk deleted file mode 100644 index 205a8976bd..0000000000 --- a/target/product/core_no_zygote.mk +++ /dev/null @@ -1,30 +0,0 @@ -# -# Copyright (C) 2022 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 do not include a zygote using: -# $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk) -# The inheritance for this must come before the inheritance chain that leads -# to core_minimal.mk. - -# Copy the no-zygote startup script -PRODUCT_COPY_FILES += system/core/rootdir/init.no_zygote.rc:system/etc/init/hw/init.no_zygote.rc - -# Set the zygote property to select the no-zygote script. -# This line must be parsed before the one in core_minimal.mk -PRODUCT_VENDOR_PROPERTIES += ro.zygote=no_zygote - -TARGET_SUPPORTS_32_BIT_APPS := false -TARGET_SUPPORTS_64_BIT_APPS := false