Set lock file path at build time.

Jira: None
Test: File path on
      Android: /vendor/etc/hwc.lock
      Linux: {prefix}/etc/hwc.lock

Signed-off-by: Harish Krupo <harish.krupo.kps@intel.com>

diff --git a/common/Android.mk b/common/Android.mk
index 30bef8f..9328881 100644 (file)
--- a/common/Android.mk
+++ b/common/Android.mk
@@ -119,6 +119,7 @@ LOCAL_CPPFLAGS += \
         -std=c++14 -D_GNU_SOURCE=1 -D_FILE_OFFSET_BITS=64 \
         -Wall -Wsign-compare -Wpointer-arith \
         -Wcast-qual -Wcast-align \
+       -DLOCK_DIR_PREFIX='"/vendor/etc"' \
         -D_GNU_SOURCE=1 -D_FILE_OFFSET_BITS=64 \
         -O3
 

diff --git a/common/Makefile.am b/common/Makefile.am
index cf66302..87e4fda 100644 (file)
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -26,6 +26,7 @@ MAINTAINERCLEANFILES = ChangeLog INSTALL
 AM_CPP_INCLUDES = -Icore -Iutils -Icompositor -Idisplay -I../os/ -I../os/linux/ -I../public/ -I../wsi/
 AM_CPPFLAGS = -std=c++11 -fPIC -O2 -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fPIE -DENABLE_DOUBLE_BUFFERING
 AM_CPPFLAGS += $(AM_CPP_INCLUDES) $(CWARNFLAGS) $(DRM_CFLAGS) $(DEBUG_CFLAGS) -Wformat -Wformat-security
+AM_CPPFLAGS += -DLOCK_DIR_PREFIX='"${prefix}/etc"'
 
 if !ENABLE_GBM
 AM_CPPFLAGS += -DUSE_MINIGBM

diff --git a/common/core/gpudevice.cpp b/common/core/gpudevice.cpp
index 89be4e3..37dbba4 100644 (file)
--- a/common/core/gpudevice.cpp
+++ b/common/core/gpudevice.cpp
@@ -59,7 +59,7 @@ bool GpuDevice::Initialize() {
       ETRACE("Failed to initalize thread for GpuDevice. %s", PRINTERROR());
     }
   } else {
-    ITRACE("Failed to open /vendor/hwc.lock file!");
+    ITRACE("Failed to open " LOCK_DIR_PREFIX "/hwc.lock file!");
   }
 
   return true;