diff options
author | Steven Moreland <smoreland@google.com> | 2017-04-13 13:55:46 -0700 |
---|---|---|
committer | Steven Moreland <smoreland@google.com> | 2017-04-13 14:02:56 -0700 |
commit | b7f0bfbf23be7795613a1d806f87953091315d26 (patch) | |
tree | 8fac36aebf3eded20be8d45bf3c1dcbaddb558f5 | |
parent | 1918df8d8bc470d418992dcdf8636e4867459162 (diff) | |
download | libnl-b7f0bfbf23be7795613a1d806f87953091315d26.tar.gz |
libnl: Android.mk -> Android.bp
Converting to be able to use some Soong features not available in make.
Test: (sanity) build and flash marlin device, works
Bug: 33241851
Change-Id: If1f3f5fd5f6b1999011c25ac8b8107f12648435b
-rw-r--r-- | Android.bp | 50 | ||||
-rw-r--r-- | Android.mk | 46 |
2 files changed, 50 insertions, 46 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 00000000..9013201c --- /dev/null +++ b/Android.bp @@ -0,0 +1,50 @@ + +cc_library { + name: "libnl", + + 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 1ee2542f..00000000 --- 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) |