diff options
| author | Steven Moreland <smoreland@google.com> | 2017-04-20 12:56:27 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-04-28 20:22:20 +0000 |
| commit | 0bbe8e9c2a48efc3d55165154078ec108db8c10f (patch) | |
| tree | cfcd6503abfbee13760d27b4b72ae22467f61489 | |
| parent | 2c5a58ad12f5400bb94772f83e8882fda1655e72 (diff) | |
| download | libvpx-0bbe8e9c2a48efc3d55165154078ec108db8c10f.tar.gz | |
libwebm: Android.mk -> Android.bp
Test: all of libvpx links.
Change-Id: Iaa50db4be5a5e2bc0aa26c560db47f5802f07e43
(cherry picked from commit 5280486baa0424f5d480c2fdefab5f28f614b932)
| -rw-r--r-- | Android.bp | 3 | ||||
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | libwebm.mk | 14 | ||||
| -rw-r--r-- | libwebm/Android.bp | 11 |
4 files changed, 14 insertions, 16 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 000000000..927e1b973 --- /dev/null +++ b/Android.bp @@ -0,0 +1,3 @@ +subdirs = [ + "libwebm", +] diff --git a/Android.mk b/Android.mk index d0fe10a5f..b9da190fb 100644 --- a/Android.mk +++ b/Android.mk @@ -5,5 +5,3 @@ include $(CLEAR_VARS) # if ARMv7 + NEON etc blah blah include external/libvpx/libvpx.mk -# libwebm -include external/libvpx/libwebm.mk diff --git a/libwebm.mk b/libwebm.mk deleted file mode 100644 index 9e872f472..000000000 --- a/libwebm.mk +++ /dev/null @@ -1,14 +0,0 @@ -# libwebm -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := libwebm/mkvparser/mkvparser.cc -LOCAL_CPP_EXTENSION := .cc -LOCAL_C_INCLUDES += $(LOCAL_PATH)/libwebm/ - -LOCAL_MODULE := libwebm - -LOCAL_SANITIZE := cfi -LOCAL_SANITIZE_DIAG := cfi - -include $(BUILD_STATIC_LIBRARY) diff --git a/libwebm/Android.bp b/libwebm/Android.bp new file mode 100644 index 000000000..a1d335ebc --- /dev/null +++ b/libwebm/Android.bp @@ -0,0 +1,11 @@ +cc_library_static { + name: "libwebm", + srcs: ["mkvparser/mkvparser.cc"], + export_include_dirs: ["."], + sanitize: { + cfi: true, + diag: { + cfi: true, + }, + }, +} |