commit 6020f9bb8c6cd864a4c9b2e70c60b6505e8eba61
author Paul Lawrence <paullawrence@google.com> Thu Dec 04 22:24:38 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 04 22:24:39 2014 +0000
tree 23b5eb80fd00e36647b5e333c7706e4276056c88
parent 4231485db02beda065fb6871fcade097fdea5f6f
parent 7c442e1700e6312727283db402dec6f666f1b55a

Merge "Add adb enable-verity"

adb/framebuffer_service.c

diff --git a/adb/framebuffer_service.c b/adb/framebuffer_service.c
index 8cbe840..61578aa 100644
--- a/adb/framebuffer_service.c
+++ b/adb/framebuffer_service.c
@@ -76,6 +76,7 @@
         exit(1);
     }
 
+    close(fds[1]);
     fd_screencap = fds[0];
 
     /* read w, h & format */
@@ -173,10 +174,9 @@
     }
 
 done:
-    TEMP_FAILURE_RETRY(waitpid(pid, NULL, 0));
-
     close(fds[0]);
-    close(fds[1]);
+
+    TEMP_FAILURE_RETRY(waitpid(pid, NULL, 0));
 pipefail:
     close(fd);
 }

libpixelflinger/Android.mk

diff --git a/libpixelflinger/Android.mk b/libpixelflinger/Android.mk
index da9829d..f1bd522 100644
--- a/libpixelflinger/Android.mk
+++ b/libpixelflinger/Android.mk
@@ -36,6 +36,7 @@
 
 ifeq ($(ARCH_ARM_HAVE_NEON),true)
 PIXELFLINGER_SRC_FILES_arm += col32cb16blend_neon.S
+PIXELFLINGER_CFLAGS_arm += -D__ARM_HAVE_NEON
 endif
 
 PIXELFLINGER_SRC_FILES_arm64 := \