Makefiles: fix LOCAL_PATH in Android.mk

Names of various source files given by
LOCAL_SRC_FILES were given relative to current
directory. These have been fixed relative to
LOCAL_PATH variable and the LOCAL_PATH refers
to a suitable directory. This ensures that the
intermediate files generated during compilation
are put in the right folder hierarchy under
out/target/product.

Change-Id: Iffe7af36b4cce9933eb8e3928e2a676738acdf62
Signed-off-by Paramanand Singh <paramanand.singh@linaro.org>

5 files changed, 41 insertions, 44 deletions

diff --git a/audio-codec/common/Android.mk b/audio-codec/common/Android.mk
index c0ed917..9f6bdc6 100644
--- a/audio-codec/common/Android.mk
+++ b/audio-codec/common/Android.mk
@@ -1,11 +1,12 @@
-LOCAL_PATH:= $(call my-dir)
+CUR_WD := $(call my-dir)
+LOCAL_PATH := $(CUR_WD)/../../../../system/media/audio_utils
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libaudioprimitives
 LOCAL_MODULE_TAGS := optional tests
 
 LOCAL_SRC_FILES := \
-       ../../../../system/media/audio_utils/primitives.c
+       primitives.c
 
 LOCAL_C_INCLUDES += \
        $(call include-path-for, audio-utils)
diff --git a/audio-codec/tremolo/Android.mk b/audio-codec/tremolo/Android.mk
index 5717bd7..25c6ef0 100644
--- a/audio-codec/tremolo/Android.mk
+++ b/audio-codec/tremolo/Android.mk
@@ -1,30 +1,30 @@
-LOCAL_PATH := $(call my-dir)
+CUR_WD := $(call my-dir)
+LOCAL_PATH := $(CUR_WD)/../../../../external/tremolo
 include $(CLEAR_VARS)
 
 PRIVATE_INC_DIR := external/tremolo
-PRIVATE_SRC_DIR := ../../../../external/tremolo
 
 LOCAL_SRC_FILES = \
-       $(PRIVATE_SRC_DIR)/Tremolo/bitwise.c \
-       $(PRIVATE_SRC_DIR)/Tremolo/codebook.c \
-       $(PRIVATE_SRC_DIR)/Tremolo/dsp.c \
-       $(PRIVATE_SRC_DIR)/Tremolo/floor0.c \
-       $(PRIVATE_SRC_DIR)/Tremolo/floor1.c \
-       $(PRIVATE_SRC_DIR)/Tremolo/floor_lookup.c \
-       $(PRIVATE_SRC_DIR)/Tremolo/framing.c \
-       $(PRIVATE_SRC_DIR)/Tremolo/mapping0.c \
-       $(PRIVATE_SRC_DIR)/Tremolo/mdct.c \
-       $(PRIVATE_SRC_DIR)/Tremolo/misc.c \
-       $(PRIVATE_SRC_DIR)/Tremolo/res012.c \
-       $(PRIVATE_SRC_DIR)/Tremolo/treminfo.c \
-       $(PRIVATE_SRC_DIR)/Tremolo/vorbisfile.c
+       ./Tremolo/bitwise.c \
+       ./Tremolo/codebook.c \
+       ./Tremolo/dsp.c \
+       ./Tremolo/floor0.c \
+       ./Tremolo/floor1.c \
+       ./Tremolo/floor_lookup.c \
+       ./Tremolo/framing.c \
+       ./Tremolo/mapping0.c \
+       ./Tremolo/mdct.c \
+       ./Tremolo/misc.c \
+       ./Tremolo/res012.c \
+       ./Tremolo/treminfo.c \
+       ./Tremolo/vorbisfile.c
 
 ifeq ($(TARGET_ARCH),arm)
 LOCAL_SRC_FILES += \
-       $(PRIVATE_SRC_DIR)/Tremolo/bitwiseARM.s \
-       $(PRIVATE_SRC_DIR)/Tremolo/dpen.s \
-       $(PRIVATE_SRC_DIR)/Tremolo/floor1ARM.s \
-       $(PRIVATE_SRC_DIR)/Tremolo/mdctARM.s
+       ./Tremolo/bitwiseARM.s \
+       ./Tremolo/dpen.s \
+       ./Tremolo/floor1ARM.s \
+       ./Tremolo/mdctARM.s
 LOCAL_CFLAGS += \
     -D_ARM_ASSEM_
 else
@@ -42,6 +42,7 @@ LOCAL_MODULE := libvorbisidec
 
 include $(BUILD_STATIC_LIBRARY)
 
+LOCAL_PATH := $(CUR_WD)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
diff --git a/speech-codec/amrnb/Android.mk b/speech-codec/amrnb/Android.mk
index 82c038c..f8b481b 100644
--- a/speech-codec/amrnb/Android.mk
+++ b/speech-codec/amrnb/Android.mk
@@ -1,9 +1,8 @@
-LOCAL_PATH := $(call my-dir)
+CUR_WD := $(call my-dir)
+LOCAL_PATH := $(CUR_WD)/../../../../frameworks/av/media/libstagefright/codecs/amrnb/common
 include $(CLEAR_VARS)
 
 PRIVATE_INC_DIR := frameworks/av/media/libstagefright/codecs/amrnb/common
-PRIVATE_SRC_DIR := \
-	../../../../frameworks/av/media/libstagefright/codecs/amrnb/common
 
 LOCAL_SRC_FILES := \
  	src/az_lsp.cpp \
@@ -67,8 +66,6 @@ LOCAL_SRC_FILES := \
  	src/weight_a.cpp \
  	src/window_tab.cpp
 
-LOCAL_SRC_FILES := $(addprefix $(PRIVATE_SRC_DIR)/, $(LOCAL_SRC_FILES))
-
 LOCAL_C_INCLUDES := \
         $(PRIVATE_INC_DIR)/include
 
@@ -81,6 +78,7 @@ include $(BUILD_STATIC_LIBRARY)
 
 ##############################################################################
 
+LOCAL_PATH := $(CUR_WD)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
@@ -106,6 +104,7 @@ include $(BUILD_EXECUTABLE)
 
 ##############################################################################
 
+LOCAL_PATH := $(CUR_WD)
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := \
 	amrnb_enc_test.cpp
diff --git a/speech-codec/amrwb/Android.mk b/speech-codec/amrwb/Android.mk
index 20c25b7..6620fc9 100644
--- a/speech-codec/amrwb/Android.mk
+++ b/speech-codec/amrwb/Android.mk
@@ -1,4 +1,5 @@
-LOCAL_PATH := $(call my-dir)
+CUR_WD := $(call my-dir)
+LOCAL_PATH := $(CUR_WD)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
@@ -23,18 +24,15 @@ include $(BUILD_EXECUTABLE)
 
 ##############################################################################
 
+LOCAL_PATH := $(CUR_WD)/../../../../frameworks/av/media/libstagefright/codecs
 include $(CLEAR_VARS)
 
 PRIVATE_INC_DIR := \
 	frameworks/av/media/libstagefright/codecs/amrwbenc/SampleCode
-PRIVATE_SRC_DIR := \
-	../../../../frameworks/av/media/libstagefright/codecs/amrwbenc/SampleCode
 
 LOCAL_SRC_FILES := \
-	AMRWB_E_SAMPLE.c \
-	../../common/cmnMemory.c
-
-LOCAL_SRC_FILES := $(addprefix $(PRIVATE_SRC_DIR)/, $(LOCAL_SRC_FILES))
+	amrwbenc/SampleCode/AMRWB_E_SAMPLE.c \
+	common/cmnMemory.c
 
 LOCAL_C_INCLUDES := \
 	$(PRIVATE_INC_DIR)/ \
diff --git a/video-codec/avc/Android.mk b/video-codec/avc/Android.mk
index c8832a3..7b5aaa6 100644
--- a/video-codec/avc/Android.mk
+++ b/video-codec/avc/Android.mk
@@ -1,17 +1,16 @@
-LOCAL_PATH := $(call my-dir)
+CUR_WD := $(call my-dir)
+LOCAL_PATH := $(CUR_WD)/../../../../frameworks/av/media/libstagefright/codecs/avc/common
 include $(CLEAR_VARS)
 
 PRIVATE_INC_DIR := frameworks/av/media/libstagefright/codecs/avc/common
-PRIVATE_SRC_DIR := ../../../../$(PRIVATE_INC_DIR)
 
 LOCAL_SRC_FILES := \
-	src/deblock.cpp \
- 	src/dpb.cpp \
- 	src/fmo.cpp \
- 	src/mb_access.cpp \
- 	src/reflist.cpp
+    ./src/deblock.cpp \
+    ./src/dpb.cpp \
+    ./src/fmo.cpp \
+    ./src/mb_access.cpp \
+    ./src/reflist.cpp
 
-LOCAL_SRC_FILES := $(addprefix $(PRIVATE_SRC_DIR)/, $(LOCAL_SRC_FILES))
 
 LOCAL_MODULE := libstagefright_avc_common
 
@@ -25,6 +24,7 @@ include $(BUILD_STATIC_LIBRARY)
 
 ##############################################################################
 
+LOCAL_PATH := $(CUR_WD)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
@@ -50,10 +50,10 @@ include $(BUILD_EXECUTABLE)
 
 ##############################################################################
 
+LOCAL_PATH := $(CUR_WD)/../../../../frameworks/av/media/libstagefright/codecs/on2/h264dec
 include $(CLEAR_VARS)
 
 PRIVATE_INC_DIR := frameworks/av/media/libstagefright/codecs/on2/h264dec
-PRIVATE_SRC_DIR := ../../../../$(PRIVATE_INC_DIR)
 
 LOCAL_SRC_FILES := \
 	./source/DecTestBench.c
@@ -61,8 +61,6 @@ LOCAL_SRC_FILES := \
 LOCAL_C_INCLUDES := \
 	$(PRIVATE_INC_DIR)/inc
 
-LOCAL_SRC_FILES := $(addprefix $(PRIVATE_SRC_DIR)/, $(LOCAL_SRC_FILES))
-
 LOCAL_SHARED_LIBRARIES := libstagefright_soft_h264dec
 
 LOCAL_MODULE := libstagefright_h264dec_test