summaryrefslogtreecommitdiffstats
path: root/target/product
diff options
context:
space:
mode:
Diffstat (limited to 'target/product')
-rw-r--r--target/product/base.mk9
-rw-r--r--target/product/core_minimal.mk14
-rw-r--r--target/product/core_tiny.mk7
-rw-r--r--target/product/embedded.mk2
-rw-r--r--target/product/emulator.mk5
-rw-r--r--target/product/generic_no_telephony.mk4
-rw-r--r--target/product/languages_full.mk2
-rw-r--r--target/product/sdk_base.mk4
-rw-r--r--target/product/telephony.mk2
-rw-r--r--target/product/vboot.mk24
-rw-r--r--target/product/verity.mk1
11 files changed, 62 insertions, 12 deletions
diff --git a/target/product/base.mk b/target/product/base.mk
index 85c01a2..1699156 100644
--- a/target/product/base.mk
+++ b/target/product/base.mk
@@ -18,6 +18,7 @@
PRODUCT_PACKAGES += \
20-dns.conf \
95-configured \
+ org.apache.http.legacy.boot \
appwidget \
appops \
am \
@@ -35,6 +36,7 @@ PRODUCT_PACKAGES += \
dpm \
framework \
fsck_msdos \
+ hid \
ime \
input \
javax.obex \
@@ -65,12 +67,16 @@ PRODUCT_PACKAGES += \
libnetlink \
libnetutils \
libpdfium \
+ libradio \
+ libradioservice \
+ libradio_metadata \
libreference-ril \
libreverbwrapper \
libril \
librtp_jni \
libsensorservice \
libskia \
+ libsonic \
libsonivox \
libsoundpool \
libsoundtrigger \
@@ -107,8 +113,11 @@ PRODUCT_PACKAGES += \
sdcard \
services \
settings \
+ sgdisk \
+ sm \
svc \
tc \
+ telecom \
vdc \
vold \
wm
diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index 33b49a6..27c10af 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -30,6 +30,7 @@ PRODUCT_PACKAGES += \
PackageInstaller \
SettingsProvider \
Shell \
+ StatementService \
bcc \
bu \
com.android.future.usb.accessory \
@@ -49,6 +50,7 @@ PRODUCT_PACKAGES += \
ip-up-vpn \
ip6tables \
iptables \
+ gatekeeperd \
keystore \
keystore.default \
ld.mc \
@@ -60,13 +62,13 @@ PRODUCT_PACKAGES += \
libdrmframework_jni \
libfilterfw \
libkeystore \
+ libgatekeeper \
libsqlite_jni \
libwilhelm \
logd \
make_ext4fs \
e2fsck \
resize2fs \
- mms-common \
screencap \
sensorservice \
telephony-common \
@@ -91,9 +93,8 @@ PRODUCT_BOOT_JARS := \
telephony-common \
voip-common \
ims-common \
- mms-common \
- android.policy \
apache-xml \
+ org.apache.http.legacy.boot
# The order of PRODUCT_SYSTEM_SERVER_JARS matters.
PRODUCT_SYSTEM_SERVER_JARS := \
@@ -101,6 +102,13 @@ PRODUCT_SYSTEM_SERVER_JARS := \
ethernet-service \
wifi-service
+# Adoptable external storage supports both ext4 and f2fs
+PRODUCT_PACKAGES += \
+ e2fsck \
+ make_ext4fs \
+ fsck.f2fs \
+ make_f2fs \
+
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
ro.zygote=zygote32
PRODUCT_COPY_FILES += \
diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk
index 39789d9..0a92275 100644
--- a/target/product/core_tiny.mk
+++ b/target/product/core_tiny.mk
@@ -54,12 +54,14 @@ PRODUCT_PACKAGES += \
ip-up-vpn \
ip6tables \
iptables \
+ gatekeeperd \
keystore \
keystore.default \
libOpenMAXAL \
libOpenSLES \
libdownmix \
libfilterfw \
+ libgatekeeper \
libkeystore \
libsqlite_jni \
libwilhelm \
@@ -76,7 +78,6 @@ PRODUCT_PACKAGES += \
telephony-common \
voip-common \
logd \
- mms-common \
wifi-service
# The order matters
@@ -91,10 +92,9 @@ PRODUCT_BOOT_JARS := \
telephony-common \
voip-common \
ims-common \
- mms-common \
- android.policy \
apache-xml \
nullwebview \
+ org.apache.http.legacy.boot
# The order of PRODUCT_SYSTEM_SERVER_JARS matters.
PRODUCT_SYSTEM_SERVER_JARS := \
@@ -112,6 +112,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
$(call inherit-product, $(SRC_TARGET_DIR)/product/runtime_libart.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk)
$(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk)
+$(call inherit-product-if-exists, external/roboto-fonts/fonts.mk)
# Overrides
PRODUCT_BRAND := tiny
diff --git a/target/product/embedded.mk b/target/product/embedded.mk
index a408860..c40de4f 100644
--- a/target/product/embedded.mk
+++ b/target/product/embedded.mk
@@ -52,7 +52,6 @@ PRODUCT_PACKAGES += \
libpower \
libsigchain \
libstdc++ \
- libstlport \
libsurfaceflinger \
libsurfaceflinger_ddmconnection \
libsysutils \
@@ -71,6 +70,7 @@ PRODUCT_PACKAGES += \
surfaceflinger \
toolbox \
toybox \
+ tzdatacheck \
# SELinux packages
PRODUCT_PACKAGES += \
diff --git a/target/product/emulator.mk b/target/product/emulator.mk
index 3a8a4aa..982f7da 100644
--- a/target/product/emulator.mk
+++ b/target/product/emulator.mk
@@ -40,14 +40,15 @@ PRODUCT_PACKAGES += \
camera.goldfish.jpeg \
lights.goldfish \
gps.goldfish \
+ fingerprint.goldfish \
sensors.goldfish \
- e2fsck \
audio.primary.goldfish \
vibrator.goldfish \
power.goldfish \
+ fingerprint.ranchu \
+ fingerprintd \
sensors.ranchu
-
PRODUCT_COPY_FILES += \
device/generic/goldfish/fstab.goldfish:root/fstab.goldfish \
device/generic/goldfish/init.goldfish.rc:root/init.goldfish.rc \
diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk
index dd18fab..f6ccd2a 100644
--- a/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@ -19,6 +19,7 @@
PRODUCT_PACKAGES := \
Bluetooth \
+ BluetoothMidiService \
Camera2 \
Gallery2 \
Music \
@@ -60,9 +61,10 @@ $(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/lohit-fonts/fonts.mk)
$(call inherit-product-if-exists, external/noto-fonts/fonts.mk)
$(call inherit-product-if-exists, external/naver-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.mk)
diff --git a/target/product/languages_full.mk b/target/product/languages_full.mk
index 6d77cde..9d80b0e 100644
--- a/target/product/languages_full.mk
+++ b/target/product/languages_full.mk
@@ -21,4 +21,4 @@
# These are all the locales that have translations and are displayable
# by TextView in this branch.
-PRODUCT_LOCALES := en_US en_AU en_IN fr_FR it_IT es_ES et_EE de_DE nl_NL cs_CZ pl_PL ja_JP zh_TW zh_CN zh_HK ru_RU ko_KR nb_NO es_US da_DK el_GR tr_TR pt_PT pt_BR rm_CH sv_SE bg_BG ca_ES en_GB fi_FI hi_IN hr_HR hu_HU in_ID iw_IL lt_LT lv_LV ro_RO sk_SK sl_SI sr_RS uk_UA vi_VN tl_PH ar_EG fa_IR th_TH sw_TZ ms_MY af_ZA zu_ZA am_ET hi_IN en_XA ar_XB fr_CA km_KH lo_LA ne_NP si_LK mn_MN hy_AM az_AZ ka_GE my_MM mr_IN ml_IN is_IS mk_MK ky_KG eu_ES gl_ES bn_BD ta_IN kn_IN te_IN uz_UZ ur_PK kk_KZ
+PRODUCT_LOCALES := en_US en_AU en_IN fr_FR it_IT es_ES et_EE de_DE nl_NL cs_CZ pl_PL ja_JP zh_TW zh_CN zh_HK ru_RU ko_KR nb_NO es_US da_DK el_GR tr_TR pt_PT pt_BR rm_CH sv_SE bg_BG ca_ES en_GB fi_FI hi_IN hr_HR hu_HU in_ID iw_IL lt_LT lv_LV ro_RO sk_SK sl_SI sr_RS uk_UA vi_VN tl_PH ar_EG fa_IR th_TH sw_TZ ms_MY af_ZA zu_ZA am_ET hi_IN en_XA ar_XB fr_CA km_KH lo_LA ne_NP si_LK mn_MN hy_AM az_AZ ka_GE my_MM mr_IN ml_IN is_IS mk_MK ky_KG eu_ES gl_ES bn_BD ta_IN kn_IN te_IN uz_UZ ur_PK kk_KZ sq_AL gu_IN pa_IN
diff --git a/target/product/sdk_base.mk b/target/product/sdk_base.mk
index 451c0b7..73c2524 100644
--- a/target/product/sdk_base.mk
+++ b/target/product/sdk_base.mk
@@ -27,6 +27,7 @@ PRODUCT_PACKAGES := \
Fallback \
Gallery \
GestureBuilder \
+ Launcher3 \
LegacyCamera \
librs_jni \
libwnndict \
@@ -62,7 +63,7 @@ PRODUCT_COPY_FILES := \
device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \
frameworks/base/data/sounds/effects/camera_click.ogg:system/media/audio/ui/camera_click.ogg \
frameworks/base/data/sounds/effects/VideoRecord.ogg:system/media/audio/ui/VideoRecord.ogg \
- frameworks/native/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \
+ device/generic/goldfish/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \
device/generic/goldfish/camera/media_profiles.xml:system/etc/media_profiles.xml \
frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \
frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \
@@ -83,6 +84,7 @@ $(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/naver-fonts/fonts.mk)
+$(call inherit-product-if-exists, external/roboto-fonts/fonts.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.mk)
diff --git a/target/product/telephony.mk b/target/product/telephony.mk
index da1497d..084f86c 100644
--- a/target/product/telephony.mk
+++ b/target/product/telephony.mk
@@ -18,7 +18,9 @@
# to products that have telephony hardware.
PRODUCT_PACKAGES := \
+ CarrierConfig \
Dialer \
+ CallLogBackup \
Mms \
rild
diff --git a/target/product/vboot.mk b/target/product/vboot.mk
new file mode 100644
index 0000000..e4b1144
--- /dev/null
+++ b/target/product/vboot.mk
@@ -0,0 +1,24 @@
+#
+# Copyright (C) 2015 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.
+#
+
+# Provides dependencies necessary for verified boot
+
+PRODUCT_SUPPORTS_VBOOT := true
+
+# The dev key is used to sign boot and recovery images.
+# We expect this file to exist with the suffixes ".vbprivk" and ".vbpupk".
+# TODO: find a proper location for this
+PRODUCT_VBOOT_SIGNING_KEY := external/vboot_reference/tests/devkeys/kernel_data_key
diff --git a/target/product/verity.mk b/target/product/verity.mk
index 0361b64..3e00b49 100644
--- a/target/product/verity.mk
+++ b/target/product/verity.mk
@@ -16,6 +16,7 @@
# Provides dependencies necessary for verified boot
+PRODUCT_SUPPORTS_BOOT_SIGNER := true
PRODUCT_SUPPORTS_VERITY := true
# The dev key is used to sign boot and recovery images, and the verity