From 85e9e160657530b6b416a3d710be580f91921169 Mon Sep 17 00:00:00 2001 From: Siddeswar Aluganti Date: Tue, 25 Sep 2018 19:03:00 -0700 Subject: [PATCH] audio-lnx: ANDROID_BUILD_TOP is deprecated. ANDROID_BUILD_TOP variable is deprecated and thus all paths are assumed to be relative to the top directory. Change-Id: Ifc1bba67bf47092a37336581990d4bcce82a72f5 --- asoc/Android.mk | 2 +- asoc/Kbuild | 2 +- asoc/codecs/Android.mk | 2 +- asoc/codecs/Kbuild | 2 +- asoc/codecs/aqt1000/Android.mk | 2 +- asoc/codecs/aqt1000/Kbuild | 2 +- asoc/codecs/bolero/Kbuild | 2 +- asoc/codecs/csra66x0/Kbuild | 2 +- asoc/codecs/msm_sdw/Android.mk | 2 +- asoc/codecs/msm_sdw/Kbuild | 2 +- asoc/codecs/sdm660_cdc/Android.mk | 2 +- asoc/codecs/sdm660_cdc/Kbuild | 2 +- asoc/codecs/wcd934x/Android.mk | 2 +- asoc/codecs/wcd934x/Kbuild | 2 +- asoc/codecs/wcd9360/Android.mk | 2 +- asoc/codecs/wcd9360/Kbuild | 2 +- dsp/Android.mk | 2 +- dsp/Kbuild | 2 +- dsp/codecs/Android.mk | 2 +- dsp/codecs/Kbuild | 2 +- ipc/Android.mk | 2 +- soc/Android.mk | 2 +- soc/Kbuild | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/asoc/Android.mk b/asoc/Android.mk index a5d1c7edad3c..8ca497c3c376 100644 --- a/asoc/Android.mk +++ b/asoc/Android.mk @@ -33,7 +33,7 @@ LOCAL_PATH := $(call my-dir) ifneq ($(findstring vendor,$(LOCAL_PATH)),) ifneq ($(findstring opensource,$(LOCAL_PATH)),) - AUDIO_BLD_DIR := $(ANDROID_BUILD_TOP)/vendor/qcom/opensource/audio-kernel + AUDIO_BLD_DIR := $(shell pwd)/vendor/qcom/opensource/audio-kernel endif # opensource DLKM_DIR := $(TOP)/device/qcom/common/dlkm diff --git a/asoc/Kbuild b/asoc/Kbuild index 311fbae090e9..acf8e844da5a 100644 --- a/asoc/Kbuild +++ b/asoc/Kbuild @@ -9,7 +9,7 @@ endif ifeq ($(KERNEL_BUILD), 1) # These are configurable via Kconfig for kernel-based builds # Need to explicitly configure for Android-based builds - AUDIO_BLD_DIR := $(ANDROID_BUILD_TOP)/kernel/msm-4.14 + AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-4.14 AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio endif diff --git a/asoc/codecs/Android.mk b/asoc/codecs/Android.mk index a35a64bb7b5d..cbe1615b2b29 100644 --- a/asoc/codecs/Android.mk +++ b/asoc/codecs/Android.mk @@ -29,7 +29,7 @@ LOCAL_PATH := $(call my-dir) ifneq ($(findstring vendor,$(LOCAL_PATH)),) ifneq ($(findstring opensource,$(LOCAL_PATH)),) - AUDIO_BLD_DIR := $(ANDROID_BUILD_TOP)/vendor/qcom/opensource/audio-kernel + AUDIO_BLD_DIR := $(shell pwd)/vendor/qcom/opensource/audio-kernel endif # opensource DLKM_DIR := $(TOP)/device/qcom/common/dlkm diff --git a/asoc/codecs/Kbuild b/asoc/codecs/Kbuild index 45018ed6700b..ade1e477a0b8 100644 --- a/asoc/codecs/Kbuild +++ b/asoc/codecs/Kbuild @@ -9,7 +9,7 @@ endif ifeq ($(KERNEL_BUILD), 1) # These are configurable via Kconfig for kernel-based builds # Need to explicitly configure for Android-based builds - AUDIO_BLD_DIR := $(ANDROID_BUILD_TOP)/kernel/msm-4.14 + AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-4.14 AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio endif diff --git a/asoc/codecs/aqt1000/Android.mk b/asoc/codecs/aqt1000/Android.mk index 7de1a63def8c..ac26f6d52469 100644 --- a/asoc/codecs/aqt1000/Android.mk +++ b/asoc/codecs/aqt1000/Android.mk @@ -10,7 +10,7 @@ LOCAL_PATH := $(call my-dir) ifneq ($(findstring vendor,$(LOCAL_PATH)),) ifneq ($(findstring opensource,$(LOCAL_PATH)),) - AUDIO_BLD_DIR := $(ANDROID_BUILD_TOP)/vendor/qcom/opensource/audio-kernel + AUDIO_BLD_DIR := $(shell pwd)/vendor/qcom/opensource/audio-kernel endif # opensource DLKM_DIR := $(TOP)/device/qcom/common/dlkm diff --git a/asoc/codecs/aqt1000/Kbuild b/asoc/codecs/aqt1000/Kbuild index 6523ce6d6b09..60ac86649e0a 100644 --- a/asoc/codecs/aqt1000/Kbuild +++ b/asoc/codecs/aqt1000/Kbuild @@ -9,7 +9,7 @@ endif ifeq ($(KERNEL_BUILD), 1) # These are configurable via Kconfig for kernel-based builds # Need to explicitly configure for Android-based builds - AUDIO_BLD_DIR := $(ANDROID_BUILD_TOP)/kernel/msm-4.14 + AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-4.14 AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio endif diff --git a/asoc/codecs/bolero/Kbuild b/asoc/codecs/bolero/Kbuild index dee3463a2459..d6c2eea3ec8d 100644 --- a/asoc/codecs/bolero/Kbuild +++ b/asoc/codecs/bolero/Kbuild @@ -11,7 +11,7 @@ endif ifeq ($(KERNEL_BUILD), 1) # These are configurable via Kconfig for kernel-based builds # Need to explicitly configure for Android-based builds - AUDIO_BLD_DIR := $(ANDROID_BUILD_TOP)/kernel/msm-4.14 + AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-4.14 AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio endif diff --git a/asoc/codecs/csra66x0/Kbuild b/asoc/codecs/csra66x0/Kbuild index c23811c23a65..bb26a384ec4f 100644 --- a/asoc/codecs/csra66x0/Kbuild +++ b/asoc/codecs/csra66x0/Kbuild @@ -10,7 +10,7 @@ endif ifeq ($(KERNEL_BUILD), 1) # These are configurable via Kconfig for kernel-based builds # Need to explicitly configure for Android-based builds - AUDIO_BLD_DIR := $(ANDROID_BUILD_TOP)/kernel/msm-4.14 + AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-4.14 AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio endif diff --git a/asoc/codecs/msm_sdw/Android.mk b/asoc/codecs/msm_sdw/Android.mk index 338e7f450221..7ec659200c94 100644 --- a/asoc/codecs/msm_sdw/Android.mk +++ b/asoc/codecs/msm_sdw/Android.mk @@ -13,7 +13,7 @@ LOCAL_PATH := $(call my-dir) ifneq ($(findstring vendor,$(LOCAL_PATH)),) ifneq ($(findstring opensource,$(LOCAL_PATH)),) - AUDIO_BLD_DIR := $(ANDROID_BUILD_TOP)/vendor/qcom/opensource/audio-kernel + AUDIO_BLD_DIR := $(shell pwd)/vendor/qcom/opensource/audio-kernel endif # opensource DLKM_DIR := $(TOP)/device/qcom/common/dlkm diff --git a/asoc/codecs/msm_sdw/Kbuild b/asoc/codecs/msm_sdw/Kbuild index f687cddf5155..46639d29f011 100644 --- a/asoc/codecs/msm_sdw/Kbuild +++ b/asoc/codecs/msm_sdw/Kbuild @@ -10,7 +10,7 @@ endif ifeq ($(KERNEL_BUILD), 1) # These are configurable via Kconfig for kernel-based builds # Need to explicitly configure for Android-based builds - AUDIO_BLD_DIR := $(ANDROID_BUILD_TOP)/kernel/msm-4.9 + AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-4.9 AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio endif diff --git a/asoc/codecs/sdm660_cdc/Android.mk b/asoc/codecs/sdm660_cdc/Android.mk index 43a5645fdf64..41f3cc7bc81f 100644 --- a/asoc/codecs/sdm660_cdc/Android.mk +++ b/asoc/codecs/sdm660_cdc/Android.mk @@ -12,7 +12,7 @@ LOCAL_PATH := $(call my-dir) ifneq ($(findstring vendor,$(LOCAL_PATH)),) ifneq ($(findstring opensource,$(LOCAL_PATH)),) - AUDIO_BLD_DIR := $(ANDROID_BUILD_TOP)/vendor/qcom/opensource/audio-kernel + AUDIO_BLD_DIR := $(shell pwd)/vendor/qcom/opensource/audio-kernel endif # opensource DLKM_DIR := $(TOP)/device/qcom/common/dlkm diff --git a/asoc/codecs/sdm660_cdc/Kbuild b/asoc/codecs/sdm660_cdc/Kbuild index 6c379e1bfc70..cbbc0c784493 100644 --- a/asoc/codecs/sdm660_cdc/Kbuild +++ b/asoc/codecs/sdm660_cdc/Kbuild @@ -10,7 +10,7 @@ endif ifeq ($(KERNEL_BUILD), 1) # These are configurable via Kconfig for kernel-based builds # Need to explicitly configure for Android-based builds - AUDIO_BLD_DIR := $(ANDROID_BUILD_TOP)/kernel/msm-4.9 + AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-4.9 AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio endif diff --git a/asoc/codecs/wcd934x/Android.mk b/asoc/codecs/wcd934x/Android.mk index 6b5cca55e922..90a012dbab1f 100644 --- a/asoc/codecs/wcd934x/Android.mk +++ b/asoc/codecs/wcd934x/Android.mk @@ -29,7 +29,7 @@ LOCAL_PATH := $(call my-dir) ifneq ($(findstring vendor,$(LOCAL_PATH)),) ifneq ($(findstring opensource,$(LOCAL_PATH)),) - AUDIO_BLD_DIR := $(ANDROID_BUILD_TOP)/vendor/qcom/opensource/audio-kernel + AUDIO_BLD_DIR := $(shell pwd)/vendor/qcom/opensource/audio-kernel endif # opensource DLKM_DIR := $(TOP)/device/qcom/common/dlkm diff --git a/asoc/codecs/wcd934x/Kbuild b/asoc/codecs/wcd934x/Kbuild index 5566ecbb26fb..26d9af61fa9e 100644 --- a/asoc/codecs/wcd934x/Kbuild +++ b/asoc/codecs/wcd934x/Kbuild @@ -11,7 +11,7 @@ endif ifeq ($(KERNEL_BUILD), 1) # These are configurable via Kconfig for kernel-based builds # Need to explicitly configure for Android-based builds - AUDIO_BLD_DIR := $(ANDROID_BUILD_TOP)/kernel/msm-4.9 + AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-4.9 AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio endif diff --git a/asoc/codecs/wcd9360/Android.mk b/asoc/codecs/wcd9360/Android.mk index bee0364ecd41..492061265f26 100644 --- a/asoc/codecs/wcd9360/Android.mk +++ b/asoc/codecs/wcd9360/Android.mk @@ -17,7 +17,7 @@ LOCAL_PATH := $(call my-dir) ifneq ($(findstring vendor,$(LOCAL_PATH)),) ifneq ($(findstring opensource,$(LOCAL_PATH)),) - AUDIO_BLD_DIR := $(ANDROID_BUILD_TOP)/vendor/qcom/opensource/audio-kernel + AUDIO_BLD_DIR := $(shell pwd)/vendor/qcom/opensource/audio-kernel endif # opensource DLKM_DIR := $(TOP)/device/qcom/common/dlkm diff --git a/asoc/codecs/wcd9360/Kbuild b/asoc/codecs/wcd9360/Kbuild index 6bba0c525599..5282b3442408 100644 --- a/asoc/codecs/wcd9360/Kbuild +++ b/asoc/codecs/wcd9360/Kbuild @@ -11,7 +11,7 @@ endif ifeq ($(KERNEL_BUILD), 1) # These are configurable via Kconfig for kernel-based builds # Need to explicitly configure for Android-based builds - AUDIO_BLD_DIR := $(ANDROID_BUILD_TOP)/kernel/msm-4.14 + AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-4.14 AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio endif diff --git a/dsp/Android.mk b/dsp/Android.mk index 48b068c732f5..23c0cc9669e3 100644 --- a/dsp/Android.mk +++ b/dsp/Android.mk @@ -29,7 +29,7 @@ LOCAL_PATH := $(call my-dir) ifneq ($(findstring vendor,$(LOCAL_PATH)),) ifneq ($(findstring opensource,$(LOCAL_PATH)),) - AUDIO_BLD_DIR := $(ANDROID_BUILD_TOP)/vendor/qcom/opensource/audio-kernel + AUDIO_BLD_DIR := $(shell pwd)/vendor/qcom/opensource/audio-kernel endif # opensource DLKM_DIR := $(TOP)/device/qcom/common/dlkm diff --git a/dsp/Kbuild b/dsp/Kbuild index ba5f82cb71ac..7081ceb0d246 100644 --- a/dsp/Kbuild +++ b/dsp/Kbuild @@ -9,7 +9,7 @@ endif ifeq ($(KERNEL_BUILD), 1) # These are configurable via Kconfig for kernel-based builds # Need to explicitly configure for Android-based builds - AUDIO_BLD_DIR := $(ANDROID_BUILD_TOP)/kernel/msm-4.14 + AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-4.14 AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio endif diff --git a/dsp/codecs/Android.mk b/dsp/codecs/Android.mk index 69af58eefdf5..0c969dbafc50 100644 --- a/dsp/codecs/Android.mk +++ b/dsp/codecs/Android.mk @@ -29,7 +29,7 @@ LOCAL_PATH := $(call my-dir) ifneq ($(findstring vendor,$(LOCAL_PATH)),) ifneq ($(findstring opensource,$(LOCAL_PATH)),) - AUDIO_BLD_DIR := $(ANDROID_BUILD_TOP)/vendor/qcom/opensource/audio-kernel + AUDIO_BLD_DIR := $(shell pwd)/vendor/qcom/opensource/audio-kernel endif # opensource DLKM_DIR := $(TOP)/device/qcom/common/dlkm diff --git a/dsp/codecs/Kbuild b/dsp/codecs/Kbuild index 7d7268b694ee..0f1f519f4137 100644 --- a/dsp/codecs/Kbuild +++ b/dsp/codecs/Kbuild @@ -9,7 +9,7 @@ endif ifeq ($(KERNEL_BUILD), 1) # These are configurable via Kconfig for kernel-based builds # Need to explicitly configure for Android-based builds - AUDIO_BLD_DIR := $(ANDROID_BUILD_TOP)/kernel/msm-4.14 + AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-4.14 AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio endif diff --git a/ipc/Android.mk b/ipc/Android.mk index fe9ce0f54915..942a1866a0db 100644 --- a/ipc/Android.mk +++ b/ipc/Android.mk @@ -29,7 +29,7 @@ LOCAL_PATH := $(call my-dir) ifneq ($(findstring vendor,$(LOCAL_PATH)),) ifneq ($(findstring opensource,$(LOCAL_PATH)),) - AUDIO_BLD_DIR := $(ANDROID_BUILD_TOP)/vendor/qcom/opensource/audio-kernel + AUDIO_BLD_DIR := $(shell pwd)/vendor/qcom/opensource/audio-kernel endif # opensource DLKM_DIR := $(TOP)/device/qcom/common/dlkm diff --git a/soc/Android.mk b/soc/Android.mk index dc6a5b32f822..972b8ad261f3 100644 --- a/soc/Android.mk +++ b/soc/Android.mk @@ -29,7 +29,7 @@ LOCAL_PATH := $(call my-dir) ifneq ($(findstring vendor,$(LOCAL_PATH)),) ifneq ($(findstring opensource,$(LOCAL_PATH)),) - AUDIO_BLD_DIR := $(ANDROID_BUILD_TOP)/vendor/qcom/opensource/audio-kernel + AUDIO_BLD_DIR := $(shell pwd)/vendor/qcom/opensource/audio-kernel endif # opensource DLKM_DIR := $(TOP)/device/qcom/common/dlkm diff --git a/soc/Kbuild b/soc/Kbuild index 54ca077e4936..eedf6f1fbbda 100644 --- a/soc/Kbuild +++ b/soc/Kbuild @@ -9,7 +9,7 @@ endif ifeq ($(KERNEL_BUILD), 1) # These are configurable via Kconfig for kernel-based builds # Need to explicitly configure for Android-based builds - AUDIO_BLD_DIR := $(ANDROID_BUILD_TOP)/kernel/msm-4.14 + AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-4.14 AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio endif