Rename mainline_system(.*).mk to generic_system(.*).mk
Rename mainline_system to generic_system in mk files
to avoid confusion with mainline module.
First, move mainline_system(.*).mk to generic_system(.*).mk
and make previous mainline_system(.*).mk to just inherit
generic_system(.*).mk to make alias except mainline_system.mk.
is just symlink to generic_system.mk.
These aliasing file will be kept remain during migration
for preventing build breakage and making changes possible
during migration.
Bug: 160649682
Test: lunch generic_system_arm64 && m nothing
Test: lunch generic_system_x86 && m nothing
Test: lunch generic_system_x86_64 && m nothing
Test: lunch generic_system_x86_arm && m nothing
Test: lunch mainline_system_arm64 && m nothing
Test: lunch mainline_system_x86 && m nothing
Test: lunch mainline_system_x86_64 && m nothing
Test: lunch mainline_system_x86_arm && m nothing
Change-Id: I3609ec2d91b0f08859a36cac75c25876b1db6d6a
Merged-In: I3609ec2d91b0f08859a36cac75c25876b1db6d6a
(cherry picked from commit 6f16b5764b)
This commit is contained in:
JaeMan
parent
14350c575f
commit
20cdc90938
25 changed files with 368 additions and 271 deletions
|
|
@ -55,12 +55,16 @@ PRODUCT_MAKEFILES := \
|
|||
$(LOCAL_DIR)/full.mk \
|
||||
$(LOCAL_DIR)/full_x86.mk \
|
||||
$(LOCAL_DIR)/generic.mk \
|
||||
$(LOCAL_DIR)/generic_system_arm64.mk \
|
||||
$(LOCAL_DIR)/generic_system_x86.mk \
|
||||
$(LOCAL_DIR)/generic_system_x86_64.mk \
|
||||
$(LOCAL_DIR)/generic_system_x86_arm.mk \
|
||||
$(LOCAL_DIR)/generic_x86.mk \
|
||||
$(LOCAL_DIR)/gsi_arm64.mk \
|
||||
$(LOCAL_DIR)/mainline_system_arm64.mk \
|
||||
$(LOCAL_DIR)/mainline_system_x86.mk \
|
||||
$(LOCAL_DIR)/mainline_system_x86_arm.mk \
|
||||
$(LOCAL_DIR)/mainline_system_x86_64.mk \
|
||||
$(LOCAL_DIR)/mainline_system_x86_arm.mk \
|
||||
$(LOCAL_DIR)/sdk_arm64.mk \
|
||||
$(LOCAL_DIR)/sdk.mk \
|
||||
$(LOCAL_DIR)/sdk_phone_arm64.mk \
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ PRODUCT_USE_DYNAMIC_PARTITIONS := true
|
|||
#
|
||||
# All components inherited here go to system image
|
||||
#
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
|
||||
|
||||
# Enable mainline checking for excat this product name
|
||||
ifeq (aosp_arm,$(TARGET_PRODUCT))
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
# All components inherited here go to system image
|
||||
#
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
|
||||
|
||||
# Enable mainline checking for excat this product name
|
||||
ifeq (aosp_arm64,$(TARGET_PRODUCT))
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
# (The system image of Legacy GSI is not CSI)
|
||||
#
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
|
||||
|
||||
# Enable mainline checking for excat this product name
|
||||
ifeq (aosp_arm64_ab,$(TARGET_PRODUCT))
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
# All components inherited here go to system image
|
||||
# (The system image of Legacy GSI is not CSI)
|
||||
#
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
|
||||
|
||||
# Enable mainline checking for excat this product name
|
||||
ifeq (aosp_arm_ab,$(TARGET_PRODUCT))
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ PRODUCT_USE_DYNAMIC_PARTITIONS := true
|
|||
#
|
||||
# All components inherited here go to system image
|
||||
#
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
|
||||
|
||||
# Enable mainline checking for excat this product name
|
||||
ifeq (aosp_x86,$(TARGET_PRODUCT))
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ PRODUCT_USE_DYNAMIC_PARTITIONS := true
|
|||
# All components inherited here go to system image
|
||||
#
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
|
||||
|
||||
# Enable mainline checking for excat this product name
|
||||
ifeq (aosp_x86_64,$(TARGET_PRODUCT))
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
# (The system image of Legacy GSI is not CSI)
|
||||
#
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
|
||||
|
||||
# Enable mainline checking for excat this product name
|
||||
ifeq (aosp_x86_64_ab,$(TARGET_PRODUCT))
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
# (The system image of Legacy GSI is not CSI)
|
||||
#
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
|
||||
|
||||
# Enable mainline checking for excat this product name
|
||||
ifeq (aosp_x86_ab,$(TARGET_PRODUCT))
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ PRODUCT_USE_DYNAMIC_PARTITIONS := true
|
|||
#
|
||||
# All components inherited here go to system image
|
||||
#
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
|
||||
|
||||
# Enable mainline checking
|
||||
ifeq (aosp_x86_arm,$(TARGET_PRODUCT))
|
||||
|
|
|
|||
151
target/product/generic_system.mk
Normal file
151
target/product/generic_system.mk
Normal file
|
|
@ -0,0 +1,151 @@
|
|||
#
|
||||
# Copyright (C) 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.
|
||||
#
|
||||
|
||||
# This makefile is the basis of a generic system image for a handheld device.
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_default.mk)
|
||||
# Add adb keys to debuggable AOSP builds (if they exist)
|
||||
$(call inherit-product-if-exists, vendor/google/security/adb/vendor_key.mk)
|
||||
|
||||
# Enable updating of APEXes
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
|
||||
|
||||
# Shared java libs
|
||||
PRODUCT_PACKAGES += \
|
||||
com.android.nfc_extras \
|
||||
|
||||
# Applications
|
||||
PRODUCT_PACKAGES += \
|
||||
LiveWallpapersPicker \
|
||||
PartnerBookmarksProvider \
|
||||
PresencePolling \
|
||||
RcsService \
|
||||
SafetyRegulatoryInfo \
|
||||
Stk \
|
||||
Tag \
|
||||
TimeZoneUpdater \
|
||||
|
||||
# Binaries
|
||||
PRODUCT_PACKAGES += llkd
|
||||
|
||||
# OTA support
|
||||
PRODUCT_PACKAGES += \
|
||||
recovery-refresh \
|
||||
update_engine \
|
||||
update_verifier \
|
||||
|
||||
# Wrapped net utils for /vendor access.
|
||||
PRODUCT_PACKAGES += netutils-wrapper-1.0
|
||||
|
||||
# Charger images
|
||||
PRODUCT_PACKAGES += charger_res_images
|
||||
|
||||
# system_other support
|
||||
PRODUCT_PACKAGES += \
|
||||
cppreopts.sh \
|
||||
otapreopt_script \
|
||||
|
||||
# Bluetooth libraries
|
||||
PRODUCT_PACKAGES += \
|
||||
audio.a2dp.default \
|
||||
audio.hearing_aid.default \
|
||||
|
||||
# For ringtones that rely on forward lock encryption
|
||||
PRODUCT_PACKAGES += libfwdlockengine
|
||||
|
||||
# System libraries commonly depended on by things on the system_ext or product partitions.
|
||||
# These lists will be pruned periodically.
|
||||
PRODUCT_PACKAGES += \
|
||||
android.hardware.biometrics.fingerprint@2.1 \
|
||||
android.hardware.radio@1.0 \
|
||||
android.hardware.radio@1.1 \
|
||||
android.hardware.radio@1.2 \
|
||||
android.hardware.radio@1.3 \
|
||||
android.hardware.radio@1.4 \
|
||||
android.hardware.radio.config@1.0 \
|
||||
android.hardware.radio.deprecated@1.0 \
|
||||
android.hardware.secure_element@1.0 \
|
||||
android.hardware.wifi@1.0 \
|
||||
libaudio-resampler \
|
||||
libaudiohal \
|
||||
libdrm \
|
||||
liblogwrap \
|
||||
liblz4 \
|
||||
libminui \
|
||||
libnl \
|
||||
libprotobuf-cpp-full \
|
||||
|
||||
# These libraries are empty and have been combined into libhidlbase, but are still depended
|
||||
# on by things off /system.
|
||||
# TODO(b/135686713): remove these
|
||||
PRODUCT_PACKAGES += \
|
||||
libhidltransport \
|
||||
libhwbinder \
|
||||
|
||||
# Camera service uses 'libdepthphoto' for adding dynamic depth
|
||||
# metadata inside depth jpegs.
|
||||
PRODUCT_PACKAGES += \
|
||||
libdepthphoto \
|
||||
|
||||
PRODUCT_PACKAGES_DEBUG += \
|
||||
avbctl \
|
||||
bootctl \
|
||||
tinycap \
|
||||
tinyhostless \
|
||||
tinymix \
|
||||
tinypcminfo \
|
||||
tinyplay \
|
||||
update_engine_client \
|
||||
|
||||
PRODUCT_HOST_PACKAGES += \
|
||||
tinyplay
|
||||
|
||||
# Include all zygote init scripts. "ro.zygote" will select one of them.
|
||||
PRODUCT_COPY_FILES += \
|
||||
system/core/rootdir/init.zygote32.rc:system/etc/init/hw/init.zygote32.rc \
|
||||
system/core/rootdir/init.zygote64.rc:system/etc/init/hw/init.zygote64.rc \
|
||||
system/core/rootdir/init.zygote64_32.rc:system/etc/init/hw/init.zygote64_32.rc \
|
||||
|
||||
# Enable dynamic partition size
|
||||
PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true
|
||||
|
||||
PRODUCT_ENFORCE_RRO_TARGETS := *
|
||||
|
||||
# TODO(b/150820813) Settings depends on static overlay, remove this after eliminating the dependency.
|
||||
PRODUCT_ENFORCE_RRO_EXEMPTED_TARGETS := Settings
|
||||
|
||||
PRODUCT_NAME := generic_system
|
||||
PRODUCT_BRAND := generic
|
||||
|
||||
# Define /system partition-specific product properties to identify that /system
|
||||
# partition is generic_system.
|
||||
PRODUCT_SYSTEM_NAME := mainline
|
||||
PRODUCT_SYSTEM_BRAND := Android
|
||||
PRODUCT_SYSTEM_MANUFACTURER := Android
|
||||
PRODUCT_SYSTEM_MODEL := mainline
|
||||
PRODUCT_SYSTEM_DEVICE := generic
|
||||
|
||||
_base_mk_allowed_list :=
|
||||
|
||||
_my_allowed_list := $(_base_mk_allowed_list)
|
||||
|
||||
# For mainline, system.img should be mounted at /, so we include ROOT here.
|
||||
_my_paths := \
|
||||
$(TARGET_COPY_OUT_ROOT)/ \
|
||||
$(TARGET_COPY_OUT_SYSTEM)/ \
|
||||
|
||||
$(call require-artifacts-in-path, $(_my_paths), $(_my_allowed_list))
|
||||
46
target/product/generic_system_arm64.mk
Normal file
46
target/product/generic_system_arm64.mk
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
#
|
||||
# Copyright (C) 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.
|
||||
#
|
||||
|
||||
#
|
||||
# All components inherited here go to system image
|
||||
#
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
|
||||
$(call enforce-product-packages-exist,)
|
||||
|
||||
# Enable mainline checking
|
||||
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := true
|
||||
|
||||
PRODUCT_BUILD_CACHE_IMAGE := false
|
||||
PRODUCT_BUILD_ODM_IMAGE := false
|
||||
PRODUCT_BUILD_VENDOR_DLKM_IMAGE := false
|
||||
PRODUCT_BUILD_ODM_DLKM_IMAGE := false
|
||||
PRODUCT_BUILD_PRODUCT_IMAGE := false
|
||||
PRODUCT_BUILD_RAMDISK_IMAGE := false
|
||||
PRODUCT_BUILD_SYSTEM_IMAGE := true
|
||||
PRODUCT_BUILD_SYSTEM_EXT_IMAGE := false
|
||||
PRODUCT_BUILD_SYSTEM_OTHER_IMAGE := false
|
||||
PRODUCT_BUILD_USERDATA_IMAGE := false
|
||||
PRODUCT_BUILD_VENDOR_IMAGE := false
|
||||
|
||||
PRODUCT_SHIPPING_API_LEVEL := 29
|
||||
|
||||
# TODO(b/137033385): change this back to "all"
|
||||
PRODUCT_RESTRICT_VENDOR_FILES := owner
|
||||
|
||||
PRODUCT_NAME := generic_system_arm64
|
||||
PRODUCT_DEVICE := mainline_arm64
|
||||
PRODUCT_BRAND := generic
|
||||
45
target/product/generic_system_x86.mk
Normal file
45
target/product/generic_system_x86.mk
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
#
|
||||
# Copyright (C) 2019 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.
|
||||
#
|
||||
|
||||
#
|
||||
# All components inherited here go to system image
|
||||
#
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
|
||||
$(call enforce-product-packages-exist,)
|
||||
|
||||
# Enable mainline checking
|
||||
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := true
|
||||
|
||||
PRODUCT_BUILD_CACHE_IMAGE := false
|
||||
PRODUCT_BUILD_ODM_IMAGE := false
|
||||
PRODUCT_BUILD_VENDOR_DLKM_IMAGE := false
|
||||
PRODUCT_BUILD_ODM_DLKM_IMAGE := false
|
||||
PRODUCT_BUILD_PRODUCT_IMAGE := false
|
||||
PRODUCT_BUILD_RAMDISK_IMAGE := false
|
||||
PRODUCT_BUILD_SYSTEM_IMAGE := true
|
||||
PRODUCT_BUILD_SYSTEM_EXT_IMAGE := false
|
||||
PRODUCT_BUILD_SYSTEM_OTHER_IMAGE := false
|
||||
PRODUCT_BUILD_USERDATA_IMAGE := false
|
||||
PRODUCT_BUILD_VENDOR_IMAGE := false
|
||||
|
||||
PRODUCT_SHIPPING_API_LEVEL := 29
|
||||
|
||||
# TODO(b/137033385): change this back to "all"
|
||||
PRODUCT_RESTRICT_VENDOR_FILES := owner
|
||||
|
||||
PRODUCT_NAME := generic_system_x86
|
||||
PRODUCT_DEVICE := mainline_x86
|
||||
PRODUCT_BRAND := generic
|
||||
45
target/product/generic_system_x86_64.mk
Normal file
45
target/product/generic_system_x86_64.mk
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
#
|
||||
# Copyright (C) 2019 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.
|
||||
#
|
||||
|
||||
#
|
||||
# All components inherited here go to system image
|
||||
#
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
|
||||
$(call enforce-product-packages-exist,)
|
||||
|
||||
# Enable mainline checking
|
||||
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := true
|
||||
|
||||
PRODUCT_BUILD_CACHE_IMAGE := false
|
||||
PRODUCT_BUILD_ODM_IMAGE := false
|
||||
PRODUCT_BUILD_VENDOR_DLKM_IMAGE := false
|
||||
PRODUCT_BUILD_ODM_DLKM_IMAGE := false
|
||||
PRODUCT_BUILD_PRODUCT_IMAGE := false
|
||||
PRODUCT_BUILD_RAMDISK_IMAGE := false
|
||||
PRODUCT_BUILD_SYSTEM_IMAGE := true
|
||||
PRODUCT_BUILD_SYSTEM_EXT_IMAGE := false
|
||||
PRODUCT_BUILD_SYSTEM_OTHER_IMAGE := false
|
||||
PRODUCT_BUILD_USERDATA_IMAGE := false
|
||||
PRODUCT_BUILD_VENDOR_IMAGE := false
|
||||
|
||||
PRODUCT_SHIPPING_API_LEVEL := 29
|
||||
|
||||
PRODUCT_RESTRICT_VENDOR_FILES := all
|
||||
|
||||
PRODUCT_NAME := generic_system_x86_64
|
||||
PRODUCT_DEVICE := mainline_x86_64
|
||||
PRODUCT_BRAND := generic
|
||||
45
target/product/generic_system_x86_arm.mk
Normal file
45
target/product/generic_system_x86_arm.mk
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
#
|
||||
# Copyright (C) 2019 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.
|
||||
#
|
||||
|
||||
#
|
||||
# All components inherited here go to system image
|
||||
#
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
|
||||
$(call enforce-product-packages-exist,)
|
||||
|
||||
# Enable mainline checking
|
||||
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := true
|
||||
|
||||
PRODUCT_BUILD_CACHE_IMAGE := false
|
||||
PRODUCT_BUILD_ODM_IMAGE := false
|
||||
PRODUCT_BUILD_VENDOR_DLKM_IMAGE := false
|
||||
PRODUCT_BUILD_ODM_DLKM_IMAGE := false
|
||||
PRODUCT_BUILD_PRODUCT_IMAGE := false
|
||||
PRODUCT_BUILD_RAMDISK_IMAGE := false
|
||||
PRODUCT_BUILD_SYSTEM_IMAGE := true
|
||||
PRODUCT_BUILD_SYSTEM_EXT_IMAGE := false
|
||||
PRODUCT_BUILD_SYSTEM_OTHER_IMAGE := false
|
||||
PRODUCT_BUILD_USERDATA_IMAGE := false
|
||||
PRODUCT_BUILD_VENDOR_IMAGE := false
|
||||
|
||||
PRODUCT_SHIPPING_API_LEVEL := 29
|
||||
|
||||
# TODO(b/137033385): change this back to "all"
|
||||
PRODUCT_RESTRICT_VENDOR_FILES := owner
|
||||
|
||||
PRODUCT_NAME := generic_system_x86_arm
|
||||
PRODUCT_DEVICE := mainline_x86_arm
|
||||
PRODUCT_BRAND := generic
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
# All components inherited here go to system image
|
||||
#
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
|
||||
|
||||
# Enable mainline checking
|
||||
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
|
||||
|
|
|
|||
|
|
@ -1,151 +0,0 @@
|
|||
#
|
||||
# Copyright (C) 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.
|
||||
#
|
||||
|
||||
# This makefile is the basis of a generic system image for a handheld device.
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_default.mk)
|
||||
# Add adb keys to debuggable AOSP builds (if they exist)
|
||||
$(call inherit-product-if-exists, vendor/google/security/adb/vendor_key.mk)
|
||||
|
||||
# Enable updating of APEXes
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
|
||||
|
||||
# Shared java libs
|
||||
PRODUCT_PACKAGES += \
|
||||
com.android.nfc_extras \
|
||||
|
||||
# Applications
|
||||
PRODUCT_PACKAGES += \
|
||||
LiveWallpapersPicker \
|
||||
PartnerBookmarksProvider \
|
||||
PresencePolling \
|
||||
RcsService \
|
||||
SafetyRegulatoryInfo \
|
||||
Stk \
|
||||
Tag \
|
||||
TimeZoneUpdater \
|
||||
|
||||
# Binaries
|
||||
PRODUCT_PACKAGES += llkd
|
||||
|
||||
# OTA support
|
||||
PRODUCT_PACKAGES += \
|
||||
recovery-refresh \
|
||||
update_engine \
|
||||
update_verifier \
|
||||
|
||||
# Wrapped net utils for /vendor access.
|
||||
PRODUCT_PACKAGES += netutils-wrapper-1.0
|
||||
|
||||
# Charger images
|
||||
PRODUCT_PACKAGES += charger_res_images
|
||||
|
||||
# system_other support
|
||||
PRODUCT_PACKAGES += \
|
||||
cppreopts.sh \
|
||||
otapreopt_script \
|
||||
|
||||
# Bluetooth libraries
|
||||
PRODUCT_PACKAGES += \
|
||||
audio.a2dp.default \
|
||||
audio.hearing_aid.default \
|
||||
|
||||
# For ringtones that rely on forward lock encryption
|
||||
PRODUCT_PACKAGES += libfwdlockengine
|
||||
|
||||
# System libraries commonly depended on by things on the system_ext or product partitions.
|
||||
# These lists will be pruned periodically.
|
||||
PRODUCT_PACKAGES += \
|
||||
android.hardware.biometrics.fingerprint@2.1 \
|
||||
android.hardware.radio@1.0 \
|
||||
android.hardware.radio@1.1 \
|
||||
android.hardware.radio@1.2 \
|
||||
android.hardware.radio@1.3 \
|
||||
android.hardware.radio@1.4 \
|
||||
android.hardware.radio.config@1.0 \
|
||||
android.hardware.radio.deprecated@1.0 \
|
||||
android.hardware.secure_element@1.0 \
|
||||
android.hardware.wifi@1.0 \
|
||||
libaudio-resampler \
|
||||
libaudiohal \
|
||||
libdrm \
|
||||
liblogwrap \
|
||||
liblz4 \
|
||||
libminui \
|
||||
libnl \
|
||||
libprotobuf-cpp-full \
|
||||
|
||||
# These libraries are empty and have been combined into libhidlbase, but are still depended
|
||||
# on by things off /system.
|
||||
# TODO(b/135686713): remove these
|
||||
PRODUCT_PACKAGES += \
|
||||
libhidltransport \
|
||||
libhwbinder \
|
||||
|
||||
# Camera service uses 'libdepthphoto' for adding dynamic depth
|
||||
# metadata inside depth jpegs.
|
||||
PRODUCT_PACKAGES += \
|
||||
libdepthphoto \
|
||||
|
||||
PRODUCT_PACKAGES_DEBUG += \
|
||||
avbctl \
|
||||
bootctl \
|
||||
tinycap \
|
||||
tinyhostless \
|
||||
tinymix \
|
||||
tinypcminfo \
|
||||
tinyplay \
|
||||
update_engine_client \
|
||||
|
||||
PRODUCT_HOST_PACKAGES += \
|
||||
tinyplay
|
||||
|
||||
# Include all zygote init scripts. "ro.zygote" will select one of them.
|
||||
PRODUCT_COPY_FILES += \
|
||||
system/core/rootdir/init.zygote32.rc:system/etc/init/hw/init.zygote32.rc \
|
||||
system/core/rootdir/init.zygote64.rc:system/etc/init/hw/init.zygote64.rc \
|
||||
system/core/rootdir/init.zygote64_32.rc:system/etc/init/hw/init.zygote64_32.rc \
|
||||
|
||||
# Enable dynamic partition size
|
||||
PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true
|
||||
|
||||
PRODUCT_ENFORCE_RRO_TARGETS := *
|
||||
|
||||
# TODO(b/150820813) Settings depends on static overlay, remove this after eliminating the dependency.
|
||||
PRODUCT_ENFORCE_RRO_EXEMPTED_TARGETS := Settings
|
||||
|
||||
PRODUCT_NAME := mainline_system
|
||||
PRODUCT_BRAND := generic
|
||||
|
||||
# Define /system partition-specific product properties to identify that /system
|
||||
# partition is mainline_system.
|
||||
PRODUCT_SYSTEM_NAME := mainline
|
||||
PRODUCT_SYSTEM_BRAND := Android
|
||||
PRODUCT_SYSTEM_MANUFACTURER := Android
|
||||
PRODUCT_SYSTEM_MODEL := mainline
|
||||
PRODUCT_SYSTEM_DEVICE := generic
|
||||
|
||||
_base_mk_allowed_list :=
|
||||
|
||||
_my_allowed_list := $(_base_mk_allowed_list)
|
||||
|
||||
# For mainline, system.img should be mounted at /, so we include ROOT here.
|
||||
_my_paths := \
|
||||
$(TARGET_COPY_OUT_ROOT)/ \
|
||||
$(TARGET_COPY_OUT_SYSTEM)/ \
|
||||
|
||||
$(call require-artifacts-in-path, $(_my_paths), $(_my_allowed_list))
|
||||
1
target/product/mainline_system.mk
Symbolic link
1
target/product/mainline_system.mk
Symbolic link
|
|
@ -0,0 +1 @@
|
|||
generic_system.mk
|
||||
|
|
@ -14,33 +14,10 @@
|
|||
# limitations under the License.
|
||||
#
|
||||
|
||||
#
|
||||
# All components inherited here go to system image
|
||||
#
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
|
||||
$(call enforce-product-packages-exist,)
|
||||
# Do not modify this file. It's just alias of generic_system_arm64.mk
|
||||
# Will be removed when renaming from mainline_system to generic_system
|
||||
# complete
|
||||
|
||||
# Enable mainline checking
|
||||
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := true
|
||||
|
||||
PRODUCT_BUILD_CACHE_IMAGE := false
|
||||
PRODUCT_BUILD_ODM_IMAGE := false
|
||||
PRODUCT_BUILD_VENDOR_DLKM_IMAGE := false
|
||||
PRODUCT_BUILD_ODM_DLKM_IMAGE := false
|
||||
PRODUCT_BUILD_PRODUCT_IMAGE := false
|
||||
PRODUCT_BUILD_RAMDISK_IMAGE := false
|
||||
PRODUCT_BUILD_SYSTEM_IMAGE := true
|
||||
PRODUCT_BUILD_SYSTEM_EXT_IMAGE := false
|
||||
PRODUCT_BUILD_SYSTEM_OTHER_IMAGE := false
|
||||
PRODUCT_BUILD_USERDATA_IMAGE := false
|
||||
PRODUCT_BUILD_VENDOR_IMAGE := false
|
||||
|
||||
PRODUCT_SHIPPING_API_LEVEL := 29
|
||||
|
||||
# TODO(b/137033385): change this back to "all"
|
||||
PRODUCT_RESTRICT_VENDOR_FILES := owner
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system_arm64.mk)
|
||||
|
||||
PRODUCT_NAME := mainline_system_arm64
|
||||
PRODUCT_DEVICE := mainline_arm64
|
||||
PRODUCT_BRAND := generic
|
||||
|
|
|
|||
|
|
@ -14,32 +14,10 @@
|
|||
# limitations under the License.
|
||||
#
|
||||
|
||||
#
|
||||
# All components inherited here go to system image
|
||||
#
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
|
||||
$(call enforce-product-packages-exist,)
|
||||
# Do not modify this file. It's just alias of generic_system_x86.mk
|
||||
# Will be removed when renaming from mainline_system to generic_system
|
||||
# complete
|
||||
|
||||
# Enable mainline checking
|
||||
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := true
|
||||
|
||||
PRODUCT_BUILD_CACHE_IMAGE := false
|
||||
PRODUCT_BUILD_ODM_IMAGE := false
|
||||
PRODUCT_BUILD_VENDOR_DLKM_IMAGE := false
|
||||
PRODUCT_BUILD_ODM_DLKM_IMAGE := false
|
||||
PRODUCT_BUILD_PRODUCT_IMAGE := false
|
||||
PRODUCT_BUILD_RAMDISK_IMAGE := false
|
||||
PRODUCT_BUILD_SYSTEM_IMAGE := true
|
||||
PRODUCT_BUILD_SYSTEM_EXT_IMAGE := false
|
||||
PRODUCT_BUILD_SYSTEM_OTHER_IMAGE := false
|
||||
PRODUCT_BUILD_USERDATA_IMAGE := false
|
||||
PRODUCT_BUILD_VENDOR_IMAGE := false
|
||||
|
||||
PRODUCT_SHIPPING_API_LEVEL := 29
|
||||
|
||||
# TODO(b/137033385): change this back to "all"
|
||||
PRODUCT_RESTRICT_VENDOR_FILES := owner
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system_x86.mk)
|
||||
|
||||
PRODUCT_NAME := mainline_system_x86
|
||||
PRODUCT_DEVICE := mainline_x86
|
||||
PRODUCT_BRAND := generic
|
||||
|
|
|
|||
|
|
@ -14,32 +14,10 @@
|
|||
# limitations under the License.
|
||||
#
|
||||
|
||||
#
|
||||
# All components inherited here go to system image
|
||||
#
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
|
||||
$(call enforce-product-packages-exist,)
|
||||
# Do not modify this file. It's just alias of generic_system_x86_64.mk
|
||||
# Will be removed when renaming from mainline_system to generic_system
|
||||
# complete
|
||||
|
||||
# Enable mainline checking
|
||||
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := true
|
||||
|
||||
PRODUCT_BUILD_CACHE_IMAGE := false
|
||||
PRODUCT_BUILD_ODM_IMAGE := false
|
||||
PRODUCT_BUILD_VENDOR_DLKM_IMAGE := false
|
||||
PRODUCT_BUILD_ODM_DLKM_IMAGE := false
|
||||
PRODUCT_BUILD_PRODUCT_IMAGE := false
|
||||
PRODUCT_BUILD_RAMDISK_IMAGE := false
|
||||
PRODUCT_BUILD_SYSTEM_IMAGE := true
|
||||
PRODUCT_BUILD_SYSTEM_EXT_IMAGE := false
|
||||
PRODUCT_BUILD_SYSTEM_OTHER_IMAGE := false
|
||||
PRODUCT_BUILD_USERDATA_IMAGE := false
|
||||
PRODUCT_BUILD_VENDOR_IMAGE := false
|
||||
|
||||
PRODUCT_SHIPPING_API_LEVEL := 29
|
||||
|
||||
PRODUCT_RESTRICT_VENDOR_FILES := all
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system_x86_64.mk)
|
||||
|
||||
PRODUCT_NAME := mainline_system_x86_64
|
||||
PRODUCT_DEVICE := mainline_x86_64
|
||||
PRODUCT_BRAND := generic
|
||||
|
|
|
|||
|
|
@ -14,32 +14,10 @@
|
|||
# limitations under the License.
|
||||
#
|
||||
|
||||
#
|
||||
# All components inherited here go to system image
|
||||
#
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
|
||||
$(call enforce-product-packages-exist,)
|
||||
# Do not modify this file. It's just alias of generic_system_x86_arm.mk
|
||||
# Will be removed when renaming from mainline_system to generic_system
|
||||
# complete
|
||||
|
||||
# Enable mainline checking
|
||||
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := true
|
||||
|
||||
PRODUCT_BUILD_CACHE_IMAGE := false
|
||||
PRODUCT_BUILD_ODM_IMAGE := false
|
||||
PRODUCT_BUILD_VENDOR_DLKM_IMAGE := false
|
||||
PRODUCT_BUILD_ODM_DLKM_IMAGE := false
|
||||
PRODUCT_BUILD_PRODUCT_IMAGE := false
|
||||
PRODUCT_BUILD_RAMDISK_IMAGE := false
|
||||
PRODUCT_BUILD_SYSTEM_IMAGE := true
|
||||
PRODUCT_BUILD_SYSTEM_EXT_IMAGE := false
|
||||
PRODUCT_BUILD_SYSTEM_OTHER_IMAGE := false
|
||||
PRODUCT_BUILD_USERDATA_IMAGE := false
|
||||
PRODUCT_BUILD_VENDOR_IMAGE := false
|
||||
|
||||
PRODUCT_SHIPPING_API_LEVEL := 29
|
||||
|
||||
# TODO(b/137033385): change this back to "all"
|
||||
PRODUCT_RESTRICT_VENDOR_FILES := owner
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system_x86_arm.mk)
|
||||
|
||||
PRODUCT_NAME := mainline_system_x86_arm
|
||||
PRODUCT_DEVICE := mainline_x86_arm
|
||||
PRODUCT_BRAND := generic
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ endif
|
|||
# All components inherited here go to system image
|
||||
#
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
|
||||
|
||||
#
|
||||
# All components inherited here go to system_ext image
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ endif
|
|||
#
|
||||
# All components inherited here go to system image
|
||||
#
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
|
||||
|
||||
#
|
||||
# All components inherited here go to system_ext image
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ PRODUCT_USE_DYNAMIC_PARTITIONS := true
|
|||
#
|
||||
# All components inherited here go to system image
|
||||
#
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
|
||||
|
||||
# Enable mainline checking for exact this product name
|
||||
ifeq (sdk_phone_x86,$(TARGET_PRODUCT))
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ PRODUCT_USE_DYNAMIC_PARTITIONS := true
|
|||
# All components inherited here go to system image
|
||||
#
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk)
|
||||
|
||||
# Enable mainline checking for exact this product name
|
||||
ifeq (sdk_phone_x86_64,$(TARGET_PRODUCT))
|
||||
|
|
|
|||
Loading…
Reference in a new issue