4 files changed, 58 insertions, 61 deletions
diff --git a/tests/Camera2Tests/SmartCamera/SimpleCamera/jni/Android.bp b/tests/Camera2Tests/SmartCamera/SimpleCamera/jni/Android.bp
new file mode 100644
index 000000000000..0b16b0ecf0c1
--- /dev/null
+++ b/tests/Camera2Tests/SmartCamera/SimpleCamera/jni/Android.bp
@@ -0,0 +1,41 @@
+// Copyright (C) 2013 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+cc_test_library {
+    name: "libsmartcamera_jni",
+
+    sdk_version: "14",
+
+    srcs: [
+        "contrast.cpp",
+        "brightness.cpp",
+        "exposure.cpp",
+        "colorspace.cpp",
+        "histogram.cpp",
+        "frametovalues.cpp",
+        "pixelutils.cpp",
+        "sobeloperator.cpp",
+        "stats_scorer.cpp",
+    ],
+
+    cflags: [
+        "-Wall",
+        "-Wextra",
+        "-Werror",
+        "-Wno-unused-parameter",
+    ],
+
+    stl: "c++_static",
+}
diff --git a/tests/Camera2Tests/SmartCamera/SimpleCamera/jni/Android.mk b/tests/Camera2Tests/SmartCamera/SimpleCamera/jni/Android.mk
deleted file mode 100644
index 6e0d58a2a881..000000000000
--- a/tests/Camera2Tests/SmartCamera/SimpleCamera/jni/Android.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright (C) 2013 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-FILTERFW_NATIVE_PATH := $(call my-dir)
-
-
-#
-# Build module libfilterframework
-#
-LOCAL_PATH := $(FILTERFW_NATIVE_PATH)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_SDK_VERSION := 14
-
-LOCAL_MODULE := libsmartcamera_jni
-
-LOCAL_SRC_FILES := contrast.cpp \
-                brightness.cpp \
-                exposure.cpp \
-                colorspace.cpp \
-                histogram.cpp \
-                frametovalues.cpp \
-                pixelutils.cpp \
-                sobeloperator.cpp \
-                stats_scorer.cpp
-
-LOCAL_CFLAGS += -Wall -Wextra -Werror -Wno-unused-parameter
-
-LOCAL_NDK_STL_VARIANT := c++_static
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/tests/touchlag/Android.bp b/tests/touchlag/Android.bp
new file mode 100644
index 000000000000..2610cb386da2
--- /dev/null
+++ b/tests/touchlag/Android.bp
@@ -0,0 +1,17 @@
+cc_test {
+    name: "test-touchlag",
+    gtest: false,
+
+    srcs: ["touchlag.cpp"],
+
+    shared_libs: [
+        "libcutils",
+        "libutils",
+    ],
+
+    cflags: [
+        "-Wall",
+        "-Wextra",
+        "-Werror",
+    ],
+}
diff --git a/tests/touchlag/Android.mk b/tests/touchlag/Android.mk
deleted file mode 100644
index 70b198917547..000000000000
--- a/tests/touchlag/Android.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= \
-	touchlag.cpp
-
-LOCAL_SHARED_LIBRARIES := \
-	libcutils libutils \
-
-LOCAL_MODULE:= test-touchlag
-
-LOCAL_CFLAGS += -Wall -Wextra -Werror
-
-LOCAL_MODULE_TAGS := tests
-
-include $(BUILD_EXECUTABLE)