libhardware: deprecate cutils/log.h
Replace cutils/log.h with log/log.h. Sort headers. Minimize conflicts.
Add missing required headers.
Test: compile
Bug: 34250038
Change-Id: I5c0f231cbfed90b73e0538c9d32ad3226c7cc5e4
diff --git a/modules/gralloc/mapper.cpp b/modules/gralloc/mapper.cpp
index 20d9841..ee3e40e 100644
--- a/modules/gralloc/mapper.cpp
+++ b/modules/gralloc/mapper.cpp
@@ -14,18 +14,17 @@
* limitations under the License.
*/
-#include <limits.h>
#include <errno.h>
+#include <limits.h>
#include <pthread.h>
-#include <unistd.h>
#include <string.h>
-
#include <sys/mman.h>
#include <sys/stat.h>
#include <sys/types.h>
+#include <unistd.h>
-#include <cutils/log.h>
#include <cutils/atomic.h>
+#include <log/log.h>
#include <hardware/hardware.h>
#include <hardware/gralloc.h>