aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWind Yuan <feng.yuan@intel.com>2017-12-04 14:32:20 +0800
committerwindyuan <feng.yuan@intel.com>2017-12-04 16:52:17 +0800
commit4b38f2a7deb59967414b68b245968307833fec1a (patch)
tree9c488c0c74b0271020296cfae45e61e1e39bb97b
parent4e686ef8ab600c3b2bdd110cbded49d853375ef6 (diff)
downloadlibxcam-4b38f2a7deb59967414b68b245968307833fec1a.tar.gz
build: fix bug of android build error
Signed-off-by: Wind Yuan <feng.yuan@intel.com>
-rw-r--r--Android.mk5
-rw-r--r--modules/soft/soft_stitcher.h2
2 files changed, 5 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index e94e4a4..35a14a4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,7 +1,10 @@
LOCAL_PATH:= $(call my-dir)
+# XCam Version Num 1.1.0
+XCAM_VERSION_CFLAGS := -DXCAM_VERSION=0x110
+
XCAM_CFLAGS := -fPIC -W -Wall -D_REENTRANT -Wformat -Wno-unused-parameter -Wformat-security -fstack-protector
-XCAM_CFLAGS += -DANDROID
+XCAM_CFLAGS += $(XCAM_VERSION_CFLAGS) -DANDROID
ifeq ($(ENABLE_DEBUG), 1)
XCAM_CFLAGS += -DDEBUG
diff --git a/modules/soft/soft_stitcher.h b/modules/soft/soft_stitcher.h
index 693b7b6..fd5b4a5 100644
--- a/modules/soft/soft_stitcher.h
+++ b/modules/soft/soft_stitcher.h
@@ -23,7 +23,7 @@
#include <xcam_std.h>
#include <interface/stitcher.h>
-#include <soft_handler.h>
+#include <soft/soft_handler.h>
namespace XCam {