generic_x86: use new libaudio hal

diff --git a/generic_x86/BoardConfig.mk b/generic_x86/BoardConfig.mk
index 42f6bfb..f459dcf 100644 (file)
--- a/generic_x86/BoardConfig.mk
+++ b/generic_x86/BoardConfig.mk
@@ -33,7 +33,7 @@ TARGET_SHELL := mksh
 USE_CUSTOM_RUNTIME_HEAP_MAX ?= "128M"
 
 BOARD_USES_GENERIC_AUDIO ?= false
-#BOARD_USES_ALSA_AUDIO ?= true
+BOARD_USES_ALSA_AUDIO ?= true
 BUILD_WITH_ALSA_UTILS ?= true
 BOARD_HAVE_BLUETOOTH ?= true
 

diff --git a/generic_x86/alsa.mk b/generic_x86/alsa.mk
deleted file mode 100644 (file)
index 75ed8da..0000000
--- a/generic_x86/alsa.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Copyright (C) 2011 The Android-x86 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
-#
-
-TARGET_ALSA_CONF_DIR := system/usr/share/alsa
-LOCAL_ALSA_CONF_DIR  := external/alsa-lib/src/conf
-
-copy_conf := \
-       alsa.conf \
-       pcm/dsnoop.conf \
-       pcm/modem.conf \
-       pcm/dpl.conf \
-       pcm/default.conf \
-       pcm/surround51.conf \
-       pcm/surround41.conf \
-       pcm/surround50.conf \
-       pcm/dmix.conf \
-       pcm/center_lfe.conf \
-       pcm/surround40.conf \
-       pcm/side.conf \
-       pcm/iec958.conf \
-       pcm/rear.conf \
-       pcm/surround71.conf \
-       pcm/front.conf \
-       cards/aliases.conf
-
-LOCAL_ALSA_INIT_DIR  := external/alsa-utils/alsactl/init
-
-copy_init := \
-       00main \
-       default \
-       hda \
-       help \
-       info \
-       test
-
-PRODUCT_COPY_FILES := \
-       $(foreach f,$(copy_conf),$(LOCAL_ALSA_CONF_DIR)/$(f):$(TARGET_ALSA_CONF_DIR)/$(f)) \
-       $(foreach f,$(copy_init),$(LOCAL_ALSA_INIT_DIR)/$(f):$(TARGET_ALSA_CONF_DIR)/init/$(f))
-
-PRODUCT_PACKAGES := \
-    acoustics.default \
-    alsa_ctl \
-    alsa.default

diff --git a/generic_x86/device.mk b/generic_x86/device.mk
index 3018768..afefb47 100644 (file)
--- a/generic_x86/device.mk
+++ b/generic_x86/device.mk
@@ -56,6 +56,9 @@ PRODUCT_CHARACTERISTICS := tablet
 # Get the touchscreen calibration tool
 $(call inherit-product-if-exists,external/tslib/tslib.mk)
 
+# Get the alsa files
+$(call inherit-product-if-exists,hardware/libaudio/alsa.mk)
+
 # Get GPS configuration
 $(call inherit-product-if-exists,device/common/gps/gps_as.mk)
 
@@ -71,9 +74,6 @@ $(call inherit-product-if-exists,$(SRC_TARGET_DIR)/product/locales_full.mk)
 # Get tablet dalvik parameters
 $(call inherit-product-if-exists,frameworks/base/build/tablet-dalvik-heap.mk)
 
-# Get the alsa files
-$(call inherit-product-if-exists,$(SRC_TARGET_DIR)/board/generic_x86/alsa.mk)
-
 # Get the TTS language packs
 $(call inherit-product-if-exists,external/svox/pico/lang/all_pico_languages.mk)