diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2018-11-18 16:52:02 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-11-18 16:52:02 -0800 |
| commit | 4b24ed66c425da0fe22450c16b697fc3f0fd3a60 (patch) | |
| tree | f83a877ca583226b1990c0247031ead250082ea1 | |
| parent | 6971e28e1136e2df02cce3c212f98314db93b818 (diff) | |
| parent | ce313a52f205025fc8c10f931a11a706cdadbaf7 (diff) | |
| download | iputils-4b24ed66c425da0fe22450c16b697fc3f0fd3a60.tar.gz | |
Merge "Convert to Android.bp" am: 9c3af9383f
am: ce313a52f2
Change-Id: I3165805de3d13218cf9ebb1b8d3bbf025e9ade06
| -rw-r--r-- | Android.bp | 55 | ||||
| -rw-r--r-- | Android.mk | 50 |
2 files changed, 55 insertions, 50 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..79e8520 --- /dev/null +++ b/Android.bp @@ -0,0 +1,55 @@ +cc_defaults { + name: "iputils_defaults", + cflags: [ + "-D_GNU_SOURCE", + "-Wall", + "-Werror", + "-Wno-constant-conversion", + "-Wno-missing-field-initializers", + "-Wno-sign-compare", + "-Wno-unused-parameter", + ], +} + +cc_binary { + name: "ping", + defaults: ["iputils_defaults"], + srcs: [ + "ping.c", + "ping_common.c", + ], +} + +cc_binary { + name: "ping6", + defaults: ["iputils_defaults"], + shared_libs: ["libcrypto"], + srcs: [ + "ping6.c", + "ping_common.c", + ], +} + +cc_binary { + name: "tracepath", + defaults: ["iputils_defaults"], + srcs: ["tracepath.c"], +} + +cc_binary { + name: "tracepath6", + defaults: ["iputils_defaults"], + srcs: ["tracepath6.c"], +} + +cc_binary { + name: "traceroute6", + defaults: ["iputils_defaults"], + srcs: ["traceroute6.c"], +} + +cc_binary { + name: "arping", + defaults: ["iputils_defaults"], + srcs: ["arping.c"], +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index e0acf1a..0000000 --- a/Android.mk +++ /dev/null @@ -1,50 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -iputils_cflags := \ - -D_GNU_SOURCE \ - -Wall -Werror \ - -Wno-constant-conversion \ - -Wno-missing-field-initializers \ - -Wno-sign-compare \ - -Wno-unused-parameter \ - -include $(CLEAR_VARS) -LOCAL_CFLAGS := $(iputils_cflags) -LOCAL_MODULE := ping -LOCAL_SRC_FILES := ping.c ping_common.c -include $(BUILD_EXECUTABLE) - -include $(CLEAR_VARS) -LOCAL_CFLAGS := $(iputils_cflags) -LOCAL_MODULE := ping6 -LOCAL_SHARED_LIBRARIES := libcrypto -LOCAL_SRC_FILES := ping6.c ping_common.c -include $(BUILD_EXECUTABLE) - -include $(CLEAR_VARS) -LOCAL_CFLAGS := $(iputils_cflags) -LOCAL_MODULE := tracepath -LOCAL_MODULE_TAGS := debug -LOCAL_SRC_FILES := tracepath.c -include $(BUILD_EXECUTABLE) - -include $(CLEAR_VARS) -LOCAL_CFLAGS := $(iputils_cflags) -LOCAL_MODULE := tracepath6 -LOCAL_MODULE_TAGS := debug -LOCAL_SRC_FILES := tracepath6.c -include $(BUILD_EXECUTABLE) - -include $(CLEAR_VARS) -LOCAL_CFLAGS := $(iputils_cflags) -LOCAL_MODULE := traceroute6 -LOCAL_MODULE_TAGS := debug -LOCAL_SRC_FILES := traceroute6.c -include $(BUILD_EXECUTABLE) - -include $(CLEAR_VARS) -LOCAL_CFLAGS := $(iputils_cflags) -LOCAL_MODULE := arping -LOCAL_MODULE_TAGS := debug -LOCAL_SRC_FILES := arping.c -include $(BUILD_EXECUTABLE) |