Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80508409 authored by Justin Yun's avatar Justin Yun Committed by android-build-merger
Browse files

Merge "Create *_system_ext.mk for system_ext packages" 

am: f7b16cad

Change-Id: Iba9ced502aeaa3fff836eaf2f32bf2ce1ee36284
parents 1c274567 f7b16cad

target/product/base.mk

+1 −0
Original line number Diff line number Diff line
@@ -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)

target/product/base_system_ext.mk

0 → 100644
+18 −0
Original line number Diff line number Diff line 
#

# 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 += \

target/product/core_minimal.mk

+1 −0
Original line number Diff line number Diff line
@@ -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)

target/product/generic_no_telephony.mk

+1 −0
Original line number Diff line number Diff line
@@ -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)

target/product/handheld_product.mk

+1 −1
Original line number Diff line number Diff line
@@ -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