From f7f35bc3ba2f0052cd318409d2eea73e5b3c66ae Mon Sep 17 00:00:00 2001
From: Pawit Pornkitprasan <p.pawit@gmail.com>
Date: Wed, 13 Feb 2013 15:24:55 +0700
Subject: aries-common: use default audio policy

No point extending and compiling another audio policy when we're
not modifying it in anyway.

Change-Id: I3e1d144b92b42ace670d312fe3c57f2596ea9e43
---
 device_base.mk                  |  1 -
 libaudio/Android.mk             | 16 ---------------
 libaudio/AudioPolicyManager.cpp | 45 -----------------------------------------
 libaudio/AudioPolicyManager.h   | 38 ----------------------------------
 4 files changed, 100 deletions(-)
 delete mode 100644 libaudio/AudioPolicyManager.cpp
 delete mode 100644 libaudio/AudioPolicyManager.h

diff --git a/device_base.mk b/device_base.mk
index 5f0a8d1..3a5e44e 100644
--- a/device_base.mk
+++ b/device_base.mk
@@ -100,7 +100,6 @@ PRODUCT_PACKAGES += \
 	hwcomposer.s5pc110 \
 	camera.aries \
 	audio.primary.aries \
-	audio_policy.aries \
 	audio.a2dp.default \
 	audio.usb.default \
 	libs3cjpeg
diff --git a/libaudio/Android.mk b/libaudio/Android.mk
index 063374b..45e34e8 100644
--- a/libaudio/Android.mk
+++ b/libaudio/Android.mk
@@ -30,20 +30,4 @@ endif
 
 include $(BUILD_SHARED_LIBRARY)
 
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := AudioPolicyManager.cpp
-LOCAL_SHARED_LIBRARIES := libcutils libutils
-LOCAL_STATIC_LIBRARIES := libmedia_helper
-LOCAL_WHOLE_STATIC_LIBRARIES := libaudiopolicy_legacy
-LOCAL_MODULE := audio_policy.aries
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
-LOCAL_MODULE_TAGS := optional
-
-ifeq ($(BOARD_HAVE_FM_RADIO),true)
-  LOCAL_CFLAGS += -DHAVE_FM_RADIO
-endif
-
-include $(BUILD_SHARED_LIBRARY)
-
 endif
diff --git a/libaudio/AudioPolicyManager.cpp b/libaudio/AudioPolicyManager.cpp
deleted file mode 100644
index ce99972..0000000
--- a/libaudio/AudioPolicyManager.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2009 The Android 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define LOG_TAG "AudioPolicyManager"
-//#define LOG_NDEBUG 0
-#include <utils/Log.h>
-#include "AudioPolicyManager.h"
-
-namespace android_audio_legacy {
-
-
-
-// ----------------------------------------------------------------------------
-// AudioPolicyManager for crespo platform
-// Common audio policy manager code is implemented in AudioPolicyManagerBase class
-// ----------------------------------------------------------------------------
-
-// ---  class factory
-
-
-extern "C" AudioPolicyInterface* createAudioPolicyManager(AudioPolicyClientInterface *clientInterface)
-{
-    return new AudioPolicyManager(clientInterface);
-}
-
-extern "C" void destroyAudioPolicyManager(AudioPolicyInterface *interface)
-{
-    delete interface;
-}
-
-
-}; // namespace android
diff --git a/libaudio/AudioPolicyManager.h b/libaudio/AudioPolicyManager.h
deleted file mode 100644
index 5062ff0..0000000
--- a/libaudio/AudioPolicyManager.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2009 The Android 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include <stdint.h>
-#include <sys/types.h>
-#include <utils/Timers.h>
-#include <utils/Errors.h>
-#include <utils/KeyedVector.h>
-#include <hardware_legacy/AudioPolicyManagerBase.h>
-
-
-namespace android_audio_legacy {
-
-class AudioPolicyManager: public AudioPolicyManagerBase
-{
-
-public:
-                AudioPolicyManager(AudioPolicyClientInterface *clientInterface)
-                : AudioPolicyManagerBase(clientInterface) {}
-
-        virtual ~AudioPolicyManager() {}
-
-};
-};
-- 
cgit v1.1