Merge "Convert LegacyCamera's Android.mk to Android.bp"
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..b2997c5
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,16 @@
+android_app {
+ name: "LegacyCamera",
+
+ srcs: ["src/**/*.java"],
+
+ //sdk_version: "current",
+
+ platform_apis: true,
+
+ jni_libs: ["libjni_legacymosaic"],
+
+ optimize: {
+ proguard_flags_files: ["proguard.flags"],
+ },
+
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 65f8ac8..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := LegacyCamera
-#LOCAL_SDK_VERSION := current
-LOCAL_PRIVATE_PLATFORM_APIS := true
-
-LOCAL_JNI_SHARED_LIBRARIES := libjni_legacymosaic
-
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-
-include $(BUILD_PACKAGE)
-
-# Use the following include to make our test apk.
-include $(call all-makefiles-under, $(LOCAL_PATH))
diff --git a/jni/Android.bp b/jni/Android.bp
new file mode 100644
index 0000000..4bce538
--- /dev/null
+++ b/jni/Android.bp
@@ -0,0 +1,65 @@
+cc_library_shared {
+ name: "libjni_legacymosaic",
+
+ local_include_dirs: [
+ "feature_stab/db_vlvm",
+ "feature_stab/src",
+ "feature_stab/src/dbreg",
+ "feature_mos/src",
+ "feature_mos/src/mosaic",
+ ],
+
+ cflags: [
+ "-O3",
+ "-DNDEBUG",
+
+ "-Wall",
+ "-Werror",
+
+ // suppress existing non-critical warnings
+ "-Wno-gnu-static-float-init",
+ "-Wno-non-literal-null-conversion",
+ "-Wno-self-assign",
+ "-Wno-unused-parameter",
+ "-Wno-unused-variable",
+ "-Wno-unused-function",
+ ],
+ cppflags: ["-std=gnu++98"],
+
+ srcs: [
+ "feature_mos_jni.cpp",
+ "mosaic_renderer_jni.cpp",
+ "feature_mos/src/mosaic/trsMatrix.cpp",
+ "feature_mos/src/mosaic/AlignFeatures.cpp",
+ "feature_mos/src/mosaic/Blend.cpp",
+ "feature_mos/src/mosaic/Delaunay.cpp",
+ "feature_mos/src/mosaic/ImageUtils.cpp",
+ "feature_mos/src/mosaic/Mosaic.cpp",
+ "feature_mos/src/mosaic/Pyramid.cpp",
+ "feature_mos/src/mosaic_renderer/Renderer.cpp",
+ "feature_mos/src/mosaic_renderer/WarpRenderer.cpp",
+ "feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.cpp",
+ "feature_mos/src/mosaic_renderer/YVURenderer.cpp",
+ "feature_mos/src/mosaic_renderer/FrameBuffer.cpp",
+ "feature_stab/db_vlvm/db_feature_detection.cpp",
+ "feature_stab/db_vlvm/db_feature_matching.cpp",
+ "feature_stab/db_vlvm/db_framestitching.cpp",
+ "feature_stab/db_vlvm/db_image_homography.cpp",
+ "feature_stab/db_vlvm/db_rob_image_homography.cpp",
+ "feature_stab/db_vlvm/db_utilities.cpp",
+ "feature_stab/db_vlvm/db_utilities_camera.cpp",
+ "feature_stab/db_vlvm/db_utilities_indexing.cpp",
+ "feature_stab/db_vlvm/db_utilities_linalg.cpp",
+ "feature_stab/db_vlvm/db_utilities_poly.cpp",
+ "feature_stab/src/dbreg/dbreg.cpp",
+ "feature_stab/src/dbreg/dbstabsmooth.cpp",
+ "feature_stab/src/dbreg/vp_motionmodel.c",
+ ],
+
+ shared_libs: [
+ "liblog",
+ "libnativehelper",
+ "libGLESv2",
+ ],
+
+}
diff --git a/jni/Android.mk b/jni/Android.mk
deleted file mode 100755
index 9275849..0000000
--- a/jni/Android.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/feature_stab/db_vlvm \
- $(LOCAL_PATH)/feature_stab/src \
- $(LOCAL_PATH)/feature_stab/src/dbreg \
- $(LOCAL_PATH)/feature_mos/src \
- $(LOCAL_PATH)/feature_mos/src/mosaic
-
-LOCAL_CFLAGS := -O3 -DNDEBUG
-LOCAL_CFLAGS += -Wall -Werror
-# suppress existing non-critical warnings
-LOCAL_CFLAGS += \
- -Wno-gnu-static-float-init \
- -Wno-non-literal-null-conversion \
- -Wno-self-assign \
- -Wno-unused-parameter \
- -Wno-unused-variable \
- -Wno-unused-function \
-
-LOCAL_CPPFLAGS := -std=gnu++98
-
-LOCAL_SRC_FILES := \
- feature_mos_jni.cpp \
- mosaic_renderer_jni.cpp \
- feature_mos/src/mosaic/trsMatrix.cpp \
- feature_mos/src/mosaic/AlignFeatures.cpp \
- feature_mos/src/mosaic/Blend.cpp \
- feature_mos/src/mosaic/Delaunay.cpp \
- feature_mos/src/mosaic/ImageUtils.cpp \
- feature_mos/src/mosaic/Mosaic.cpp \
- feature_mos/src/mosaic/Pyramid.cpp \
- feature_mos/src/mosaic_renderer/Renderer.cpp \
- feature_mos/src/mosaic_renderer/WarpRenderer.cpp \
- feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.cpp \
- feature_mos/src/mosaic_renderer/YVURenderer.cpp \
- feature_mos/src/mosaic_renderer/FrameBuffer.cpp \
- feature_stab/db_vlvm/db_feature_detection.cpp \
- feature_stab/db_vlvm/db_feature_matching.cpp \
- feature_stab/db_vlvm/db_framestitching.cpp \
- feature_stab/db_vlvm/db_image_homography.cpp \
- feature_stab/db_vlvm/db_rob_image_homography.cpp \
- feature_stab/db_vlvm/db_utilities.cpp \
- feature_stab/db_vlvm/db_utilities_camera.cpp \
- feature_stab/db_vlvm/db_utilities_indexing.cpp \
- feature_stab/db_vlvm/db_utilities_linalg.cpp \
- feature_stab/db_vlvm/db_utilities_poly.cpp \
- feature_stab/src/dbreg/dbreg.cpp \
- feature_stab/src/dbreg/dbstabsmooth.cpp \
- feature_stab/src/dbreg/vp_motionmodel.c
-
-LOCAL_SHARED_LIBRARIES := liblog libnativehelper libGLESv2
-#LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -ldl -llog -lGLESv2 -L$(TARGET_OUT)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_MODULE := libjni_legacymosaic
-include $(BUILD_SHARED_LIBRARY)
diff --git a/tests/Android.bp b/tests/Android.bp
new file mode 100644
index 0000000..9467427
--- /dev/null
+++ b/tests/Android.bp
@@ -0,0 +1,16 @@
+android_test {
+ name: "LegacyCameraTests",
+
+ libs: [
+ "android.test.runner",
+ "android.test.base",
+ ],
+ static_libs: ["junit"],
+
+ srcs: ["src/**/*.java"],
+
+ platform_apis: true,
+
+ instrumentation_for: "LegacyCamera",
+
+}
diff --git a/tests/Android.mk b/tests/Android.mk
deleted file mode 100644
index d6d0a8d..0000000
--- a/tests/Android.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base
-LOCAL_STATIC_JAVA_LIBRARIES := junit
-
-# Include all test java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := LegacyCameraTests
-LOCAL_PRIVATE_PLATFORM_APIS := true
-
-LOCAL_INSTRUMENTATION_FOR := LegacyCamera
-
-include $(BUILD_PACKAGE)
-
-
