Merge "Convert LegacyCamera's Android.mk to Android.bp" am: b0841adc85 am: 88d9bc2fb3 am: 8a3c835ccar_aml_301500702android-mainline-12.0.0_r55android-mainline-12.0.0_r112android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseandroid11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseaml_tz2_305400100

Change-Id: I9eef718cd178e36aa2b4e1ce6a73bdc91106358c

6 files changed, 97 insertions, 99 deletions

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 00000000..b2997c5c
--- /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 65f8ac87..00000000
--- 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 00000000..4bce5380
--- /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 92758494..00000000
--- 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 00000000..9467427e
--- /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 d6d0a8d9..00000000
--- 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)
-
-