summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2017-04-20 14:12:11 -0700
committerColin Cross <ccross@android.com>2017-04-26 10:37:22 -0700
commit39449cf74dd18e31e0afc4e76c5ef46590b86cbc (patch)
tree4c9554700f58cd9ec535ebb677d2a4a7e8b2aaeb /test
parent1755319b711454dcfbf2e3b66bf1b62d422e856f (diff)
downloadplatform_external_libmpeg2-39449cf74dd18e31e0afc4e76c5ef46590b86cbc.tar.gz
platform_external_libmpeg2-39449cf74dd18e31e0afc4e76c5ef46590b86cbc.tar.bz2
platform_external_libmpeg2-39449cf74dd18e31e0afc4e76c5ef46590b86cbc.zip
See build/soong/README.md for more information. Reapplies I9d246052f8b77a8f8c5b3e9f13358adea1c3a93e with a fix for building arm without neon. Test: m -j checkbuild Change-Id: I25ede8b612b662461d8cfca9ab69307c6efbb27f
Diffstat (limited to 'test')
-rw-r--r--test/Android.bp16
-rw-r--r--test/Android.mk5
-rw-r--r--test/decoder.mk13
3 files changed, 16 insertions, 18 deletions
diff --git a/test/Android.bp b/test/Android.bp
new file mode 100644
index 0000000..d1cbc2b
--- /dev/null
+++ b/test/Android.bp
@@ -0,0 +1,16 @@
+cc_binary {
+ name: "mpeg2dec",
+
+ cflags: [
+ "-DPROFILE_ENABLE",
+ "-DMD5_DISABLE",
+ "-DARM",
+ "-fPIC",
+ ],
+ local_include_dirs: [
+ "decoder/",
+ ],
+ srcs: ["decoder/main.c"],
+ static_libs: ["libmpeg2dec"],
+ shared_libs: ["liblog"],
+}
diff --git a/test/Android.mk b/test/Android.mk
deleted file mode 100644
index 7807003..0000000
--- a/test/Android.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-# decoder
-include $(LOCAL_PATH)/decoder.mk
diff --git a/test/decoder.mk b/test/decoder.mk
deleted file mode 100644
index 9296620..0000000
--- a/test/decoder.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := mpeg2dec
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_CFLAGS := -DPROFILE_ENABLE -DMD5_DISABLE -DARM -fPIC
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../decoder $(LOCAL_PATH)/../common $(LOCAL_PATH)/decoder/
-LOCAL_SRC_FILES := decoder/main.c
-LOCAL_STATIC_LIBRARIES := libmpeg2dec
-LOCAL_SHARED_LIBRARIES := liblog
-include $(BUILD_EXECUTABLE)