diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-08-09 21:12:00 -0700 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2012-08-09 21:12:00 -0700 |
| commit | d15e9ea3ddcbc5d835d638fa4e9dae5cbc5d7e10 (patch) | |
| tree | f2dbd093f85426cf4928cfaa6547b3ceb8d4d774 | |
| parent | af15f4c4b203279f46c7c9120d1e237d7e5f1316 (diff) | |
| parent | 5961dda6a6a5bbd1d119644e0735ada501628196 (diff) | |
| download | vendor_replicant-d15e9ea3ddcbc5d835d638fa4e9dae5cbc5d7e10.zip vendor_replicant-d15e9ea3ddcbc5d835d638fa4e9dae5cbc5d7e10.tar.gz vendor_replicant-d15e9ea3ddcbc5d835d638fa4e9dae5cbc5d7e10.tar.bz2 | |
Merge branch 'ics' of git://github.com/CyanogenMod/android_vendor_cm into HEAD
| -rw-r--r-- | CHANGELOG.mkdn | 1 | ||||
| -rw-r--r-- | config/common.mk | 5 | ||||
| -rw-r--r-- | config/common_full_phone.mk | 5 | ||||
| -rw-r--r-- | config/common_full_tablet_wifionly.mk | 4 | ||||
| -rw-r--r-- | prebuilt/common/apps/Superuser.apk | bin | 0 -> 1511570 bytes | |||
| -rw-r--r-- | vendorsetup.sh | 1 |
6 files changed, 13 insertions, 3 deletions
diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn index b05df63..22f1672 100644 --- a/CHANGELOG.mkdn +++ b/CHANGELOG.mkdn @@ -20,6 +20,7 @@ Maintainers (CyanogenMod 9): * Motorola Xoom (stingray): TDR, Steady Hawkin, Bazar6 (Team Rogue) * Motorola Xoom (wingray): TDR, Steady Hawkin, Bazar6 (Team Rogue) * Samsung Epic 4G (SPH-D700): noobnl, Decad3nce, mkasick, UberPinguin, wtogami, bbelos (Team Epic) +* Samsung Fascinate (SCH-I500): sbrissen, jt1134 * Samsung Galaxy Note (GT-N7000): Entropy512, xplodwild * Samsung Galaxy Note AT&T (SGH-I717): cyanogen * Samsung Galaxy S (GT-I9000): pawitp diff --git a/config/common.mk b/config/common.mk index 1f2586d..9d89350 100644 --- a/config/common.mk +++ b/config/common.mk @@ -53,7 +53,8 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ vendor/cm/proprietary/RomManager.apk:system/app/RomManager.apk \ vendor/cm/proprietary/Term.apk:system/app/Term.apk \ - vendor/cm/proprietary/lib/armeabi/libjackpal-androidterm4.so:system/lib/libjackpal-androidterm4.so + vendor/cm/proprietary/lib/armeabi/libjackpal-androidterm4.so:system/lib/libjackpal-androidterm4.so \ + vendor/cm/prebuilt/common/apps/Superuser.apk:system/app/Superuser.apk # Bring in camera effects PRODUCT_COPY_FILES += \ @@ -81,8 +82,6 @@ PRODUCT_PACKAGES += \ Development \ LatinIME \ SpareParts \ - Superuser \ - Superuser.apk \ su # Optional CM packages diff --git a/config/common_full_phone.mk b/config/common_full_phone.mk index 8d69ead..5ee0f7d 100644 --- a/config/common_full_phone.mk +++ b/config/common_full_phone.mk @@ -22,6 +22,11 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PACKAGES += \ Mms +# BT config +PRODUCT_COPY_FILES += \ + system/bluetooth/data/main.conf:system/etc/bluetooth/main.conf + + ifeq ($(TARGET_BOOTANIMATION_NAME),) PRODUCT_COPY_FILES += \ vendor/cm/prebuilt/common/bootanimation/vertical-480x800.zip:system/media/bootanimation.zip diff --git a/config/common_full_tablet_wifionly.mk b/config/common_full_tablet_wifionly.mk index 410bc92..963dfd7 100644 --- a/config/common_full_tablet_wifionly.mk +++ b/config/common_full_tablet_wifionly.mk @@ -19,6 +19,10 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.config.notification_sound=CyanMessage.ogg \ ro.config.alarm_alert=CyanAlarm.ogg +# BT config +PRODUCT_COPY_FILES += \ + system/bluetooth/data/main.nonsmartphone.conf:system/etc/bluetooth/main.conf + ifeq ($(TARGET_BOOTANIMATION_NAME),) PRODUCT_COPY_FILES += \ vendor/cm/prebuilt/common/bootanimation/horizontal-1280x800.zip:system/media/bootanimation.zip diff --git a/prebuilt/common/apps/Superuser.apk b/prebuilt/common/apps/Superuser.apk Binary files differnew file mode 100644 index 0000000..a550070 --- /dev/null +++ b/prebuilt/common/apps/Superuser.apk diff --git a/vendorsetup.sh b/vendorsetup.sh index c78b039..1b85f9f 100644 --- a/vendorsetup.sh +++ b/vendorsetup.sh @@ -9,6 +9,7 @@ add_lunch_combo cm_d2tmo-userdebug add_lunch_combo cm_epicmtd-userdebug add_lunch_combo cm_e730-userdebug add_lunch_combo cm_e739-userdebug +add_lunch_combo cm_fascinatemtd-userdebug add_lunch_combo cm_galaxysbmtd-userdebug add_lunch_combo cm_galaxysmtd-userdebug add_lunch_combo cm_galaxys2-userdebug |