commit 5c982840b2b5ccd9c3d43fe0aee414c8cba14213
author Steven Moreland <smoreland@google.com> Fri Apr 28 19:58:44 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 28 19:58:45 2017 +0000
tree 25e0dc2e87ff7ba487f715f597bd6b4cdeb7509a
parent 109fe5ff49848a1c8c2f5fb7d1f56a49cd7e6754
parent 898b30a183dedc49595f66d1bb8e0f18e5318687

Merge "libwebm: Android.mk -> Android.bp"

Android.bp

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..927e1b9
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,3 @@
+subdirs = [
+    "libwebm",
+]

Android.mk

diff --git a/Android.mk b/Android.mk
index d0fe10a..b9da190 100644
--- a/Android.mk
+++ b/Android.mk
@@ -5,5 +5,3 @@
 # if ARMv7 + NEON etc blah blah
 include external/libvpx/libvpx.mk
 
-# libwebm
-include external/libvpx/libwebm.mk

libwebm.mk

diff --git a/libwebm.mk b/libwebm.mk
deleted file mode 100644
index 3afa4a0..0000000
--- a/libwebm.mk
+++ /dev/null
@@ -1,11 +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
-
-include $(BUILD_STATIC_LIBRARY)

libwebm/Android.bp

diff --git a/libwebm/Android.bp b/libwebm/Android.bp
new file mode 100644
index 0000000..c770c49
--- /dev/null
+++ b/libwebm/Android.bp
@@ -0,0 +1,5 @@
+cc_library_static {
+    name: "libwebm",
+    srcs: ["mkvparser/mkvparser.cc"],
+    export_include_dirs: ["."],
+}