switch to alsa.omap3 module

diff --git a/pandora.mk b/pandora.mk
index 99823de..6c9abfc 100644 (file)
--- a/pandora.mk
+++ b/pandora.mk
@@ -9,7 +9,7 @@ PRODUCT_PACKAGES += \
        SoundRecorder \
        GeneralRunner \
        BluetoothSCOApp \
        SoundRecorder \
        GeneralRunner \
        BluetoothSCOApp \

-       alsa.default \
+       alsa.omap3 \

        kill_android \
        oi-filemanager \
        keypad.kcm \
        kill_android \
        oi-filemanager \
        keypad.kcm \

diff --git a/patches/all.patch b/patches/all.patch
index 4519859..1eaa520 100644 (file)
--- a/patches/all.patch
+++ b/patches/all.patch
@@ -193,6 +193,20 @@ index 167402b..4e03740 100644
      } else if (ret < 0 || strncmp(reply, "FAIL", 4) == 0) {
          return -1;
 
      } else if (ret < 0 || strncmp(reply, "FAIL", 4) == 0) {
          return -1;
 

+project hardware/ti/omap3/
+diff --git a/hardware/ti/omap3/Android.mk b/hardware/ti/omap3/Android.mk
+index d2171bf..059ea3e 100644
+--- a/hardware/ti/omap3/Android.mk
++++ b/hardware/ti/omap3/Android.mk
+@@ -1,4 +1,7 @@
+ # make sure the omap3 HAL code doesn't get picked up by non-omap boards
+ ifeq ($(OMAP_ENHANCEMENT),true)
+ include $(call first-makefiles-under,$(call my-dir))
++else
++    LOCAL_PATH := $(call my-dir)
++    include $(LOCAL_PATH)/modules/alsa/Android.mk
+ endif
+

 project packages/providers/MediaProvider/
 diff --git a/packages/providers/MediaProvider/src/com/android/providers/media/MediaProvider.java b/packages/providers/MediaProvider/src/com/android/providers/media/MediaProvider.java
 index 146966f..3938841 100644
 project packages/providers/MediaProvider/
 diff --git a/packages/providers/MediaProvider/src/com/android/providers/media/MediaProvider.java b/packages/providers/MediaProvider/src/com/android/providers/media/MediaProvider.java
 index 146966f..3938841 100644