summaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
Diffstat (limited to 'target')
-rw-r--r--target/product/AndroidProducts.mk14
-rw-r--r--target/product/base.mk2
-rw-r--r--target/product/core.mk7
-rw-r--r--target/product/generic_no_telephony.mk16
-rw-r--r--target/product/large_emu_hw.mk4
-rw-r--r--target/product/mini.mk30
-rw-r--r--target/product/sdk.mk3
7 files changed, 45 insertions, 31 deletions
diff --git a/target/product/AndroidProducts.mk b/target/product/AndroidProducts.mk
index 9279633..5206aa1 100644
--- a/target/product/AndroidProducts.mk
+++ b/target/product/AndroidProducts.mk
@@ -18,6 +18,12 @@
# This file should set PRODUCT_MAKEFILES to a list of product makefiles
# to expose to the build system. LOCAL_DIR will already be set to
# the directory containing this file.
+# PRODUCT_MAKEFILES is set up in AndroidProducts.mks.
+# Format of PRODUCT_MAKEFILES:
+# <product_name>:<path_to_the_product_makefile>
+# If the <product_name> is the same as the base file name (without dir
+# and the .mk suffix) of the product makefile, "<product_name>:" can be
+# omitted.
#
# This file may not rely on the value of any variable other than
# LOCAL_DIR; do not use any conditionals, and do not look up the
@@ -25,12 +31,12 @@
# it includes.
#
-# Unbundled apps will be built with the default product config.
+# Unbundled apps will be built with the most generic product config.
ifneq ($(TARGET_BUILD_APPS),)
PRODUCT_MAKEFILES := \
- $(LOCAL_DIR)/core.mk \
- $(LOCAL_DIR)/generic.mk \
- $(LOCAL_DIR)/full.mk
+ $(LOCAL_DIR)/full.mk \
+ $(LOCAL_DIR)/full_x86.mk \
+ $(LOCAL_DIR)/full_mips.mk
else
PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/core.mk \
diff --git a/target/product/base.mk b/target/product/base.mk
index afde9b5..9d8ef3f 100644
--- a/target/product/base.mk
+++ b/target/product/base.mk
@@ -106,6 +106,7 @@ PRODUCT_PACKAGES += \
libstlport \
libsurfaceflinger \
libsurfaceflinger_client \
+ libsurfaceflinger_ddmconnection \
libsystem_server \
libsysutils \
libthread_db \
@@ -137,6 +138,7 @@ PRODUCT_PACKAGES += \
service \
servicemanager \
services \
+ settings \
surfaceflinger \
svc \
system_server \
diff --git a/target/product/core.mk b/target/product/core.mk
index 87872d6..831298a 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -25,6 +25,7 @@ PRODUCT_PROPERTY_OVERRIDES := \
PRODUCT_PACKAGES += \
ApplicationsProvider \
BackupRestoreConfirmation \
+ BasicDreams \
Browser \
Contacts \
ContactsProvider \
@@ -36,12 +37,14 @@ PRODUCT_PACKAGES += \
KeyChain \
MediaProvider \
PackageInstaller \
+ PhotoTable \
PicoTts \
SettingsProvider \
SharedStorageBackup \
TelephonyProvider \
UserDictionaryProvider \
VpnDialogs \
+ abcc \
apache-xml \
atrace \
bouncycastle \
@@ -75,6 +78,7 @@ PRODUCT_PACKAGES += \
libOpenSLES \
libaudiopreprocessing \
libaudioutils \
+ libbcc \
libcrypto \
libdownmix \
libdvm \
@@ -91,10 +95,13 @@ PRODUCT_PACKAGES += \
libmdnssd \
libnativehelper \
libnfc_ndef \
+ libportable \
libpowermanager \
libspeexresampler \
libsqlite_jni \
libssl \
+ libstagefright \
+ libstagefright_chromium_http \
libstagefright_soft_aacdec \
libstagefright_soft_aacenc \
libstagefright_soft_amrdec \
diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk
index 049d7c0..f139cbd 100644
--- a/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@ -26,8 +26,9 @@ PRODUCT_PACKAGES := \
Calendar \
CertInstaller \
DrmProvider \
- Email \
+ Email2 \
Exchange2 \
+ FusedLocation \
Gallery2 \
InputDevices \
LatinIME \
@@ -46,14 +47,7 @@ PRODUCT_PACKAGES := \
PRODUCT_PACKAGES += \
audio \
- bluetoothd \
- brcm_patchram_plus \
dhcpcd.conf \
- hciattach \
- libbluedroid \
- libbluetooth \
- libbluetoothd \
- libglib \
network \
pand \
pppd \
@@ -81,11 +75,6 @@ PRODUCT_PACKAGES += \
local_time.default
PRODUCT_COPY_FILES := \
- system/bluetooth/data/audio.conf:system/etc/bluetooth/audio.conf \
- system/bluetooth/data/auto_pairing.conf:system/etc/bluetooth/auto_pairing.conf \
- system/bluetooth/data/blacklist.conf:system/etc/bluetooth/blacklist.conf \
- system/bluetooth/data/input.conf:system/etc/bluetooth/input.conf \
- system/bluetooth/data/network.conf:system/etc/bluetooth/network.conf \
frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf
PRODUCT_PROPERTY_OVERRIDES += \
@@ -94,6 +83,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
$(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk)
$(call inherit-product-if-exists, external/cibu-fonts/fonts.mk)
$(call inherit-product-if-exists, external/lohit-fonts/fonts.mk)
+$(call inherit-product-if-exists, external/naver-fonts/fonts.mk)
$(call inherit-product-if-exists, frameworks/base/data/keyboards/keyboards.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk)
diff --git a/target/product/large_emu_hw.mk b/target/product/large_emu_hw.mk
index 91a9e08..27ebc96 100644
--- a/target/product/large_emu_hw.mk
+++ b/target/product/large_emu_hw.mk
@@ -27,8 +27,8 @@ PRODUCT_PACKAGES := \
Calendar \
CertInstaller \
DrmProvider \
- Email \
- Exchange \
+ Email2 \
+ Exchange2 \
Gallery2 \
LatinIME \
Launcher2 \
diff --git a/target/product/mini.mk b/target/product/mini.mk
index 5db6f3d..76d4511 100644
--- a/target/product/mini.mk
+++ b/target/product/mini.mk
@@ -63,9 +63,9 @@ PRODUCT_PACKAGES += \
SettingsProvider \
TelephonyProvider \
UserDictionaryProvider \
+ abcc \
apache-xml \
audio \
- bluetoothd \
bouncycastle \
bu \
cacerts \
@@ -83,7 +83,6 @@ PRODUCT_PACKAGES += \
dx \
ext \
framework-res \
- hciattach \
hprof-conv \
icu.dat \
installd \
@@ -98,6 +97,7 @@ PRODUCT_PACKAGES += \
libOpenSLES \
libaudiopreprocessing \
libaudioutils \
+ libbcc \
libcrypto \
libdownmix \
libdvm \
@@ -114,10 +114,13 @@ PRODUCT_PACKAGES += \
libmdnssd \
libnativehelper \
libnfc_ndef \
+ libportable \
libpowermanager \
libspeexresampler \
libsqlite_jni \
libssl \
+ libstagefright \
+ libstagefright_chromium_http \
libstagefright_soft_aacdec \
libstagefright_soft_aacenc \
libstagefright_soft_amrdec \
@@ -139,12 +142,14 @@ PRODUCT_PACKAGES += \
libz \
lint \
mdnsd \
+ mms-common \
network \
pand \
requestsync \
screencap \
sdptool \
sensorservice \
+ telephony-common \
wpa_supplicant
PRODUCT_COPY_FILES += \
@@ -154,13 +159,11 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \
Bluetooth \
+ FusedLocation \
InputDevices \
LatinIME \
- Launcher2 \
Phone \
Provision \
- Settings \
- SystemUI \
hostapd \
wpa_supplicant.conf
@@ -186,11 +189,6 @@ PRODUCT_PACKAGES += \
local_time.default
PRODUCT_COPY_FILES += \
- system/bluetooth/data/audio.conf:system/etc/bluetooth/audio.conf \
- system/bluetooth/data/auto_pairing.conf:system/etc/bluetooth/auto_pairing.conf \
- system/bluetooth/data/blacklist.conf:system/etc/bluetooth/blacklist.conf \
- system/bluetooth/data/input.conf:system/etc/bluetooth/input.conf \
- system/bluetooth/data/network.conf:system/etc/bluetooth/network.conf \
frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf
PRODUCT_PROPERTY_OVERRIDES += \
@@ -201,7 +199,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
PRODUCT_PACKAGES += \
drmserver \
libdrmframework \
- libdrmframework_jni
+ libdrmframework_jni \
+ WAPPushManager
# Additional settings used in all AOSP builds
@@ -214,3 +213,12 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk)
$(call inherit-product-if-exists, frameworks/base/data/keyboards/keyboards.mk)
$(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk)
$(call inherit-product-if-exists, frameworks/base/data/sounds/AudioPackage5.mk)
+
+#----------------- For PDK ------------------------------
+PRODUCT_PACKAGES += \
+ TestingCamera \
+ Home \
+ DummySystemUI \
+ DummySettings \
+ libsurfaceflinger_ddmconnection
+
diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index 697d295..33b9bf4 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -20,8 +20,9 @@ PRODUCT_PROPERTY_OVERRIDES :=
PRODUCT_PACKAGES := \
Calculator \
DeskClock \
- Email \
+ Email2 \
Exchange2 \
+ FusedLocation \
Gallery \
Music \
Mms \
generated by cgit v1.1 at 2024-10-26 23:18:04 +0000