X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=patches%2Fall.patch;h=3814c9b6e50786ccecd73b6951f7863a0face225;hb=refs%2Fheads%2Fmaster;hp=4519859d9e192f7aec146a00cbd569df2d333bc2;hpb=b2264797ed2bbe73d3e1a5b653342382c8dd88d1;p=android_pandora.git

diff --git a/patches/all.patch b/patches/all.patch
index 4519859..3814c9b 100644
--- a/patches/all.patch
+++ b/patches/all.patch
@@ -1,4 +1,20 @@
 
+project build/
+diff --git a/build/core/product_config.mk b/build/core/product_config.mk
+index fd8feb7..ee2be34 100644
+--- a/build/core/product_config.mk
++++ b/build/core/product_config.mk
+@@ -193,7 +193,8 @@ else
+   #
+   #TODO: when we start allowing direct pointers to product files,
+   #    guarantee that they're in this list.
+-  $(call import-products, $(get-all-product-makefiles))
++  #$(call import-products, $(get-all-product-makefiles))
++  $(call import-products, device/openpandora/pandora/pandora.mk)
+ endif # TARGET_BUILD_APPS
+ $(check-all-products)
+ #$(dump-products)
+
 project external/hostap/
 diff --git a/external/hostap/Android.mk b/external/hostap/Android.mk
 index 77d72ea..5c6b589 100644
@@ -193,6 +209,20 @@ index 167402b..4e03740 100644
      } 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
@@ -256,3 +286,18 @@ index fb088e1..f99227c 100644
      }
  
      NetlinkEvent *evt = new NetlinkEvent();
+
+project vendor/cyanogen/
+diff --git a/vendor/cyanogen/products/common.mk b/vendor/cyanogen/products/common.mk
+index 195bc57..0477688 100644
+--- a/vendor/cyanogen/products/common.mk
++++ b/vendor/cyanogen/products/common.mk
+@@ -87,7 +87,7 @@ PRODUCT_COPY_FILES += \
+ #    vendor/cyanogen/prebuilt/common/etc/init.d/10apps2sd:system/etc/init.d/10apps2sd
+ 
+ PRODUCT_COPY_FILES +=  \
+-    vendor/cyanogen/proprietary/RomManager.apk:system/app/RomManager.apk \
++#    vendor/cyanogen/proprietary/RomManager.apk:system/app/RomManager.apk \
+ 
+ # Enable SIP+VoIP on all targets
+ PRODUCT_COPY_FILES += \