Snap for 5143127 from cac7d732a1ff52698d81704f926b7f10b761ee6a to qt-release

Change-Id: Ifa4e370c909180f060a8bcc8a60a8e2bd561c0fd

2 files changed, 75 insertions, 116 deletions

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..5ef4c39
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,75 @@
+cc_defaults {
+    name: "libxcam_defaults",
+
+    cflags: [
+        // XCam Version Num 1.1.0
+        "-DXCAM_VERSION=0x110",
+
+        "-fPIC",
+        "-W",
+        "-Wall",
+        "-D_REENTRANT",
+        "-Wformat",
+        "-Wno-unused-parameter",
+        "-Wformat-security",
+        "-fstack-protector",
+        "-DANDROID",
+    ],
+
+    local_include_dirs: [
+        "xcore",
+        "modules",
+    ],
+}
+
+// For libxcam
+// =================================================
+cc_library_shared {
+    name: "libxcam",
+    defaults: ["libxcam_defaults"],
+
+    srcs: [
+        "xcore/buffer_pool.cpp",
+        "xcore/calibration_parser.cpp",
+        "xcore/file_handle.cpp",
+        "xcore/image_file_handle.cpp",
+        "xcore/image_handler.cpp",
+        "xcore/surview_fisheye_dewarp.cpp",
+        "xcore/thread_pool.cpp",
+        "xcore/video_buffer.cpp",
+        "xcore/worker.cpp",
+        "xcore/xcam_buffer.cpp",
+        "xcore/xcam_common.cpp",
+        "xcore/xcam_thread.cpp",
+        "xcore/xcam_utils.cpp",
+        "xcore/interface/blender.cpp",
+        "xcore/interface/feature_match.cpp",
+        "xcore/interface/geo_mapper.cpp",
+        "xcore/interface/stitcher.cpp",
+
+        "modules/soft/soft_blender.cpp",
+        "modules/soft/soft_blender_tasks_priv.cpp",
+        "modules/soft/soft_copy_task.cpp",
+        "modules/soft/soft_geo_mapper.cpp",
+        "modules/soft/soft_geo_tasks_priv.cpp",
+        "modules/soft/soft_handler.cpp",
+        "modules/soft/soft_stitcher.cpp",
+        "modules/soft/soft_video_buf_allocator.cpp",
+        "modules/soft/soft_worker.cpp",
+    ],
+
+    rtti: true,
+}
+
+// For test-soft-image
+// =================================================
+cc_test {
+    name: "test-soft-image",
+    defaults: ["libxcam_defaults"],
+
+    gtest: false,
+    srcs: ["tests/test-soft-image.cpp"],
+    shared_libs: ["libxcam"],
+
+    local_include_dirs: ["tests"],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 87c00c1..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,116 +0,0 @@
-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 += $(XCAM_VERSION_CFLAGS) -DANDROID
-
-ifeq ($(ENABLE_DEBUG), 1)
-XCAM_CFLAGS += -DDEBUG
-endif
-
-ENABLE_OPENCV := 0
-ifneq ($(filter $(TARGET_ARCH),x86 x86_64),)
-
-ifneq ($(wildcard external/opencv),)
-ENABLE_OPENCV := 1
-XCAM_CFLAGS += -DHAVE_OPENCV=1
-endif
-
-endif
-
-
-# For libxcam
-# =================================================
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libxcam
-LOCAL_MODULE_TAGS := optional
-
-ifeq ($(ENABLE_OPENCV), 1)
-LOCAL_STATIC_LIBRARIES := libcv libcxcore
-endif
-
-XCAM_XCORE_SRC_FILES := \
-    xcore/buffer_pool.cpp \
-    xcore/calibration_parser.cpp \
-    xcore/file_handle.cpp \
-    xcore/image_file_handle.cpp \
-    xcore/image_handler.cpp \
-    xcore/surview_fisheye_dewarp.cpp \
-    xcore/thread_pool.cpp \
-    xcore/video_buffer.cpp \
-    xcore/worker.cpp \
-    xcore/xcam_buffer.cpp \
-    xcore/xcam_common.cpp \
-    xcore/xcam_thread.cpp \
-    xcore/xcam_utils.cpp \
-    xcore/interface/blender.cpp \
-    xcore/interface/feature_match.cpp \
-    xcore/interface/geo_mapper.cpp \
-    xcore/interface/stitcher.cpp \
-    $(NULL)
-
-XCAM_SOFT_SRC_FILES := \
-    modules/soft/soft_blender.cpp \
-    modules/soft/soft_blender_tasks_priv.cpp \
-    modules/soft/soft_copy_task.cpp \
-    modules/soft/soft_geo_mapper.cpp \
-    modules/soft/soft_geo_tasks_priv.cpp \
-    modules/soft/soft_handler.cpp \
-    modules/soft/soft_stitcher.cpp \
-    modules/soft/soft_video_buf_allocator.cpp \
-    modules/soft/soft_worker.cpp \
-    $(NULL)
-
-ifeq ($(ENABLE_OPENCV), 1)
-XCAM_SOFT_SRC_FILES += modules/soft/cv_capi_feature_match.cpp
-endif
-
-LOCAL_SRC_FILES := $(XCAM_XCORE_SRC_FILES) $(XCAM_SOFT_SRC_FILES)
-
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/xcore \
-    $(LOCAL_PATH)/modules \
-    $(NULL)
-
-ifeq ($(ENABLE_OPENCV), 1)
-LOCAL_C_INCLUDES += \
-    external/opencv/cv/include/ \
-    external/opencv/cxcore/include \
-    $(NULL)
-endif
-
-LOCAL_CFLAGS := $(XCAM_CFLAGS)
-LOCAL_CPPFLAGS := $(LOCAL_CFLAGS) -frtti
-
-include $(BUILD_SHARED_LIBRARY)
-
-
-# For test-soft-image
-# =================================================
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := test-soft-image
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SHARED_LIBRARIES := libxcam
-
-LOCAL_SRC_FILES := \
-    tests/test-soft-image.cpp
-    $(NULL)
-
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/xcore \
-    $(LOCAL_PATH)/modules \
-    $(LOCAL_PATH)/tests \
-    $(NULL)
-
-LOCAL_CFLAGS := $(XCAM_CFLAGS)
-LOCAL_CPPFLAGS := $(LOCAL_CFLAGS)
-
-include $(BUILD_EXECUTABLE)
-