am bee007ce: Merge "Don\'t build a broken getline when bionic has a working one."
* commit 'bee007ce9eef1a9979e1fd13c61873bc164bb2d1':
Don't build a broken getline when bionic has a working one.
diff --git a/bionic-fixup/AndroidFixup.h b/bionic-fixup/AndroidFixup.h
index e96d57e..037af0f 100644
--- a/bionic-fixup/AndroidFixup.h
+++ b/bionic-fixup/AndroidFixup.h
@@ -82,6 +82,4 @@
/* forward declarations */
char * dgettext (const char * domainname, const char * msgid);
-ssize_t getline(char **lineptr, size_t *n, FILE *stream);
-
#endif /* ANDROID_FIXUP_H */
diff --git a/bionic-fixup/getline.c b/bionic-fixup/getline.c
deleted file mode 100644
index 041a5ed..0000000
--- a/bionic-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 0822ced..1e07316 100755
--- a/libdw/Android.mk
+++ b/libdw/Android.mk
@@ -151,10 +151,6 @@
LOCAL_SRC_FILES := $(LIBDW_SRC_FILES)
-# missing utility functions in bionic
-LOCAL_SRC_FILES += \
- ../bionic-fixup/getline.c \
-
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/.. \
$(LOCAL_PATH)/../lib \
