Merge "Convert Android.mk file to Android.bp" am: bbb9bfb449 am: 1c81307b20

am: 1826d9584c

Change-Id: Idfb61bfb95d7a7e74395104676367c62686b9c31

4 files changed, 29 insertions, 34 deletions

diff --git a/tests/native-media/Android.bp b/tests/native-media/Android.bp
new file mode 100644
index 0000000..8457bd0
--- /dev/null
+++ b/tests/native-media/Android.bp
@@ -0,0 +1,10 @@
+android_test {
+    name: "native-media",
+    srcs: [
+        "src/com/example/nativemedia/NativeMedia.java",
+        "src/com/example/nativemedia/MyGLSurfaceView.java",
+    ],
+    sdk_version: "current",
+    certificate: "platform",
+    jni_libs: ["libnative-media-jni"],
+}
diff --git a/tests/native-media/Android.mk b/tests/native-media/Android.mk
deleted file mode 100644
index 48d7546..0000000
--- a/tests/native-media/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_SRC_FILES := \
-    src/com/example/nativemedia/NativeMedia.java \
-    src/com/example/nativemedia/MyGLSurfaceView.java
-
-LOCAL_PACKAGE_NAME := native-media
-LOCAL_SDK_VERSION := current
-LOCAL_CERTIFICATE := platform
-
-LOCAL_JNI_SHARED_LIBRARIES := libnative-media-jni
-
-include $(BUILD_PACKAGE)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/native-media/jni/Android.bp b/tests/native-media/jni/Android.bp
new file mode 100644
index 0000000..28350d0
--- /dev/null
+++ b/tests/native-media/jni/Android.bp
@@ -0,0 +1,19 @@
+cc_test_library {
+    name: "libnative-media-jni",
+    srcs: ["native-media-jni.c"],
+    cflags: [
+        "-Werror",
+        "-Wall",
+        "-UNDEBUG",
+        "-Wno-unused-parameter",
+    ],
+    include_dirs: ["frameworks/wilhelm/include"],
+    gtest: false,
+    shared_libs: [
+        "libutils",
+        "liblog",
+        "libOpenMAXAL",
+        "libandroid",
+    ],
+
+}
diff --git a/tests/native-media/jni/Android.mk b/tests/native-media/jni/Android.mk
deleted file mode 100644
index e0b7edb..0000000
--- a/tests/native-media/jni/Android.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-LOCAL_MODULE    := libnative-media-jni
-LOCAL_SRC_FILES := native-media-jni.c
-LOCAL_CFLAGS := -Werror -Wall
-LOCAL_CFLAGS += -I$(call include-path-for, wilhelm)
-LOCAL_CFLAGS += -UNDEBUG -Wno-unused-parameter
-
-LOCAL_SHARED_LIBRARIES += libutils liblog libOpenMAXAL libandroid
-
-
-include $(BUILD_SHARED_LIBRARY)