Merge "fallout of cleaning-up libutils includes"

2017-03-04 00:52:43 +00:00
parent ae3c244944 df7707cb4f
commit 227bdecf02
3 changed files with 3 additions and 0 deletions
--- a/core/jni/android/graphics/SurfaceTexture.cpp
+++ b/core/jni/android/graphics/SurfaceTexture.cpp
@@ -29,6 +29,7 @@

 #include "core_jni_helpers.h"

+#include <cutils/atomic.h>
 #include <utils/Log.h>
 #include <utils/misc.h>

--- a/media/jni/android_media_ImageReader.cpp
+++ b/media/jni/android_media_ImageReader.cpp
@@ -17,6 +17,7 @@
 //#define LOG_NDEBUG 0
 #define LOG_TAG "ImageReader_JNI"
 #include "android_media_Utils.h"
+#include <cutils/atomic.h>
 #include <utils/Log.h>
 #include <utils/misc.h>
 #include <utils/List.h>
--- a/tools/aapt/ZipEntry.h
+++ b/tools/aapt/ZipEntry.h
@@ -26,6 +26,7 @@

 #include <stdlib.h>
 #include <stdio.h>
+#include <time.h>

 namespace android {