From 7cdbd68610d4af85498c656ef7cadc4d60168c45 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Mon, 13 Sep 2021 16:30:12 -0700
Subject: [PATCH] Fix framworks/base compiling against musl

Add missing includes that are not transitively provided when compiling
against musl.

Bug: 190084016
Test: m USE_HOST_MUSL=true
Change-Id: Ia22c3df2e904e7a479bb636b7db22e5a0c341b98
---
 tools/bit/print.cpp              | 1 +
 tools/bit/util.h                 | 2 ++
 tools/streaming_proto/Errors.cpp | 1 +
 3 files changed, 4 insertions(+)

diff --git a/tools/bit/print.cpp b/tools/bit/print.cpp
index 35feda11ec29..8bc6f167bd7f 100644
--- a/tools/bit/print.cpp
+++ b/tools/bit/print.cpp
@@ -17,6 +17,7 @@
 #include "print.h"
 
 #include <sys/ioctl.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <unistd.h>
 
diff --git a/tools/bit/util.h b/tools/bit/util.h
index 7ccdab103d9a..8c66911b3c48 100644
--- a/tools/bit/util.h
+++ b/tools/bit/util.h
@@ -17,6 +17,8 @@
 #ifndef UTIL_H
 #define UTIL_H
 
+#include <sys/types.h>
+
 #include <map>
 #include <string>
 #include <vector>
diff --git a/tools/streaming_proto/Errors.cpp b/tools/streaming_proto/Errors.cpp
index 0cd9037dcb55..6890d99b104c 100644
--- a/tools/streaming_proto/Errors.cpp
+++ b/tools/streaming_proto/Errors.cpp
@@ -1,5 +1,6 @@
 #include "Errors.h"
 
+#include <stdarg.h>
 #include <stdlib.h>
 
 namespace android {