diff options
| author | Ivan Lozano <ivanlozano@google.com> | 2018-07-17 09:11:35 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-07-17 09:11:35 -0700 |
| commit | 37f2b87318a993982088d6db3722b4bdaed84240 (patch) | |
| tree | ef7e1dc9af429c9d97576d25e4300d5f28445575 | |
| parent | a88eeddc7ceebd3e99f2daa6a19ca6ef9cbb9a9a (diff) | |
| parent | 662b247f656379ca3ed253ddaa96b234c1c49841 (diff) | |
| download | libhevc-temp_p_merge.tar.gz | |
Build hevcdec with Soong instead of Make.temp_p_merge
am: 662b247f65
Change-Id: I2aee7a803da2214f8c8cdcf3e589d0e8bf0c471c
| -rw-r--r-- | Android.bp | 14 | ||||
| -rw-r--r-- | test/Android.mk | 5 | ||||
| -rw-r--r-- | test/decoder.mk | 15 |
3 files changed, 14 insertions, 20 deletions
@@ -397,3 +397,17 @@ cc_library_static { blacklist: "cfi_blacklist.txt", }, } + +cc_test { + name: "hevcdec", + cflags: [ + "-DPROFILE_ENABLE", + "-DARM", + "-fPIC", + "-DMD5_DISABLE", + "-Wall", + "-Werror", + ], + srcs: ["test/decoder/main.c"], + static_libs: ["libhevcdec"], +} 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 6b343a0..0000000 --- a/test/decoder.mk +++ /dev/null @@ -1,15 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := hevcdec -LOCAL_MODULE_TAGS := optional - -LOCAL_CFLAGS := \ - -DPROFILE_ENABLE -DARM -fPIC -DMD5_DISABLE \ - -Wall -Werror -LOCAL_C_INCLUDES += $(LOCAL_PATH)/../decoder $(LOCAL_PATH)/../common $(LOCAL_PATH)/ -LOCAL_SRC_FILES := decoder/main.c -LOCAL_STATIC_LIBRARIES := libhevcdec - -include $(BUILD_EXECUTABLE) |