summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bcm4329.kobin267732 -> 267732 bytes
-rw-r--r--device_base.mk18
-rw-r--r--full_crespo.mk14
-rw-r--r--init.herring.usb.rc4
-rw-r--r--kernelbin2896820 -> 2896800 bytes
5 files changed, 17 insertions, 19 deletions
diff --git a/bcm4329.ko b/bcm4329.ko
index 42c401f..5abcfa0 100644
--- a/bcm4329.ko
+++ b/bcm4329.ko
Binary files differ
diff --git a/device_base.mk b/device_base.mk
index 276fef9..15647e6 100644
--- a/device_base.mk
+++ b/device_base.mk
@@ -125,24 +125,6 @@ PRODUCT_PACKAGES += \
libstagefrighthw \
com.android.future.usb.accessory
-# NFC
-PRODUCT_PACKAGES += \
- libnfc \
- libnfc_jni \
- Nfc
-
-# Live Wallpapers
-PRODUCT_PACKAGES += \
- LiveWallpapers \
- LiveWallpapersPicker \
- MagicSmokeWallpapers \
- VisualizationWallpapers \
- librs_jni
-
-# Video Editor
-PRODUCT_PACKAGES += \
- VideoEditorGoogle
-
# Input device calibration files
PRODUCT_COPY_FILES += \
device/samsung/crespo/mxt224_ts_input.idc:system/usr/idc/mxt224_ts_input.idc
diff --git a/full_crespo.mk b/full_crespo.mk
index 68b8216..ba8f71e 100644
--- a/full_crespo.mk
+++ b/full_crespo.mk
@@ -22,6 +22,20 @@
# Get the long list of APNs
PRODUCT_COPY_FILES := device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml
+# NFC
+PRODUCT_PACKAGES += \
+ libnfc \
+ libnfc_jni \
+ Nfc
+
+# Live Wallpapers
+PRODUCT_PACKAGES += \
+ LiveWallpapers \
+ LiveWallpapersPicker \
+ MagicSmokeWallpapers \
+ VisualizationWallpapers \
+ librs_jni
+
# Inherit from those products. Most specific first.
$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
# This is where we'd set a backup provider if we had one
diff --git a/init.herring.usb.rc b/init.herring.usb.rc
index 73acf16..882d763 100644
--- a/init.herring.usb.rc
+++ b/init.herring.usb.rc
@@ -2,7 +2,9 @@ on boot
write /sys/class/android_usb/android0/iManufacturer $ro.product.manufacturer
write /sys/class/android_usb/android0/iProduct $ro.product.model
write /sys/class/android_usb/android0/iSerial $ro.serialno
- write /sys/class/android_usb/f_mass_storage/inquiry_string "Google Nexus S 0100"
+ write /sys/class/android_usb/android0/f_mass_storage/inquiry_string "Google Nexus S 0100"
+ write /sys/class/android_usb/android0/f_rndis/manufacturer Samsung
+ write /sys/class/android_usb/android0/f_rndis/vendorID 18d1
on property:sys.usb.config=none
stop adbd
diff --git a/kernel b/kernel
index 7eebd9d..4d4146f 100644
--- a/kernel
+++ b/kernel
Binary files differ