Remove zygote init.rc & Add build toolchain for gecko.

This commit is contained in:
fanyouwei 2022-08-30 18:51:52 +08:00 committed by hcl
parent 06e9467041
commit c4ef75b108
6 changed files with 15 additions and 10 deletions

View File

@ -30,9 +30,11 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
# Enable mainline checking for excat this product name
ifeq (aosp_arm,$(TARGET_PRODUCT))
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
# PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
endif
ENABLE_DEFAULT_BOOTANIMATION := true
PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
#
@ -52,6 +54,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
$(call inherit-product-if-exists, device/generic/goldfish/arm32-vendor.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86/device.mk)
$(call inherit-product, gonk-misc/b2g.mk)
$(call inherit-product-if-exists, external/moztt/fonts.mk)
#
# Special settings for GSI releasing

View File

@ -53,6 +53,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
#
$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk)
$(call inherit-product, gonk-misc/b2g.mk)
$(call inherit-product-if-exists, external/moztt/fonts.mk)
#
# Special settings for GSI releasing

View File

@ -30,7 +30,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
# Enable mainline checking for excat this product name
ifeq (aosp_x86,$(TARGET_PRODUCT))
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
# PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
endif
#
@ -50,6 +50,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
$(call inherit-product-if-exists, device/generic/goldfish/x86-vendor.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86/device.mk)
$(call inherit-product, gonk-misc/b2g.mk)
$(call inherit-product-if-exists, external/moztt/fonts.mk)
#

View File

@ -36,7 +36,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
# Enable mainline checking for excat this product name
ifeq (aosp_x86_64,$(TARGET_PRODUCT))
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
# PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
endif
#
@ -56,6 +56,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
$(call inherit-product-if-exists, device/generic/goldfish/x86_64-vendor.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_64/device.mk)
$(call inherit-product, gonk-misc/b2g.mk)
$(call inherit-product-if-exists, external/moztt/fonts.mk)
#
# Special settings for GSI releasing

View File

@ -22,12 +22,5 @@
# For now this will allow 64-bit apps, but still compile all apps with JNI
# for 32-bit only.
# Copy the 64-bit primary, 32-bit secondary zygote startup script
PRODUCT_COPY_FILES += system/core/rootdir/init.zygote64_32.rc:system/etc/init/hw/init.zygote64_32.rc
# 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_VENDOR_PROPERTIES += ro.zygote=zygote64_32
TARGET_SUPPORTS_32_BIT_APPS := true
TARGET_SUPPORTS_64_BIT_APPS := true

View File

@ -24,6 +24,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system_ext.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_vendor.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_product.mk)
$(call inherit-product, gonk-misc/b2g.mk)
$(call inherit-product-if-exists, external/moztt/fonts.mk)
PRODUCT_BRAND := generic
PRODUCT_DEVICE := generic