Merge tag 'android-4.4_r1' into cm-11.0cm-11.0-XNPH44S-bacon-5fa8c79c0bcm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505acm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315eacm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNG3Cstable/cm-11.0-XNG2Sstable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0cm-11.0

Android 4.4 Release 1.0

4 files changed, 0 insertions, 106 deletions

diff --git a/bionic-fixup/AndroidFixup.h b/bionic-fixup/AndroidFixup.h
index e96d57ed..037af0f5 100644
--- a/bionic-fixup/AndroidFixup.h
+++ b/bionic-fixup/AndroidFixup.h
@@ -82,6 +82,4 @@ static inline char *stpcpy(char *dst, const char *src)
 /* 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 041a5ed9..00000000
--- 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/host-darwin-fixup/getline.c b/host-darwin-fixup/getline.c
deleted file mode 100644
index 041a5ed9..00000000
--- 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 0822ced4..589f46a0 100755
--- a/libdw/Android.mk
+++ b/libdw/Android.mk
@@ -128,8 +128,6 @@ LOCAL_C_INCLUDES := \
 
 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
@@ -151,10 +149,6 @@ include $(CLEAR_VARS)
 
 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 \