merge in oc-release history after reset to oc-dev
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..53828f6
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,51 @@
+
+cc_library {
+ name: "libnl",
+ vendor_available: true,
+
+ srcs: [
+ "lib/cache.c",
+ "lib/data.c",
+ "lib/nl.c",
+ "lib/cache_mngr.c",
+ "lib/addr.c",
+ "lib/socket.c",
+ "lib/fib_lookup/lookup.c",
+ "lib/fib_lookup/request.c",
+ "lib/msg.c",
+ "lib/object.c",
+ "lib/attr.c",
+ "lib/utils.c",
+ "lib/cache_mngt.c",
+ "lib/handlers.c",
+ "lib/genl/ctrl.c",
+ "lib/genl/mngt.c",
+ "lib/genl/family.c",
+ "lib/genl/genl.c",
+ "lib/route/rtnl.c",
+ "lib/route/route_utils.c",
+ "lib/netfilter/nfnl.c",
+ "lib/error.c",
+ "lib/version.c",
+ "lib/hash.c",
+ "lib/hashtable.c",
+ ],
+
+ local_include_dirs: [
+ "include",
+ "include/linux-private",
+ ],
+ export_include_dirs: ["include"],
+ cflags: [
+ "-D_BSD_SOURCE",
+ "-Wno-unused-parameter",
+ "-Wno-sign-compare",
+ "-Wno-missing-field-initializers",
+ "-Wno-tautological-compare",
+ "-Wno-pointer-arith",
+ "-UNDEBUG",
+ "-D_GNU_SOURCE",
+ "-DSYSCONFDIR=\"\\\"/etc/libnl\\\"\"",
+ ],
+}
+
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 1ee2542..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := lib/cache.c \
- lib/data.c \
- lib/nl.c \
- lib/cache_mngr.c \
- lib/addr.c \
- lib/socket.c \
- lib/fib_lookup/lookup.c \
- lib/fib_lookup/request.c \
- lib/msg.c \
- lib/object.c \
- lib/attr.c \
- lib/utils.c \
- lib/cache_mngt.c \
- lib/handlers.c \
- lib/genl/ctrl.c \
- lib/genl/mngt.c \
- lib/genl/family.c \
- lib/genl/genl.c \
- lib/route/rtnl.c \
- lib/route/route_utils.c \
- lib/netfilter/nfnl.c \
- lib/error.c \
- lib/version.c \
- lib/hash.c \
- lib/hashtable.c
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/include $(LOCAL_PATH)/include/linux-private
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
-LOCAL_CFLAGS += -D_BSD_SOURCE -Wno-unused-parameter -Wno-sign-compare \
- -Wno-missing-field-initializers -Wno-tautological-compare \
- -Wno-pointer-arith -UNDEBUG -D_GNU_SOURCE -DSYSCONFDIR="\"/etc/libnl\""
-LOCAL_MODULE := libnl
-
-include $(BUILD_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-
-LOCAL_WHOLE_STATIC_LIBRARIES := libnl
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
-LOCAL_MODULE := libnl
-
-include $(BUILD_SHARED_LIBRARY)
