aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot2019-01-16 09:18:37 -0600
committerGerrit Code Review2019-01-16 09:18:37 -0600
commit0735b4f9fecefafa9a1653e8db8123626571d879 (patch)
treeda7c6e17d59380dc9f574d9e0b61cabf247604fe
parente7f127491ac7841d882a2ff83710147a79dc1dcb (diff)
parentcaa5e88d4ac34215222c2a4f7bafbdba714bb7f7 (diff)
downloadplatform-build-0735b4f9fecefafa9a1653e8db8123626571d879.tar.gz
platform-build-0735b4f9fecefafa9a1653e8db8123626571d879.tar.xz
platform-build-0735b4f9fecefafa9a1653e8db8123626571d879.zip
Merge "Split *_product makefiles"HEADmaster
-rw-r--r--target/product/base.mk1
-rw-r--r--target/product/base_product.mk19
-rw-r--r--target/product/base_vendor.mk4
-rw-r--r--target/product/core_minimal.mk5
-rw-r--r--target/product/full_base_telephony.mk3
-rw-r--r--target/product/generic.mk3
-rw-r--r--target/product/generic_no_telephony.mk1
-rw-r--r--target/product/handheld_product.mk43
-rw-r--r--target/product/handheld_vendor.mk22
-rw-r--r--target/product/mainline.mk2
-rw-r--r--target/product/mainline_arm64.mk4
-rw-r--r--target/product/media_product.mk25
-rw-r--r--target/product/media_vendor.mk4
-rw-r--r--target/product/telephony.mk20
-rw-r--r--target/product/telephony_product.mk23
-rw-r--r--target/product/telephony_vendor.mk5
-rw-r--r--target/product/treble_common.mk3
17 files changed, 144 insertions, 43 deletions
diff --git a/target/product/base.mk b/target/product/base.mk
index 1ecbf4a01..804a2ee6b 100644
--- a/target/product/base.mk
+++ b/target/product/base.mk
@@ -18,3 +18,4 @@
18# up by partition. 18# up by partition.
19$(call inherit-product, $(SRC_TARGET_DIR)/product/base_system.mk) 19$(call inherit-product, $(SRC_TARGET_DIR)/product/base_system.mk)
20$(call inherit-product, $(SRC_TARGET_DIR)/product/base_vendor.mk) 20$(call inherit-product, $(SRC_TARGET_DIR)/product/base_vendor.mk)
21$(call inherit-product, $(SRC_TARGET_DIR)/product/base_product.mk)
diff --git a/target/product/base_product.mk b/target/product/base_product.mk
new file mode 100644
index 000000000..653130468
--- /dev/null
+++ b/target/product/base_product.mk
@@ -0,0 +1,19 @@
1#
2# Copyright (C) 2019 The Android Open Source Project
3#
4# Licensed under the Apache License, Version 2.0 (the "License");
5# you may not use this file except in compliance with the License.
6# You may obtain a copy of the License at
7#
8# http://www.apache.org/licenses/LICENSE-2.0
9#
10# Unless required by applicable law or agreed to in writing, software
11# distributed under the License is distributed on an "AS IS" BASIS,
12# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13# See the License for the specific language governing permissions and
14# limitations under the License.
15#
16
17# Base modules and settings for the product partition.
18PRODUCT_PACKAGES += \
19 healthd \
diff --git a/target/product/base_vendor.mk b/target/product/base_vendor.mk
index 1bb4beede..9bb45d158 100644
--- a/target/product/base_vendor.mk
+++ b/target/product/base_vendor.mk
@@ -53,10 +53,6 @@ PRODUCT_PACKAGES += \
53 vndservice \ 53 vndservice \
54 vndservicemanager \ 54 vndservicemanager \
55 55
56# Base modules and settings for the product partition.
57PRODUCT_PACKAGES += \
58 healthd \
59
60# VINTF data for vendor image 56# VINTF data for vendor image
61PRODUCT_PACKAGES += \ 57PRODUCT_PACKAGES += \
62 device_manifest.xml \ 58 device_manifest.xml \
diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index b432a91f1..9718dc6bf 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -18,11 +18,12 @@
18# means most android products, but excludes wearables. 18# means most android products, but excludes wearables.
19# 19#
20# Note: Do not add any contents directly to this file. Choose either 20# Note: Do not add any contents directly to this file. Choose either
21# media_system or media_vendor depending on partition (also consider 21# media_<x> depending on partition also consider base_<x>.mk or
22# base_<x>.mk or handheld_<x>.mk. 22# handheld_<x>.mk.
23 23
24$(call inherit-product, $(SRC_TARGET_DIR)/product/media_system.mk) 24$(call inherit-product, $(SRC_TARGET_DIR)/product/media_system.mk)
25$(call inherit-product, $(SRC_TARGET_DIR)/product/media_vendor.mk) 25$(call inherit-product, $(SRC_TARGET_DIR)/product/media_vendor.mk)
26$(call inherit-product, $(SRC_TARGET_DIR)/product/media_product.mk)
26 27
27PRODUCT_BRAND := generic 28PRODUCT_BRAND := generic
28PRODUCT_DEVICE := generic 29PRODUCT_DEVICE := generic
diff --git a/target/product/full_base_telephony.mk b/target/product/full_base_telephony.mk
index ee590903e..af4097d87 100644
--- a/target/product/full_base_telephony.mk
+++ b/target/product/full_base_telephony.mk
@@ -28,5 +28,4 @@ PRODUCT_COPY_FILES := \
28 frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml 28 frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml
29 29
30$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk) 30$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk)
31$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system.mk) 31$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony.mk)
32$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_vendor.mk)
diff --git a/target/product/generic.mk b/target/product/generic.mk
index 7a9732d09..cc856f4f7 100644
--- a/target/product/generic.mk
+++ b/target/product/generic.mk
@@ -18,8 +18,7 @@
18# It includes the base Android platform. 18# It includes the base Android platform.
19 19
20$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_no_telephony.mk) 20$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_no_telephony.mk)
21$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system.mk) 21$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony.mk)
22$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_vendor.mk)
23 22
24# Overrides 23# Overrides
25PRODUCT_BRAND := generic 24PRODUCT_BRAND := generic
diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk
index 534647621..324d36f10 100644
--- a/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@ -22,6 +22,7 @@
22 22
23$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system.mk) 23$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system.mk)
24$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_vendor.mk) 24$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_vendor.mk)
25$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_product.mk)
25 26
26PRODUCT_BRAND := generic 27PRODUCT_BRAND := generic
27PRODUCT_DEVICE := generic 28PRODUCT_DEVICE := generic
diff --git a/target/product/handheld_product.mk b/target/product/handheld_product.mk
new file mode 100644
index 000000000..063b951d9
--- /dev/null
+++ b/target/product/handheld_product.mk
@@ -0,0 +1,43 @@
1#
2# Copyright (C) 2019 The Android Open Source Project
3#
4# Licensed under the Apache License, Version 2.0 (the "License");
5# you may not use this file except in compliance with the License.
6# You may obtain a copy of the License at
7#
8# http://www.apache.org/licenses/LICENSE-2.0
9#
10# Unless required by applicable law or agreed to in writing, software
11# distributed under the License is distributed on an "AS IS" BASIS,
12# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13# See the License for the specific language governing permissions and
14# limitations under the License.
15#
16
17# This makefile contains the product partition contents for
18# a generic phone or tablet device. Only add something here if
19# it definitely doesn't belong on other types of devices (if it
20# does, use base_vendor.mk).
21$(call inherit-product, $(SRC_TARGET_DIR)/product/media_product.mk)
22
23# /product packages
24PRODUCT_PACKAGES += \
25 Browser2 \
26 Calendar \
27 Camera2 \
28 Contacts \
29 DeskClock \
30 Email \
31 Gallery2 \
32 LatinIME \
33 Launcher3QuickStep \
34 Music \
35 OneTimeInitializer \
36 PrintRecommendationService \
37 Provision \
38 QuickSearchBox \
39 Settings \
40 SettingsIntelligence \
41 StorageManager \
42 SystemUI \
43 WallpaperCropper \
diff --git a/target/product/handheld_vendor.mk b/target/product/handheld_vendor.mk
index b9970e9dd..ca7760a0f 100644
--- a/target/product/handheld_vendor.mk
+++ b/target/product/handheld_vendor.mk
@@ -30,25 +30,3 @@ PRODUCT_PACKAGES += \
30 power.default \ 30 power.default \
31 SysuiDarkThemeOverlay \ 31 SysuiDarkThemeOverlay \
32 vibrator.default \ 32 vibrator.default \
33
34# /product packages
35PRODUCT_PACKAGES += \
36 Browser2 \
37 Calendar \
38 Camera2 \
39 Contacts \
40 DeskClock \
41 Email \
42 Gallery2 \
43 LatinIME \
44 Launcher3QuickStep \
45 Music \
46 OneTimeInitializer \
47 PrintRecommendationService \
48 Provision \
49 QuickSearchBox \
50 Settings \
51 SettingsIntelligence \
52 StorageManager \
53 SystemUI \
54 WallpaperCropper \
diff --git a/target/product/mainline.mk b/target/product/mainline.mk
index 44dcd6083..59bad9838 100644
--- a/target/product/mainline.mk
+++ b/target/product/mainline.mk
@@ -18,4 +18,6 @@
18# for the other partitions. 18# for the other partitions.
19$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk) 19$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
20$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_vendor.mk) 20$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_vendor.mk)
21$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_product.mk)
21$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_vendor.mk) 22$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_vendor.mk)
23$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_product.mk)
diff --git a/target/product/mainline_arm64.mk b/target/product/mainline_arm64.mk
index 6122ac1d9..73748f258 100644
--- a/target/product/mainline_arm64.mk
+++ b/target/product/mainline_arm64.mk
@@ -37,6 +37,8 @@ PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \
37 system/app/Calendar/Calendar.apk \ 37 system/app/Calendar/Calendar.apk \
38 system/app/Camera2/Camera2.apk \ 38 system/app/Camera2/Camera2.apk \
39 system/app/DeskClock/DeskClock.apk \ 39 system/app/DeskClock/DeskClock.apk \
40 system/app/DeskClock/oat/arm64/DeskClock.odex \
41 system/app/DeskClock/oat/arm64/DeskClock.vdex \
40 system/app/Email/Email.apk \ 42 system/app/Email/Email.apk \
41 system/app/Gallery2/Gallery2.apk \ 43 system/app/Gallery2/Gallery2.apk \
42 system/app/LatinIME/LatinIME.apk \ 44 system/app/LatinIME/LatinIME.apk \
@@ -55,6 +57,8 @@ PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \
55 system/lib64/libjni_latinime.so \ 57 system/lib64/libjni_latinime.so \
56 system/lib64/libjni_tinyplanet.so \ 58 system/lib64/libjni_tinyplanet.so \
57 system/priv-app/CarrierConfig/CarrierConfig.apk \ 59 system/priv-app/CarrierConfig/CarrierConfig.apk \
60 system/priv-app/CarrierConfig/oat/arm64/CarrierConfig.odex \
61 system/priv-app/CarrierConfig/oat/arm64/CarrierConfig.vdex \
58 system/priv-app/Contacts/Contacts.apk \ 62 system/priv-app/Contacts/Contacts.apk \
59 system/priv-app/Dialer/Dialer.apk \ 63 system/priv-app/Dialer/Dialer.apk \
60 system/priv-app/Launcher3QuickStep/Launcher3QuickStep.apk \ 64 system/priv-app/Launcher3QuickStep/Launcher3QuickStep.apk \
diff --git a/target/product/media_product.mk b/target/product/media_product.mk
new file mode 100644
index 000000000..17c24eef1
--- /dev/null
+++ b/target/product/media_product.mk
@@ -0,0 +1,25 @@
1#
2# Copyright (C) 2019 The Android Open Source Project
3#
4# Licensed under the Apache License, Version 2.0 (the "License");
5# you may not use this file except in compliance with the License.
6# You may obtain a copy of the License at
7#
8# http://www.apache.org/licenses/LICENSE-2.0
9#
10# Unless required by applicable law or agreed to in writing, software
11# distributed under the License is distributed on an "AS IS" BASIS,
12# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13# See the License for the specific language governing permissions and
14# limitations under the License.
15#
16
17# This makefile contains the product partition contents for
18# media-capable devices (non-wearables). Only add something here
19# if it definitely doesn't belong on wearables. Otherwise, choose
20# base_vendor.mk.
21$(call inherit-product, $(SRC_TARGET_DIR)/product/base_product.mk)
22
23# /product packages
24PRODUCT_PACKAGES += \
25 webview \
diff --git a/target/product/media_vendor.mk b/target/product/media_vendor.mk
index f30e6f361..7d4af64bd 100644
--- a/target/product/media_vendor.mk
+++ b/target/product/media_vendor.mk
@@ -24,7 +24,3 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/base_vendor.mk)
24PRODUCT_PACKAGES += \ 24PRODUCT_PACKAGES += \
25 libaudiopreprocessing \ 25 libaudiopreprocessing \
26 libwebrtc_audio_preprocessing \ 26 libwebrtc_audio_preprocessing \
27
28# /product packages
29PRODUCT_PACKAGES += \
30 webview \
diff --git a/target/product/telephony.mk b/target/product/telephony.mk
new file mode 100644
index 000000000..e0eb15925
--- /dev/null
+++ b/target/product/telephony.mk
@@ -0,0 +1,20 @@
1#
2# Copyright (C) 2019 The Android Open Source Project
3#
4# Licensed under the Apache License, Version 2.0 (the "License");
5# you may not use this file except in compliance with the License.
6# You may obtain a copy of the License at
7#
8# http://www.apache.org/licenses/LICENSE-2.0
9#
10# Unless required by applicable law or agreed to in writing, software
11# distributed under the License is distributed on an "AS IS" BASIS,
12# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13# See the License for the specific language governing permissions and
14# limitations under the License.
15#
16
17# All modules for telephony
18$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system.mk)
19$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_vendor.mk)
20$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_product.mk)
diff --git a/target/product/telephony_product.mk b/target/product/telephony_product.mk
new file mode 100644
index 000000000..70d4828ea
--- /dev/null
+++ b/target/product/telephony_product.mk
@@ -0,0 +1,23 @@
1#
2# Copyright (C) 2019 The Android Open Source Project
3#
4# Licensed under the Apache License, Version 2.0 (the "License");
5# you may not use this file except in compliance with the License.
6# You may obtain a copy of the License at
7#
8# http://www.apache.org/licenses/LICENSE-2.0
9#
10# Unless required by applicable law or agreed to in writing, software
11# distributed under the License is distributed on an "AS IS" BASIS,
12# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13# See the License for the specific language governing permissions and
14# limitations under the License.
15#
16
17# This is the list of modules that are specific to products that have telephony
18# hardware, and install to the product partition.
19
20# /product packages
21PRODUCT_PACKAGES += \
22 CarrierConfig \
23 Dialer \
diff --git a/target/product/telephony_vendor.mk b/target/product/telephony_vendor.mk
index 4cff16dc8..86dbcc98a 100644
--- a/target/product/telephony_vendor.mk
+++ b/target/product/telephony_vendor.mk
@@ -21,9 +21,4 @@
21PRODUCT_PACKAGES := \ 21PRODUCT_PACKAGES := \
22 rild \ 22 rild \
23 23
24# /product packages
25PRODUCT_PACKAGES += \
26 CarrierConfig \
27 Dialer \
28
29PRODUCT_COPY_FILES := \ 24PRODUCT_COPY_FILES := \
diff --git a/target/product/treble_common.mk b/target/product/treble_common.mk
index 7642876af..7e4a98e98 100644
--- a/target/product/treble_common.mk
+++ b/target/product/treble_common.mk
@@ -21,8 +21,7 @@
21 21
22# Generic system image inherits from AOSP with telephony 22# Generic system image inherits from AOSP with telephony
23$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk) 23$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk)
24$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system.mk) 24$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony.mk)
25$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_vendor.mk)
26 25
27# Enable dynamic partition size 26# Enable dynamic partition size
28PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true 27PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true