Merge "libaudiohal: Remove dependencies on libeffects and libhardware" into oc-dev (d3721abf) · Commits · e / os / android_frameworks_av

media/libaudiohal/Android.mk

+4 −2

Original line number	Diff line number	Diff line
		@@ -4,8 +4,6 @@ include $(CLEAR_VARS)

		LOCAL_SHARED_LIBRARIES := \
		libcutils \
		libeffects \
		libhardware \
		liblog \
		libutils

		@@ -22,6 +20,10 @@ LOCAL_SRC_FILES := \
		EffectsFactoryHalLocal.cpp \
		StreamHalLocal.cpp

		LOCAL_SHARED_LIBRARIES += \
		libeffects \
		libhardware

		else # if !USE_LEGACY_LOCAL_AUDIO_HAL

		LOCAL_SRC_FILES := \

+0 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		#define LOG_TAG "EffectHalLocal"
		//#define LOG_NDEBUG 0

		#include <media/EffectsFactoryApi.h>
		#include <utils/Log.h>

		#include "EffectHalLocal.h"

+1 −2

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@
		//#define LOG_NDEBUG 0

		#include <cutils/native_handle.h>
		#include <media/EffectsFactoryApi.h>

		#include "ConversionHelperHidl.h"
		#include "EffectHalHidl.h"
		@@ -39,7 +38,7 @@ sp<EffectsFactoryHalInterface> EffectsFactoryHalInterface::create() {

		// static
		bool EffectsFactoryHalInterface::isNullUuid(const effect_uuid_t *pEffectUuid) {
		return EffectIsNullUuid(pEffectUuid);
		return memcmp(pEffectUuid, EFFECT_UUID_NULL, sizeof(effect_uuid_t)) == 0;
		}

		EffectsFactoryHalHidl::EffectsFactoryHalHidl() : ConversionHelperHidl("EffectsFactory") {