From 1beac7c31b39c3900c1ee9fe10fc0c9ffef06e79 Mon Sep 17 00:00:00 2001
From: Vignesh Kulothungan <vigneshk@codeaurora.org>
Date: Mon, 17 Sep 2018 15:12:07 -0700
Subject: [PATCH] hal: post_proc: make definition of instance id independent

Definition of instance id is misplaced inside definition of
hardware accelerated effects in makefile. Moving definition of
instance id outside to break the dependency. When instance id
flag is disabled, it causes acdb_audio_cal_cfg_t structure size
mismatch between HAL and ACDB loader.

CRs-Fixed: 2315791
Change-Id: Iedb50b10f03193c67494cdfc30223f1bd93a8c90
---
 post_proc/Android.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/post_proc/Android.mk b/post_proc/Android.mk
index 5da769c4..4441ab01 100644
--- a/post_proc/Android.mk
+++ b/post_proc/Android.mk
@@ -39,6 +39,10 @@ ifeq ($(strip $(AUDIO_FEATURE_ENABLED_AUDIOSPHERE)),true)
     LOCAL_SRC_FILES += asphere.c
 endif
 
+ifeq ($(strip $(AUDIO_FEATURE_ENABLED_INSTANCE_ID)), true)
+    LOCAL_CFLAGS += -DINSTANCE_ID_ENABLED
+endif
+
 LOCAL_CFLAGS+= -O2 -fvisibility=hidden
 
 ifneq ($(strip $(AUDIO_FEATURE_DISABLED_DTS_EAGLE)),true)
@@ -110,10 +114,6 @@ ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DTS_EAGLE)), true)
 LOCAL_CFLAGS += -DHW_ACC_HPX
 endif
 
-ifeq ($(strip $(AUDIO_FEATURE_ENABLED_INSTANCE_ID)), true)
-    LOCAL_CFLAGS += -DINSTANCE_ID_ENABLED
-endif
-
 LOCAL_MODULE:= libhwacceffectswrapper
 LOCAL_VENDOR_MODULE := true