fix build with android-6.0 tree
Change-Id: Ia1126b186f77875868e417efeb121ba894580aa0
This commit is contained in:
2
.gitmodules
vendored
2
.gitmodules
vendored
@@ -3,4 +3,4 @@
|
||||
url = https://github.com/Tasssadar/kexec-tools
|
||||
[submodule "adbd"]
|
||||
path = adbd
|
||||
url = https://github.com/Tasssadar/multirom_adbd.git
|
||||
url = https://github.com/multirom-nexus6p/multirom_adbd.git
|
||||
|
||||
2
adbd
2
adbd
Submodule adbd updated: 8dd5490b00...d310c99640
@@ -15,6 +15,7 @@
|
||||
*/
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "containers.h"
|
||||
#include "util.h"
|
||||
|
||||
@@ -21,6 +21,7 @@
|
||||
#include <linux/fb.h>
|
||||
#include <stdarg.h>
|
||||
#include <pthread.h>
|
||||
#include <string.h>
|
||||
|
||||
#if defined(RECOVERY_BGRA) || defined(RECOVERY_RGBX)
|
||||
#define PIXEL_SIZE 4
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
*/
|
||||
|
||||
#include <unistd.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "progressdots.h"
|
||||
#include "colors.h"
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
#define _GNU_SOURCE
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <stdlib.h>
|
||||
@@ -23,7 +24,6 @@
|
||||
#include <errno.h>
|
||||
#include <time.h>
|
||||
#include <dirent.h>
|
||||
#include <fcntl.h>
|
||||
#include <cutils/android_reboot.h>
|
||||
#include <unistd.h>
|
||||
|
||||
|
||||
@@ -20,6 +20,8 @@
|
||||
|
||||
#include <pthread.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "lib/fstab.h"
|
||||
#include "lib/containers.h"
|
||||
|
||||
@@ -27,7 +27,9 @@
|
||||
#include <sys/mount.h>
|
||||
#include <sys/klog.h>
|
||||
#include <linux/loop.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include <fcntl.h>
|
||||
#include "adb.h"
|
||||
#include "../lib/util.h"
|
||||
#include "../lib/log.h"
|
||||
|
||||
Reference in New Issue
Block a user