diff options
author | Joe Onorato <joeo@google.com> | 2012-08-17 00:09:27 -0700 |
---|---|---|
committer | Joe Onorato <joeo@google.com> | 2012-08-17 00:09:27 -0700 |
commit | cea08a5220bb0b1169e227dd4a08dd94fef0720b (patch) | |
tree | 17011c2939f203735b5ab27c126e8a246a034282 /target | |
parent | 36bec56c303ff250ba8c571c837531f82411839e (diff) | |
parent | 5836d3b3d99e99d3f18d5416a7e7c514bd1b97b6 (diff) | |
download | build-cea08a5220bb0b1169e227dd4a08dd94fef0720b.zip build-cea08a5220bb0b1169e227dd4a08dd94fef0720b.tar.gz build-cea08a5220bb0b1169e227dd4a08dd94fef0720b.tar.bz2 |
resolved conflicts for merge of 5836d3b3 to jb-mr1-dev
Change-Id: If3d84a7439717ccf7723b3f79e934d73abbb3fea
Diffstat (limited to 'target')
-rw-r--r-- | target/product/base.mk | 147 | ||||
-rw-r--r-- | target/product/core.mk | 5 | ||||
-rw-r--r-- | target/product/generic_no_telephony.mk | 16 | ||||
-rw-r--r-- | target/product/mini.mk | 13 |
4 files changed, 178 insertions, 3 deletions
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 4c2ca92..0b4dbea 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 \ @@ -163,3 +163,6 @@ ifeq ($(HAVE_SELINUX),true) property_contexts \ mac_permissions.xml endif + +$(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk) + diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk index 3f0242b..3987e88 100644 --- a/target/product/generic_no_telephony.mk +++ b/target/product/generic_no_telephony.mk @@ -47,6 +47,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/mini.mk b/target/product/mini.mk index 668bf89..e3fc1b7 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 \ @@ -64,6 +65,8 @@ PRODUCT_PACKAGES += \ UserDictionaryProvider \ abcc \ apache-xml \ + audio \ + bluetoothd \ bouncycastle \ bu \ cacerts \ @@ -81,6 +84,7 @@ PRODUCT_PACKAGES += \ dx \ ext \ framework-res \ + hciattach \ hprof-conv \ icu.dat \ installd \ @@ -138,13 +142,17 @@ PRODUCT_PACKAGES += \ libwebrtc_audio_preprocessing \ libwilhelm \ libz \ + lint \ mdnsd \ + mms-common \ + network \ + pand \ requestsync \ screencap \ + sdptool \ sensorservice \ - lint \ telephony-common \ - mms-common + wpa_supplicant PRODUCT_COPY_FILES += \ system/core/rootdir/init.usb.rc:root/init.usb.rc \ @@ -211,6 +219,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) |