Merge "libcap-ng can compile out of the box now."android-m-preview-2android-m-preview-1android-m-previewandroid-lego-6.0.1_r2android-lego-6.0.1_r1android-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r41android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1master-soongmarshmallow-releasemarshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-releasemarshmallow-dr-lego-releasemarshmallow-dr-dragon-releasemarshmallow-dr-devmarshmallow-dr-arc-m54marshmallow-dr-arc-m53marshmallow-dr-arc-devmarshmallow-devmarshmallow-cts-release

2 files changed, 0 insertions, 8 deletions

diff --git a/libcap-ng-0.7/src/cap-ng.c b/libcap-ng-0.7/src/cap-ng.c
index a7124f1..cf99b3e 100644
--- a/libcap-ng-0.7/src/cap-ng.c
+++ b/libcap-ng-0.7/src/cap-ng.c
@@ -25,9 +25,7 @@
 #include <string.h>
 #include <stdarg.h>
 #include <stdio.h>
-#if !defined(ANDROID)
 #include <stdio_ext.h>
-#endif
 #include <stdlib.h>
 #include <sys/prctl.h>
 #include <grp.h>
@@ -244,9 +242,7 @@ static int get_bounding_set(void)
 	f = fopen(buf, "re");
 	if (f == NULL)
 		return -1;
-#if !defined(ANDROID)
 	__fsetlocking(f, FSETLOCKING_BYCALLER);
-#endif
 	while (fgets(buf, sizeof(buf), f)) {
 		if (strncmp(buf, "CapB", 4))
 			continue;
diff --git a/libcap-ng-0.7/utils/pscap.c b/libcap-ng-0.7/utils/pscap.c
index 5907513..1496584 100644
--- a/libcap-ng-0.7/utils/pscap.c
+++ b/libcap-ng-0.7/utils/pscap.c
@@ -23,9 +23,7 @@
 
 #include "config.h"
 #include <stdio.h>
-#if !defined(ANDROID)
 #include <stdio_ext.h>
-#endif
 #include <unistd.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -128,9 +126,7 @@ int main(int argc, char *argv[])
 				euid = 0;
 			else {
 				line = 0;
-#if !defined(ANDROID)
 				__fsetlocking(f, FSETLOCKING_BYCALLER);
-#endif
 				while (fgets(buf, sizeof(buf), f)) {
 					if (line == 0) {
 						line++;