commit 1beac7c31b39c3900c1ee9fe10fc0c9ffef06e79
author Vignesh Kulothungan <vigneshk@codeaurora.org> Mon Sep 17 15:12:07 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Oct 12 11:28:34 2018 -0700
tree 6da6c266feb31424421838de60e9ff5ab7213694
parent b9c5999543764311a8a9b57b097fa1973d5a27ca

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

diff --git a/post_proc/Android.mk b/post_proc/Android.mk
index 5da769c..4441ab0 100644
--- a/post_proc/Android.mk
+++ b/post_proc/Android.mk
@@ -39,6 +39,10 @@
     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 @@
 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