commit 6a48629b7c7fc90326b2f959789828007b3cc184
author Colin Cross <ccross@android.com> Tue Apr 25 00:10:48 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 25 00:10:48 2017 +0000
tree 4a7f09b26b129fc027d7e90d983b48d1f1b365fb
parent 6dba790f3372d03eee07c693789166ca9fa07b0a
parent 8f3cb763e542e690a4a8436582e3549392a20994

Merge "Convert external/libogg to Android.bp"

Android.bp

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..8011e1c
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,12 @@
+cc_library_static {
+    name: "libogg",
+
+    srcs: [
+        "src/bitwise.c",
+        "src/framing.c",
+    ],
+
+    export_include_dirs: ["include"],
+
+    sdk_version: "14",
+}

Android.mk

diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index c3d5fa9..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/include
-LOCAL_SRC_FILES := src/bitwise.c \
-                   src/framing.c
-LOCAL_MODULE    := libogg
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SDK_VERSION := 14
-
-include $(BUILD_STATIC_LIBRARY)