Merge "Create *_system_ext.mk for system_ext packages"
This commit is contained in:
commit
f7b16cad9d
11 changed files with 96 additions and 3 deletions
|
@ -17,5 +17,6 @@
|
|||
# This makefile is suitable to inherit by products that don't need to be split
|
||||
# up by partition.
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/base_system.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/base_system_ext.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/base_vendor.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/base_product.mk)
|
||||
|
|
18
target/product/base_system_ext.mk
Normal file
18
target/product/base_system_ext.mk
Normal file
|
@ -0,0 +1,18 @@
|
|||
#
|
||||
# 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.
|
||||
#
|
||||
|
||||
# Base modules and settings for the system_ext partition.
|
||||
PRODUCT_PACKAGES += \
|
|
@ -22,6 +22,7 @@
|
|||
# handheld_<x>.mk.
|
||||
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/media_system.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/media_system_ext.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/media_vendor.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/media_product.mk)
|
||||
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
# base_<x>.mk or media_<x>.mk.
|
||||
|
||||
$(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)
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
# This makefile contains the product partition contents for
|
||||
# a generic phone or tablet device. Only add something here if
|
||||
# it definitely doesn't belong on other types of devices (if it
|
||||
# does, use base_vendor.mk).
|
||||
# does, use base_product.mk).
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/media_product.mk)
|
||||
|
||||
# /product packages
|
||||
|
|
24
target/product/handheld_system_ext.mk
Normal file
24
target/product/handheld_system_ext.mk
Normal file
|
@ -0,0 +1,24 @@
|
|||
#
|
||||
# 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.
|
||||
#
|
||||
|
||||
# This makefile contains the system_ext partition contents for
|
||||
# a generic phone or tablet device. Only add something here if
|
||||
# it definitely doesn't belong on other types of devices (if it
|
||||
# does, use base_system_ext.mk).
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/media_system_ext.mk)
|
||||
|
||||
# /system_ext packages
|
||||
PRODUCT_PACKAGES += \
|
|
@ -16,11 +16,13 @@
|
|||
|
||||
# This makefile is intended to serve as a base for completely AOSP based
|
||||
# mainline devices, It contain the mainline system partition and sensible
|
||||
# defaults for the product and vendor partition.
|
||||
# defaults for the system_ext, product and vendor partitions.
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_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, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_vendor.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_product.mk)
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
# This makefile contains the product partition contents for
|
||||
# media-capable devices (non-wearables). Only add something here
|
||||
# if it definitely doesn't belong on wearables. Otherwise, choose
|
||||
# base_vendor.mk.
|
||||
# base_product.mk.
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/base_product.mk)
|
||||
|
||||
# /product packages
|
||||
|
|
24
target/product/media_system_ext.mk
Normal file
24
target/product/media_system_ext.mk
Normal file
|
@ -0,0 +1,24 @@
|
|||
#
|
||||
# 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.
|
||||
#
|
||||
|
||||
# This makefile contains the system_ext partition contents for
|
||||
# media-capable devices (non-wearables). Only add something here
|
||||
# if it definitely doesn't belong on wearables. Otherwise, choose
|
||||
# base_system_ext.mk.
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/base_system_ext.mk)
|
||||
|
||||
# /system_ext packages
|
||||
PRODUCT_PACKAGES += \
|
|
@ -16,5 +16,6 @@
|
|||
|
||||
# All modules for telephony
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_vendor.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_product.mk)
|
||||
|
|
21
target/product/telephony_system_ext.mk
Normal file
21
target/product/telephony_system_ext.mk
Normal file
|
@ -0,0 +1,21 @@
|
|||
#
|
||||
# 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.
|
||||
#
|
||||
|
||||
# This is the list of modules that are specific to products that have telephony
|
||||
# hardware, and install to the system_ext partition.
|
||||
|
||||
# /system_ext packages
|
||||
PRODUCT_PACKAGES += \
|
Loading…
Reference in a new issue