diff --git a/native/android/Android.bp b/native/android/Android.bp index eacda938b88dd..a89db3248afd8 100644 --- a/native/android/Android.bp +++ b/native/android/Android.bp @@ -19,3 +19,24 @@ ndk_library { first_version: "9", unversioned_until: "current", } + +cc_defaults { + name: "libandroid_defaults", + cflags: [ + "-Wall", + "-Werror", + "-Wunused", + "-Wunreachable-code", + ], +} + +// Network library. +cc_library_shared { + name: "libandroid_net", + defaults: ["libandroid_defaults"], + srcs: ["net.c"], + + shared_libs: ["libnetd_client"], + + include_dirs: ["bionic/libc/dns/include"], +} diff --git a/native/android/Android.mk b/native/android/Android.mk index 6e15331e4baab..97dbf0f8a2ade 100644 --- a/native/android/Android.mk +++ b/native/android/Android.mk @@ -58,20 +58,3 @@ LOCAL_MODULE := libandroid LOCAL_CFLAGS += $(common_cflags) include $(BUILD_SHARED_LIBRARY) - -# Network library. -include $(CLEAR_VARS) -LOCAL_MODULE := libandroid_net -LOCAL_CFLAGS := $(common_cflags) -LOCAL_SRC_FILES:= \ - net.c \ - -LOCAL_SHARED_LIBRARIES := \ - libnetd_client \ - -LOCAL_C_INCLUDES += \ - frameworks/base/native/include \ - bionic/libc/dns/include \ - system/netd/include \ - -include $(BUILD_SHARED_LIBRARY)