df09892cdb
The patch seperates gsi_common.mk to aosp_product.mk and gsi_release.mk. Let GSI targets can be inherit with 3 parts: - system: mainline_system.mk - product: aosp_product.mk - vendor: none or emulator vendor makefiles aosp_product.mk includes the AOSP packages/settings will be in the product partition. GSI targets also includes the gsi_release.mk, which contains the special settings for the GSI for releasing, ex. skip_mount.cfg, extra VNDK, etc. After the patch, the build targets inherit from aosp_$arch.mk will not apply these special settings anymore. The gsi_common.mk, legacy_gsi_common.mk and aosp_$arch_ab.mk will be phased out later. Bug: 135502030 Test: build gsi_arm64-userdebug and aosp_arm64-userdebug, compare Test: root, system and vendor in out folder with/without the patch Change-Id: Ic604ac91ba9a704e6507bac324d19bbf68063464
60 lines
1.7 KiB
Makefile
60 lines
1.7 KiB
Makefile
#
|
|
# Copyright 2013 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_USE_DYNAMIC_PARTITIONS := true
|
|
|
|
# The system image of aosp_x86-userdebug is a GSI for the devices with:
|
|
# - x86 32 bits user space
|
|
# - 64 bits binder interface
|
|
# - system-as-root
|
|
# - VNDK enforcement
|
|
# - compatible property override enabled
|
|
|
|
#
|
|
# All components inherited here go to system image
|
|
#
|
|
$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
|
|
|
|
# Enable mainline checking for excat this product name
|
|
ifeq (aosp_x86,$(TARGET_PRODUCT))
|
|
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
|
|
endif
|
|
|
|
#
|
|
# All components inherited here go to product image
|
|
#
|
|
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
|
|
|
|
#
|
|
# All components inherited here go to vendor image
|
|
#
|
|
$(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)
|
|
|
|
|
|
#
|
|
# Special settings for GSI releasing
|
|
#
|
|
ifeq (aosp_x86,$(TARGET_PRODUCT))
|
|
$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)
|
|
endif
|
|
|
|
|
|
PRODUCT_NAME := aosp_x86
|
|
PRODUCT_DEVICE := generic_x86
|
|
PRODUCT_BRAND := Android
|
|
PRODUCT_MODEL := AOSP on x86
|