aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2017-04-25 00:20:47 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-04-25 00:20:47 +0000
commit9293f175e94753fe38995227ff1cf47e900f83d4 (patch)
tree4a7f09b26b129fc027d7e90d983b48d1f1b365fb
parent6dba790f3372d03eee07c693789166ca9fa07b0a (diff)
parent279fd5bda4fe2038193d1372c239068c08e5b486 (diff)
downloadlibogg-9293f175e94753fe38995227ff1cf47e900f83d4.tar.gz
Merge "Convert external/libogg to Android.bp" am: 6a48629b7c
am: 279fd5bda4 Change-Id: I85932bce48a374296bca397d0773011b78b5b6c1
-rw-r--r--Android.bp12
-rw-r--r--Android.mk12
2 files changed, 12 insertions, 12 deletions
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",
+}
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)