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

Commit 9be49c91 authored Jan 28, 2014 by Colin Cross Committed by Android Git Automerger Jan 28, 2014

am bb9e396d: am 06f7d151: am 06da69d5: Merge "frameworks/av: convert...

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

* commit 'bb9e396d':
  frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH

parents 5f44635d bb9e396d

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

+1 −1

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

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

	LOCAL_MODULE_TAGS := optional		LOCAL_MODULE_TAGS := optional

media/libeffects/downmix/Android.mk

+1 −1

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

	LOCAL_MODULE_TAGS := optional		LOCAL_MODULE_TAGS := optional

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

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

media/libeffects/loudness/Android.mk

+1 −1

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

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

	LOCAL_C_INCLUDES := \		LOCAL_C_INCLUDES := \

media/libeffects/lvm/wrapper/Android.mk

+2 −2

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

	LOCAL_MODULE:= libbundlewrapper		LOCAL_MODULE:= libbundlewrapper

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

	LOCAL_STATIC_LIBRARIES += libmusicbundle		LOCAL_STATIC_LIBRARIES += libmusicbundle

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

	LOCAL_MODULE:= libreverbwrapper		LOCAL_MODULE:= libreverbwrapper

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

	LOCAL_STATIC_LIBRARIES += libreverb		LOCAL_STATIC_LIBRARIES += libreverb

media/libeffects/preprocessing/Android.mk

+1 −1

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

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

	LOCAL_SRC_FILES:= \		LOCAL_SRC_FILES:= \
	PreProcessing.cpp		PreProcessing.cpp