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

Commit caa5e88d authored by SzuWei Lin's avatar SzuWei Lin
Browse files

Split *_product makefiles 

So far, we have *_system.mk and *_vendor.mk.
This patch split all product settings from *_vendor.mk to new
*_product.mk

This patch also create a new telephony.mk to include all
telephony_*.mk

Bug: 119747870
Test: lunch mainline_arm64-user; make -j
Test: compare the content with and without the patch
Test: the output files in out folder are the same
Change-Id: I79aefdd1971b3b5724a3ec858de4109b645c765a
Merged-In: I79aefdd1971b3b5724a3ec858de4109b645c765a
parent 546550e0

target/product/base.mk

+1 −0
Original line number Diff line number Diff line
@@ -18,3 +18,4 @@ 
# up by partition.

$(call inherit-product, $(SRC_TARGET_DIR)/product/base_system.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/base_vendor.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/base_product.mk)

target/product/base_product.mk

0 → 100644
+19 −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 product partition.

PRODUCT_PACKAGES += \

    healthd \

target/product/base_vendor.mk

+0 −4
Original line number Diff line number Diff line
@@ -53,10 +53,6 @@ PRODUCT_PACKAGES += \ 
    vndservice \

    vndservicemanager \



# Base modules and settings for the product partition.

PRODUCT_PACKAGES += \

    healthd \



# VINTF data for vendor image

PRODUCT_PACKAGES += \

    device_manifest.xml \

target/product/core_minimal.mk

+3 −2
Original line number Diff line number Diff line
@@ -18,11 +18,12 @@ 
# means most android products, but excludes wearables.

#

# Note: Do not add any contents directly to this file. Choose either

# media_system or media_vendor depending on partition (also consider

# base_<x>.mk or handheld_<x>.mk.

# media_<x> depending on partition also consider base_<x>.mk or

# handheld_<x>.mk.



$(call inherit-product, $(SRC_TARGET_DIR)/product/media_system.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/media_vendor.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/media_product.mk)



PRODUCT_BRAND := generic

PRODUCT_DEVICE := generic

target/product/full_base_telephony.mk

+1 −2
Original line number Diff line number Diff line
@@ -28,5 +28,4 @@ PRODUCT_COPY_FILES := \ 
    frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml



$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_vendor.mk)
 
$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony.mk)