Merge "audio-lnx: ANDROID_BUILD_TOP is deprecated."

This commit is contained in:
Linux Build Service Account
2018-10-23 01:32:43 -07:00
committed by Gerrit - the friendly Code Review server
23 changed files with 23 additions and 23 deletions

View File

@@ -33,7 +33,7 @@ LOCAL_PATH := $(call my-dir)
ifneq ($(findstring vendor,$(LOCAL_PATH)),) ifneq ($(findstring vendor,$(LOCAL_PATH)),)
ifneq ($(findstring opensource,$(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 endif # opensource
DLKM_DIR := $(TOP)/device/qcom/common/dlkm DLKM_DIR := $(TOP)/device/qcom/common/dlkm

View File

@@ -9,7 +9,7 @@ endif
ifeq ($(KERNEL_BUILD), 1) ifeq ($(KERNEL_BUILD), 1)
# These are configurable via Kconfig for kernel-based builds # These are configurable via Kconfig for kernel-based builds
# Need to explicitly configure for Android-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 AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio
endif endif

View File

@@ -29,7 +29,7 @@ LOCAL_PATH := $(call my-dir)
ifneq ($(findstring vendor,$(LOCAL_PATH)),) ifneq ($(findstring vendor,$(LOCAL_PATH)),)
ifneq ($(findstring opensource,$(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 endif # opensource
DLKM_DIR := $(TOP)/device/qcom/common/dlkm DLKM_DIR := $(TOP)/device/qcom/common/dlkm

View File

@@ -9,7 +9,7 @@ endif
ifeq ($(KERNEL_BUILD), 1) ifeq ($(KERNEL_BUILD), 1)
# These are configurable via Kconfig for kernel-based builds # These are configurable via Kconfig for kernel-based builds
# Need to explicitly configure for Android-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 AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio
endif endif

View File

@@ -10,7 +10,7 @@ LOCAL_PATH := $(call my-dir)
ifneq ($(findstring vendor,$(LOCAL_PATH)),) ifneq ($(findstring vendor,$(LOCAL_PATH)),)
ifneq ($(findstring opensource,$(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 endif # opensource
DLKM_DIR := $(TOP)/device/qcom/common/dlkm DLKM_DIR := $(TOP)/device/qcom/common/dlkm

View File

@@ -9,7 +9,7 @@ endif
ifeq ($(KERNEL_BUILD), 1) ifeq ($(KERNEL_BUILD), 1)
# These are configurable via Kconfig for kernel-based builds # These are configurable via Kconfig for kernel-based builds
# Need to explicitly configure for Android-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 AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio
endif endif

View File

@@ -11,7 +11,7 @@ endif
ifeq ($(KERNEL_BUILD), 1) ifeq ($(KERNEL_BUILD), 1)
# These are configurable via Kconfig for kernel-based builds # These are configurable via Kconfig for kernel-based builds
# Need to explicitly configure for Android-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 AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio
endif endif

View File

@@ -10,7 +10,7 @@ endif
ifeq ($(KERNEL_BUILD), 1) ifeq ($(KERNEL_BUILD), 1)
# These are configurable via Kconfig for kernel-based builds # These are configurable via Kconfig for kernel-based builds
# Need to explicitly configure for Android-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 AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio
endif endif

View File

@@ -13,7 +13,7 @@ LOCAL_PATH := $(call my-dir)
ifneq ($(findstring vendor,$(LOCAL_PATH)),) ifneq ($(findstring vendor,$(LOCAL_PATH)),)
ifneq ($(findstring opensource,$(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 endif # opensource
DLKM_DIR := $(TOP)/device/qcom/common/dlkm DLKM_DIR := $(TOP)/device/qcom/common/dlkm

View File

@@ -10,7 +10,7 @@ endif
ifeq ($(KERNEL_BUILD), 1) ifeq ($(KERNEL_BUILD), 1)
# These are configurable via Kconfig for kernel-based builds # These are configurable via Kconfig for kernel-based builds
# Need to explicitly configure for Android-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 AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio
endif endif

View File

@@ -12,7 +12,7 @@ LOCAL_PATH := $(call my-dir)
ifneq ($(findstring vendor,$(LOCAL_PATH)),) ifneq ($(findstring vendor,$(LOCAL_PATH)),)
ifneq ($(findstring opensource,$(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 endif # opensource
DLKM_DIR := $(TOP)/device/qcom/common/dlkm DLKM_DIR := $(TOP)/device/qcom/common/dlkm

View File

@@ -10,7 +10,7 @@ endif
ifeq ($(KERNEL_BUILD), 1) ifeq ($(KERNEL_BUILD), 1)
# These are configurable via Kconfig for kernel-based builds # These are configurable via Kconfig for kernel-based builds
# Need to explicitly configure for Android-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 AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio
endif endif

View File

@@ -29,7 +29,7 @@ LOCAL_PATH := $(call my-dir)
ifneq ($(findstring vendor,$(LOCAL_PATH)),) ifneq ($(findstring vendor,$(LOCAL_PATH)),)
ifneq ($(findstring opensource,$(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 endif # opensource
DLKM_DIR := $(TOP)/device/qcom/common/dlkm DLKM_DIR := $(TOP)/device/qcom/common/dlkm

View File

@@ -11,7 +11,7 @@ endif
ifeq ($(KERNEL_BUILD), 1) ifeq ($(KERNEL_BUILD), 1)
# These are configurable via Kconfig for kernel-based builds # These are configurable via Kconfig for kernel-based builds
# Need to explicitly configure for Android-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 AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio
endif endif

View File

@@ -17,7 +17,7 @@ LOCAL_PATH := $(call my-dir)
ifneq ($(findstring vendor,$(LOCAL_PATH)),) ifneq ($(findstring vendor,$(LOCAL_PATH)),)
ifneq ($(findstring opensource,$(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 endif # opensource
DLKM_DIR := $(TOP)/device/qcom/common/dlkm DLKM_DIR := $(TOP)/device/qcom/common/dlkm

View File

@@ -11,7 +11,7 @@ endif
ifeq ($(KERNEL_BUILD), 1) ifeq ($(KERNEL_BUILD), 1)
# These are configurable via Kconfig for kernel-based builds # These are configurable via Kconfig for kernel-based builds
# Need to explicitly configure for Android-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 AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio
endif endif

View File

@@ -29,7 +29,7 @@ LOCAL_PATH := $(call my-dir)
ifneq ($(findstring vendor,$(LOCAL_PATH)),) ifneq ($(findstring vendor,$(LOCAL_PATH)),)
ifneq ($(findstring opensource,$(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 endif # opensource
DLKM_DIR := $(TOP)/device/qcom/common/dlkm DLKM_DIR := $(TOP)/device/qcom/common/dlkm

View File

@@ -9,7 +9,7 @@ endif
ifeq ($(KERNEL_BUILD), 1) ifeq ($(KERNEL_BUILD), 1)
# These are configurable via Kconfig for kernel-based builds # These are configurable via Kconfig for kernel-based builds
# Need to explicitly configure for Android-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 AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio
endif endif

View File

@@ -29,7 +29,7 @@ LOCAL_PATH := $(call my-dir)
ifneq ($(findstring vendor,$(LOCAL_PATH)),) ifneq ($(findstring vendor,$(LOCAL_PATH)),)
ifneq ($(findstring opensource,$(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 endif # opensource
DLKM_DIR := $(TOP)/device/qcom/common/dlkm DLKM_DIR := $(TOP)/device/qcom/common/dlkm

View File

@@ -9,7 +9,7 @@ endif
ifeq ($(KERNEL_BUILD), 1) ifeq ($(KERNEL_BUILD), 1)
# These are configurable via Kconfig for kernel-based builds # These are configurable via Kconfig for kernel-based builds
# Need to explicitly configure for Android-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 AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio
endif endif

View File

@@ -29,7 +29,7 @@ LOCAL_PATH := $(call my-dir)
ifneq ($(findstring vendor,$(LOCAL_PATH)),) ifneq ($(findstring vendor,$(LOCAL_PATH)),)
ifneq ($(findstring opensource,$(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 endif # opensource
DLKM_DIR := $(TOP)/device/qcom/common/dlkm DLKM_DIR := $(TOP)/device/qcom/common/dlkm

View File

@@ -29,7 +29,7 @@ LOCAL_PATH := $(call my-dir)
ifneq ($(findstring vendor,$(LOCAL_PATH)),) ifneq ($(findstring vendor,$(LOCAL_PATH)),)
ifneq ($(findstring opensource,$(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 endif # opensource
DLKM_DIR := $(TOP)/device/qcom/common/dlkm DLKM_DIR := $(TOP)/device/qcom/common/dlkm

View File

@@ -9,7 +9,7 @@ endif
ifeq ($(KERNEL_BUILD), 1) ifeq ($(KERNEL_BUILD), 1)
# These are configurable via Kconfig for kernel-based builds # These are configurable via Kconfig for kernel-based builds
# Need to explicitly configure for Android-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 AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio
endif endif