Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06f7d151 authored Jan 28, 2014 by Colin Cross Committed by Android Git Automerger Jan 28, 2014

am 06da69d5: Merge "frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"

* commit '06da69d5':
  frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH

parents fe6db33a 06da69d5

drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -61,7 +61,7 @@ LOCAL_C_INCLUDES += \
		$(LOCAL_PATH)/include \
		external/openssl/include

		LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/drm
		LOCAL_MODULE_RELATIVE_PATH := drm

		LOCAL_MODULE_TAGS := optional

media/libeffects/downmix/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@ LOCAL_MODULE:= libdownmix

		LOCAL_MODULE_TAGS := optional

		LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/soundfx
		LOCAL_MODULE_RELATIVE_PATH := soundfx

		ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true)
		LOCAL_LDLIBS += -ldl

media/libeffects/loudness/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@ LOCAL_SHARED_LIBRARIES := \
		liblog \
		libstlport

		LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/soundfx
		LOCAL_MODULE_RELATIVE_PATH := soundfx
		LOCAL_MODULE:= libldnhncr

		LOCAL_C_INCLUDES := \

media/libeffects/lvm/wrapper/Android.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@ LOCAL_CFLAGS += -fvisibility=hidden

		LOCAL_MODULE:= libbundlewrapper

		LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/soundfx
		LOCAL_MODULE_RELATIVE_PATH := soundfx

		LOCAL_STATIC_LIBRARIES += libmusicbundle

		@@ -42,7 +42,7 @@ LOCAL_CFLAGS += -fvisibility=hidden

		LOCAL_MODULE:= libreverbwrapper

		LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/soundfx
		LOCAL_MODULE_RELATIVE_PATH := soundfx

		LOCAL_STATIC_LIBRARIES += libreverb

media/libeffects/preprocessing/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ include $(CLEAR_VARS)

		LOCAL_MODULE:= libaudiopreprocessing
		LOCAL_MODULE_TAGS := optional
		LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/soundfx
		LOCAL_MODULE_RELATIVE_PATH := soundfx

		LOCAL_SRC_FILES:= \
		PreProcessing.cpp