diff options
Diffstat (limited to 'target/product')
-rw-r--r-- | target/product/AndroidProducts.mk | 3 | ||||
-rw-r--r-- | target/product/base.mk | 147 | ||||
-rw-r--r-- | target/product/core.mk | 26 | ||||
-rw-r--r-- | target/product/full_base.mk | 3 | ||||
-rw-r--r-- | target/product/full_mips.mk | 29 | ||||
-rw-r--r-- | target/product/full_x86.mk | 7 | ||||
-rw-r--r-- | target/product/generic_mips.mk | 26 | ||||
-rw-r--r-- | target/product/generic_no_telephony.mk | 16 | ||||
-rw-r--r-- | target/product/generic_x86.mk | 4 | ||||
-rw-r--r-- | target/product/locales_full.mk | 2 | ||||
-rw-r--r-- | target/product/mini.mk | 11 | ||||
-rw-r--r-- | target/product/sdk.mk | 1 | ||||
-rw-r--r-- | target/product/sdk_mips.mk | 28 | ||||
-rw-r--r-- | target/product/sdk_x86.mk | 2 |
14 files changed, 291 insertions, 14 deletions
diff --git a/target/product/AndroidProducts.mk b/target/product/AndroidProducts.mk index 44b9000..9279633 100644 --- a/target/product/AndroidProducts.mk +++ b/target/product/AndroidProducts.mk @@ -36,10 +36,13 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/core.mk \ $(LOCAL_DIR)/generic.mk \ $(LOCAL_DIR)/generic_x86.mk \ + $(LOCAL_DIR)/generic_mips.mk \ $(LOCAL_DIR)/full.mk \ $(LOCAL_DIR)/full_x86.mk \ + $(LOCAL_DIR)/full_mips.mk \ $(LOCAL_DIR)/vbox_x86.mk \ $(LOCAL_DIR)/sdk.mk \ $(LOCAL_DIR)/sdk_x86.mk \ + $(LOCAL_DIR)/sdk_mips.mk \ $(LOCAL_DIR)/large_emu_hw.mk endif diff --git a/target/product/base.mk b/target/product/base.mk new file mode 100644 index 0000000..afde9b5 --- /dev/null +++ b/target/product/base.mk @@ -0,0 +1,147 @@ +# +# Copyright (C) 2012 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 (will move elsewhere, previously user tagged) +PRODUCT_PACKAGES += \ + 20-dns.conf \ + 95-configured \ + adb \ + adbd \ + am \ + android.policy \ + android.test.runner \ + app_process \ + applypatch \ + bmgr \ + bootanimation \ + bugreport \ + content \ + dbus-daemon \ + debuggerd \ + dhcpcd \ + dhcpcd-run-hooks \ + dnsmasq \ + dumpstate \ + dumpsys \ + framework \ + fsck_msdos \ + gralloc.default \ + gzip \ + ime \ + init \ + input \ + javax.obex \ + libEGL \ + libETC1 \ + libFFTEm \ + libGLES_android \ + libGLESv1_CM \ + libGLESv2 \ + libSR_AudioIn \ + libandroid \ + libandroid_runtime \ + libandroid_servers \ + libaudioeffect_jni \ + libaudioflinger \ + libbinder \ + libbundlewrapper \ + libc \ + libcamera_client \ + libcameraservice \ + libchromium_net \ + libctest \ + libcutils \ + libdbus \ + libdl \ + libdrm1 \ + libdrm1_jni \ + libeffects \ + libgui \ + libhardware \ + libhardware_legacy \ + libiprouteutil \ + libjni_latinime \ + libjnigraphics \ + libjpeg \ + liblog \ + libm \ + libmedia \ + libmedia_jni \ + libmediaplayerservice \ + libmtp \ + libnetlink \ + libnetutils \ + libpixelflinger \ + libpower \ + libreference-ril \ + libreverbwrapper \ + libril \ + librtp_jni \ + libsensorservice \ + libskia \ + libsonivox \ + libsoundpool \ + libsqlite \ + libstagefright \ + libstagefright_amrnb_common \ + libstagefright_avc_common \ + libstagefright_enc_common \ + libstagefright_foundation \ + libstagefright_omx \ + libstagefright_yuv \ + libstdc++ \ + libstlport \ + libsurfaceflinger \ + libsurfaceflinger_client \ + libsystem_server \ + libsysutils \ + libthread_db \ + libui \ + libusbhost \ + libutils \ + libvisualizer \ + libvorbisidec \ + libwebcore \ + libwpa_client \ + linker \ + logcat \ + logwrapper \ + mediaserver \ + monkey \ + mtpd \ + ndc \ + netcfg \ + netd \ + ping \ + platform.xml \ + pppd \ + pm \ + racoon \ + run-as \ + schedtest \ + screenshot \ + sdcard \ + service \ + servicemanager \ + services \ + surfaceflinger \ + svc \ + system_server \ + tc \ + toolbox \ + vdc \ + vold + diff --git a/target/product/core.mk b/target/product/core.mk index b7934b3..87872d6 100644 --- a/target/product/core.mk +++ b/target/product/core.mk @@ -22,7 +22,7 @@ PRODUCT_PROPERTY_OVERRIDES := \ ro.config.notification_sound=OnTheHunt.ogg \ ro.config.alarm_alert=Alarm_Classic.ogg -PRODUCT_PACKAGES := \ +PRODUCT_PACKAGES += \ ApplicationsProvider \ BackupRestoreConfirmation \ Browser \ @@ -120,7 +120,12 @@ PRODUCT_PACKAGES := \ screencap \ sensorservice \ lint \ - uiautomator + uiautomator \ + telephony-common \ + mms-common \ + zoneinfo.dat \ + zoneinfo.idx \ + zoneinfo.version PRODUCT_COPY_FILES += \ system/core/rootdir/init.usb.rc:root/init.usb.rc \ @@ -139,5 +144,20 @@ ifeq ($(WITH_HOST_DALVIK),true) libjavacore \ libssl \ libz-host \ - dalvik + dalvik \ + zoneinfo-host.dat \ + zoneinfo-host.idx \ + zoneinfo-host.version endif + +ifeq ($(HAVE_SELINUX),true) + PRODUCT_PACKAGES += \ + sepolicy \ + file_contexts \ + seapp_contexts \ + property_contexts \ + mac_permissions.xml +endif + +$(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk) + diff --git a/target/product/full_base.mk b/target/product/full_base.mk index 6a702da..2c24b1a 100644 --- a/target/product/full_base.mk +++ b/target/product/full_base.mk @@ -20,9 +20,6 @@ # in inherited configurations. PRODUCT_PACKAGES := \ - drmserver \ - libdrmframework \ - libdrmframework_jni \ libfwdlockengine \ OpenWnn \ PinyinIME \ diff --git a/target/product/full_mips.mk b/target/product/full_mips.mk new file mode 100644 index 0000000..2debfec --- /dev/null +++ b/target/product/full_mips.mk @@ -0,0 +1,29 @@ +# +# Copyright (C) 2009 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 is a build configuration for a full-featured build of the +# Open-Source part of the tree. It's geared toward a US-centric +# mips build quite specifically for the emulator, and might not be +# entirely appropriate to inherit from for on-device configurations. + +$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_mips/device.mk) + +# Overrides +PRODUCT_NAME := full_mips +PRODUCT_DEVICE := generic_mips +PRODUCT_BRAND := Android +PRODUCT_MODEL := Full MIPS Android on Emulator diff --git a/target/product/full_x86.mk b/target/product/full_x86.mk index d6a169a..9941384 100644 --- a/target/product/full_x86.mk +++ b/target/product/full_x86.mk @@ -22,13 +22,14 @@ # If running on an emulator or some other device that has a LAN connection # that isn't a wifi connection. This will instruct init.rc to enable the # network connection so that you can use it with ADB + +$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86/device.mk) + ifdef NET_ETH0_STARTONBOOT PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1 endif -$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86/device.mk) - # Ensure we package the BIOS files too. PRODUCT_PACKAGES += \ bios.bin \ diff --git a/target/product/generic_mips.mk b/target/product/generic_mips.mk new file mode 100644 index 0000000..7b53d04 --- /dev/null +++ b/target/product/generic_mips.mk @@ -0,0 +1,26 @@ +# +# Copyright (C) 2007 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 is a generic phone product that isn't specialized for a specific device. +# It includes the base Android platform. + +$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_no_telephony.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony.mk) + +# Overrides +PRODUCT_BRAND := generic_mips +PRODUCT_DEVICE := generic_mips +PRODUCT_NAME := generic_mips diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk index 0c6e9ac..049d7c0 100644 --- a/target/product/generic_no_telephony.mk +++ b/target/product/generic_no_telephony.mk @@ -45,6 +45,22 @@ PRODUCT_PACKAGES := \ wpa_supplicant.conf PRODUCT_PACKAGES += \ + audio \ + bluetoothd \ + brcm_patchram_plus \ + dhcpcd.conf \ + hciattach \ + libbluedroid \ + libbluetooth \ + libbluetoothd \ + libglib \ + network \ + pand \ + pppd \ + sdptool \ + wpa_supplicant + +PRODUCT_PACKAGES += \ icu.dat PRODUCT_PACKAGES += \ diff --git a/target/product/generic_x86.mk b/target/product/generic_x86.mk index 86710c4..0274b5b 100644 --- a/target/product/generic_x86.mk +++ b/target/product/generic_x86.mk @@ -14,10 +14,10 @@ # limitations under the License. # -# This is a generic product that isn't specialized for a specific device. +# This is a generic phone product that isn't specialized for a specific device. # It includes the base Android platform. -$(call inherit-product, $(SRC_TARGET_DIR)/product/generic.mk) +include $(SRC_TARGET_DIR)/product/generic.mk # Overrides PRODUCT_BRAND := generic_x86 diff --git a/target/product/locales_full.mk b/target/product/locales_full.mk index 8b8ab05..3a90d2b 100644 --- a/target/product/locales_full.mk +++ b/target/product/locales_full.mk @@ -1,3 +1,3 @@ -PRODUCT_LOCALES := en_US cs_CZ da_DK de_AT de_CH de_DE de_LI el_GR en_AU en_CA en_GB en_NZ en_SG es_ES fr_CA fr_CH fr_BE fr_FR it_CH it_IT ja_JP ko_KR nb_NO nl_BE nl_NL pl_PL pt_PT ru_RU sv_SE tr_TR zh_CN zh_HK zh_TW am_ET hi_IN +PRODUCT_LOCALES := en_US cs_CZ da_DK de_AT de_CH de_DE de_LI el_GR en_AU en_CA en_GB en_NZ en_SG eo_EU es_ES fr_CA fr_CH fr_BE fr_FR it_CH it_IT ja_JP ko_KR nb_NO nl_BE nl_NL pl_PL pt_PT ru_RU sv_SE tr_TR zh_CN zh_HK zh_TW am_ET hi_IN $(call inherit-product, build/target/product/languages_full.mk) diff --git a/target/product/mini.mk b/target/product/mini.mk index 8a74428..5db6f3d 100644 --- a/target/product/mini.mk +++ b/target/product/mini.mk @@ -51,6 +51,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.config.notification_sound=OnTheHunt.ogg \ ro.config.alarm_alert=Alarm_Classic.ogg +# Please keep this list sorted alphabetically PRODUCT_PACKAGES += \ ApplicationsProvider \ ContactsProvider \ @@ -63,6 +64,8 @@ PRODUCT_PACKAGES += \ TelephonyProvider \ UserDictionaryProvider \ apache-xml \ + audio \ + bluetoothd \ bouncycastle \ bu \ cacerts \ @@ -80,6 +83,7 @@ PRODUCT_PACKAGES += \ dx \ ext \ framework-res \ + hciattach \ hprof-conv \ icu.dat \ installd \ @@ -133,11 +137,15 @@ PRODUCT_PACKAGES += \ libwebrtc_audio_preprocessing \ libwilhelm \ libz \ + lint \ mdnsd \ + network \ + pand \ requestsync \ screencap \ + sdptool \ sensorservice \ - lint + wpa_supplicant PRODUCT_COPY_FILES += \ system/core/rootdir/init.usb.rc:root/init.usb.rc \ @@ -202,6 +210,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.config.ringtone=Ring_Synth_04.ogg \ ro.config.notification_sound=pixiedust.ogg +$(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) diff --git a/target/product/sdk.mk b/target/product/sdk.mk index 6165f71..697d295 100644 --- a/target/product/sdk.mk +++ b/target/product/sdk.mk @@ -89,6 +89,7 @@ PRODUCT_COPY_FILES := \ development/tools/emulator/system/camera/media_codecs.xml:system/etc/media_codecs.xml \ frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \ frameworks/native/data/etc/android.hardware.camera.autofocus.xml:system/etc/permissions/android.hardware.camera.autofocus.xml \ + frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf \ hardware/libhardware_legacy/audio/audio_policy.conf:system/etc/audio_policy.conf $(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk) diff --git a/target/product/sdk_mips.mk b/target/product/sdk_mips.mk new file mode 100644 index 0000000..2072400 --- /dev/null +++ b/target/product/sdk_mips.mk @@ -0,0 +1,28 @@ +# +# Copyright (C) 2012 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 is a build configuration for a full-featured build of the +# Open-Source part of the tree. It's geared toward a US-centric +# build quite specifically for the emulator, and might not be +# entirely appropriate to inherit from for on-device configurations. + +$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk.mk) + +# Overrides +PRODUCT_BRAND := generic_mips +PRODUCT_NAME := sdk_mips +PRODUCT_DEVICE := generic_mips +PRODUCT_MODEL := Android SDK for Mips diff --git a/target/product/sdk_x86.mk b/target/product/sdk_x86.mk index 6c5e746..873d0c0 100644 --- a/target/product/sdk_x86.mk +++ b/target/product/sdk_x86.mk @@ -19,7 +19,7 @@ # build quite specifically for the emulator, and might not be # entirely appropriate to inherit from for on-device configurations. -$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk.mk) +include $(SRC_TARGET_DIR)/product/sdk.mk # Overrides PRODUCT_BRAND := generic_x86 |