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

Commit 03072ce6 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "audio-lnx: ANDROID_BUILD_TOP is deprecated."

parents 979ae8e7 85e9e160

asoc/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

asoc/Kbuild

+1 −1
Original line number Diff line number Diff line
@@ -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

asoc/codecs/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

asoc/codecs/Kbuild

+1 −1
Original line number Diff line number Diff line
@@ -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

asoc/codecs/aqt1000/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -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