Merge "Split generic_no_telephony in two."
This commit is contained in:
Anton Hansson
Gerrit Code Review
@@ -14,100 +14,15 @@
|
|||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
#
|
#
|
||||||
|
|
||||||
# This is a generic phone product that isn't specialized for a specific device.
|
# This product is a generic phone or tablet, that doesn't have telephony.
|
||||||
# It includes the base Android platform.
|
#
|
||||||
|
# Note: Do not add any contents directly to this file. Choose either
|
||||||
|
# handheld_system or handheld_vendor depending on partition (also consider
|
||||||
|
# base_<x>.mk or media_<x>.mk.
|
||||||
|
|
||||||
PRODUCT_PACKAGES := \
|
$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system.mk)
|
||||||
audio.primary.default \
|
$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_vendor.mk)
|
||||||
BasicDreams \
|
|
||||||
BlockedNumberProvider \
|
|
||||||
Bluetooth \
|
|
||||||
BluetoothMidiService \
|
|
||||||
BookmarkProvider \
|
|
||||||
Browser2 \
|
|
||||||
BuiltInPrintService \
|
|
||||||
Calendar \
|
|
||||||
CalendarProvider \
|
|
||||||
Camera2 \
|
|
||||||
CaptivePortalLogin \
|
|
||||||
CertInstaller \
|
|
||||||
clatd \
|
|
||||||
clatd.conf \
|
|
||||||
Contacts \
|
|
||||||
DeskClock \
|
|
||||||
DocumentsUI \
|
|
||||||
DownloadProviderUi \
|
|
||||||
EasterEgg \
|
|
||||||
Email \
|
|
||||||
ExactCalculator \
|
|
||||||
ExternalStorageProvider \
|
|
||||||
FusedLocation \
|
|
||||||
Gallery2 \
|
|
||||||
Home \
|
|
||||||
InputDevices \
|
|
||||||
KeyChain \
|
|
||||||
LatinIME \
|
|
||||||
librs_jni \
|
|
||||||
local_time.default \
|
|
||||||
ManagedProvisioning \
|
|
||||||
MmsService \
|
|
||||||
MtpDocumentsProvider \
|
|
||||||
Music \
|
|
||||||
MusicFX \
|
|
||||||
NfcNci \
|
|
||||||
OneTimeInitializer \
|
|
||||||
PacProcessor \
|
|
||||||
power.default \
|
|
||||||
PrintRecommendationService \
|
|
||||||
PrintSpooler \
|
|
||||||
Provision \
|
|
||||||
ProxyHandler \
|
|
||||||
QuickSearchBox \
|
|
||||||
screenrecord \
|
|
||||||
SecureElement \
|
|
||||||
Settings \
|
|
||||||
SharedStorageBackup \
|
|
||||||
StorageManager \
|
|
||||||
SystemUI \
|
|
||||||
SysuiDarkThemeOverlay \
|
|
||||||
Telecom \
|
|
||||||
TelephonyProvider \
|
|
||||||
TeleService \
|
|
||||||
Traceur \
|
|
||||||
vibrator.default \
|
|
||||||
UserDictionaryProvider \
|
|
||||||
VpnDialogs \
|
|
||||||
vr \
|
|
||||||
WallpaperCropper \
|
|
||||||
|
|
||||||
|
|
||||||
PRODUCT_SYSTEM_SERVER_APPS += \
|
|
||||||
FusedLocation \
|
|
||||||
InputDevices \
|
|
||||||
KeyChain \
|
|
||||||
Telecom \
|
|
||||||
|
|
||||||
PRODUCT_COPY_FILES := \
|
|
||||||
frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf
|
|
||||||
|
|
||||||
PRODUCT_PROPERTY_OVERRIDES += \
|
|
||||||
ro.carrier=unknown \
|
|
||||||
ro.config.notification_sound=OnTheHunt.ogg \
|
|
||||||
ro.config.alarm_alert=Alarm_Classic.ogg
|
|
||||||
|
|
||||||
$(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk)
|
|
||||||
$(call inherit-product-if-exists, external/google-fonts/dancing-script/fonts.mk)
|
|
||||||
$(call inherit-product-if-exists, external/google-fonts/carrois-gothic-sc/fonts.mk)
|
|
||||||
$(call inherit-product-if-exists, external/google-fonts/coming-soon/fonts.mk)
|
|
||||||
$(call inherit-product-if-exists, external/google-fonts/cutive-mono/fonts.mk)
|
|
||||||
$(call inherit-product-if-exists, external/noto-fonts/fonts.mk)
|
|
||||||
$(call inherit-product-if-exists, external/roboto-fonts/fonts.mk)
|
|
||||||
$(call inherit-product-if-exists, external/hyphenation-patterns/patterns.mk)
|
|
||||||
$(call inherit-product-if-exists, frameworks/base/data/keyboards/keyboards.mk)
|
|
||||||
$(call inherit-product-if-exists, frameworks/webview/chromium/chromium.mk)
|
|
||||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_minimal.mk)
|
|
||||||
|
|
||||||
# Overrides
|
|
||||||
PRODUCT_BRAND := generic
|
PRODUCT_BRAND := generic
|
||||||
PRODUCT_DEVICE := generic
|
PRODUCT_DEVICE := generic
|
||||||
PRODUCT_NAME := generic_no_telephony
|
PRODUCT_NAME := generic_no_telephony
|
||||||
|
|||||||
104
target/product/handheld_system.mk
Normal file
104
target/product/handheld_system.mk
Normal file
@@ -0,0 +1,104 @@
|
|||||||
|
#
|
||||||
|
# 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 contains the system 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).
|
||||||
|
$(call inherit-product, $(SRC_TARGET_DIR)/product/media_system.mk)
|
||||||
|
$(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk)
|
||||||
|
$(call inherit-product-if-exists, external/google-fonts/dancing-script/fonts.mk)
|
||||||
|
$(call inherit-product-if-exists, external/google-fonts/carrois-gothic-sc/fonts.mk)
|
||||||
|
$(call inherit-product-if-exists, external/google-fonts/coming-soon/fonts.mk)
|
||||||
|
$(call inherit-product-if-exists, external/google-fonts/cutive-mono/fonts.mk)
|
||||||
|
$(call inherit-product-if-exists, external/noto-fonts/fonts.mk)
|
||||||
|
$(call inherit-product-if-exists, external/roboto-fonts/fonts.mk)
|
||||||
|
$(call inherit-product-if-exists, external/hyphenation-patterns/patterns.mk)
|
||||||
|
$(call inherit-product-if-exists, frameworks/base/data/keyboards/keyboards.mk)
|
||||||
|
$(call inherit-product-if-exists, frameworks/webview/chromium/chromium.mk)
|
||||||
|
|
||||||
|
PRODUCT_PACKAGES += \
|
||||||
|
BasicDreams \
|
||||||
|
BlockedNumberProvider \
|
||||||
|
Bluetooth \
|
||||||
|
BluetoothMidiService \
|
||||||
|
BookmarkProvider \
|
||||||
|
Browser2 \
|
||||||
|
BuiltInPrintService \
|
||||||
|
Calendar \
|
||||||
|
CalendarProvider \
|
||||||
|
Camera2 \
|
||||||
|
CaptivePortalLogin \
|
||||||
|
CertInstaller \
|
||||||
|
clatd \
|
||||||
|
clatd.conf \
|
||||||
|
Contacts \
|
||||||
|
DeskClock \
|
||||||
|
DocumentsUI \
|
||||||
|
DownloadProviderUi \
|
||||||
|
EasterEgg \
|
||||||
|
Email \
|
||||||
|
ExactCalculator \
|
||||||
|
ExternalStorageProvider \
|
||||||
|
FusedLocation \
|
||||||
|
Gallery2 \
|
||||||
|
Home \
|
||||||
|
InputDevices \
|
||||||
|
KeyChain \
|
||||||
|
LatinIME \
|
||||||
|
librs_jni \
|
||||||
|
ManagedProvisioning \
|
||||||
|
MmsService \
|
||||||
|
MtpDocumentsProvider \
|
||||||
|
Music \
|
||||||
|
MusicFX \
|
||||||
|
NfcNci \
|
||||||
|
OneTimeInitializer \
|
||||||
|
PacProcessor \
|
||||||
|
PrintRecommendationService \
|
||||||
|
PrintSpooler \
|
||||||
|
Provision \
|
||||||
|
ProxyHandler \
|
||||||
|
QuickSearchBox \
|
||||||
|
screenrecord \
|
||||||
|
SecureElement \
|
||||||
|
Settings \
|
||||||
|
SharedStorageBackup \
|
||||||
|
StorageManager \
|
||||||
|
SystemUI \
|
||||||
|
Telecom \
|
||||||
|
TelephonyProvider \
|
||||||
|
TeleService \
|
||||||
|
Traceur \
|
||||||
|
UserDictionaryProvider \
|
||||||
|
VpnDialogs \
|
||||||
|
vr \
|
||||||
|
WallpaperCropper \
|
||||||
|
|
||||||
|
|
||||||
|
PRODUCT_SYSTEM_SERVER_APPS += \
|
||||||
|
FusedLocation \
|
||||||
|
InputDevices \
|
||||||
|
KeyChain \
|
||||||
|
Telecom \
|
||||||
|
|
||||||
|
PRODUCT_COPY_FILES += \
|
||||||
|
frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf
|
||||||
|
|
||||||
|
PRODUCT_PROPERTY_OVERRIDES += \
|
||||||
|
ro.carrier=unknown \
|
||||||
|
ro.config.notification_sound=OnTheHunt.ogg \
|
||||||
|
ro.config.alarm_alert=Alarm_Classic.ogg
|
||||||
27
target/product/handheld_vendor.mk
Normal file
27
target/product/handheld_vendor.mk
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
#
|
||||||
|
# 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 contains the non-system 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).
|
||||||
|
$(call inherit-product, $(SRC_TARGET_DIR)/product/media_vendor.mk)
|
||||||
|
PRODUCT_PACKAGES += \
|
||||||
|
audio.primary.default \
|
||||||
|
local_time.default \
|
||||||
|
power.default \
|
||||||
|
SysuiDarkThemeOverlay \
|
||||||
|
vibrator.default \
|
||||||
@@ -15,7 +15,7 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
# TODO(hansson): change inheritance to generic_no_telephony
|
# TODO(hansson): change inheritance to generic_no_telephony
|
||||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/media_system.mk)
|
$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system.mk)
|
||||||
|
|
||||||
PRODUCT_NAME := mainline_system
|
PRODUCT_NAME := mainline_system
|
||||||
PRODUCT_BRAND := generic
|
PRODUCT_BRAND := generic
|
||||||
|
|||||||
Reference in New Issue
Block a user