summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2017-04-20 14:31:47 -0700
committerColin Cross <ccross@android.com>2017-05-02 13:55:44 -0700
commitfc442e1b02a3cfbb32414c6af8c63af3503cd1d0 (patch)
treeddb4165021d96c20b8871774e717cff016df8448 /test
parentf04b34c5b131c20651c0b4a9bba305d73d88b2fb (diff)
downloadandroid_external_libavc-fc442e1b02a3cfbb32414c6af8c63af3503cd1d0.tar.gz
android_external_libavc-fc442e1b02a3cfbb32414c6af8c63af3503cd1d0.tar.bz2
android_external_libavc-fc442e1b02a3cfbb32414c6af8c63af3503cd1d0.zip
Convert external/libavc to Android.bp
See build/soong/README.md for more information. Test: m -j checkbuild Change-Id: I302d98be9e99fce7284a44af329e22f38a2f066a
Diffstat (limited to 'test')
-rw-r--r--test/Android.bp41
-rw-r--r--test/Android.mk8
-rw-r--r--test/decoder.mk13
-rw-r--r--test/encoder.mk13
4 files changed, 41 insertions, 34 deletions
diff --git a/test/Android.bp b/test/Android.bp
new file mode 100644
index 0000000..5fef68b
--- /dev/null
+++ b/test/Android.bp
@@ -0,0 +1,41 @@
+cc_test {
+ name: "avcdec",
+ gtest: false,
+
+ cflags: [
+ "-DPROFILE_ENABLE",
+ "-DARM",
+ "-DMD5_DISABLE",
+ "-fPIC",
+ ],
+ local_include_dirs: [
+ "decoder/",
+ ],
+ srcs: ["decoder/main.c"],
+ static_libs: ["libavcdec"],
+ shared_libs: ["liblog"],
+}
+
+cc_test {
+ name: "avcenc",
+ gtest: false,
+
+ cflags: [
+ "-DPROFILE_ENABLE",
+ "-DARM",
+ "-DMD5_DISABLE",
+ "-fPIC",
+ "-pie",
+ ],
+ local_include_dirs: [
+ "encoder/",
+ ],
+ srcs: [
+ "encoder/main.c",
+ "encoder/psnr.c",
+ "encoder/input.c",
+ "encoder/output.c",
+ "encoder/recon.c",
+ ],
+ static_libs: ["libavcenc"],
+}
diff --git a/test/Android.mk b/test/Android.mk
deleted file mode 100644
index 0085832..0000000
--- a/test/Android.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-# encoder
-include $(LOCAL_PATH)/encoder.mk
-
-# decoder
-include $(LOCAL_PATH)/decoder.mk
diff --git a/test/decoder.mk b/test/decoder.mk
deleted file mode 100644
index 0dda948..0000000
--- a/test/decoder.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := avcdec
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_CFLAGS := -DPROFILE_ENABLE -DARM -DMD5_DISABLE -fPIC
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../decoder $(LOCAL_PATH)/../common $(LOCAL_PATH)/decoder/
-LOCAL_SRC_FILES := decoder/main.c
-LOCAL_STATIC_LIBRARIES := libavcdec
-LOCAL_SHARED_LIBRARIES := liblog
-include $(BUILD_EXECUTABLE)
diff --git a/test/encoder.mk b/test/encoder.mk
deleted file mode 100644
index 9a0980e..0000000
--- a/test/encoder.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := avcenc
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_CFLAGS := -DPROFILE_ENABLE -DARM -DMD5_DISABLE -fPIC -pie
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../encoder $(LOCAL_PATH)/../common $(LOCAL_PATH)/encoder/
-LOCAL_SRC_FILES := encoder/main.c encoder/psnr.c encoder/input.c encoder/output.c encoder/recon.c
-LOCAL_STATIC_LIBRARIES := libavcenc
-
-include $(BUILD_EXECUTABLE)