am 1721abdb: Merge "Use Bionic getline implementation."
* commit '1721abdb66f667a8e57f66dc77d8a3ff7d275dab':
Use Bionic getline implementation.
diff --git a/host-darwin-fixup/getline.c b/host-darwin-fixup/getline.c
deleted file mode 100644
index 041a5ed..0000000
--- a/host-darwin-fixup/getline.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2012, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdio.h>
-
-ssize_t getline(char **lineptr, size_t *n, FILE *stream)
-{
- char *ptr;
-
- ptr = fgetln(stream, n);
-
- if (ptr == NULL) {
- return -1;
- }
-
- /* Free the original ptr */
- if (*lineptr != NULL) free(*lineptr);
-
- /* Add one more space for '\0' */
- size_t len = n[0] + 1;
-
- /* Update the length */
- n[0] = len;
-
- /* Allocate a new buffer */
- *lineptr = malloc(len);
-
- /* Copy over the string */
- memcpy(*lineptr, ptr, len-1);
-
- /* Write the NULL character */
- (*lineptr)[len-1] = '\0';
-
- /* Return the length of the new buffer */
- return len;
-}
diff --git a/libdw/Android.mk b/libdw/Android.mk
index 1e07316..589f46a 100755
--- a/libdw/Android.mk
+++ b/libdw/Android.mk
@@ -128,8 +128,6 @@
ifeq ($(HOST_OS),darwin)
LOCAL_CFLAGS += -fnested-functions
- LOCAL_SRC_FILES += \
- ../host-darwin-fixup/getline.c
endif
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../host-$(HOST_OS)-fixup
