Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

Commit 22d89ecb authored Dec 05, 2015 by Elliott Hughes Committed by android-build-merger Dec 05, 2015

Merge "Track rename from base/ to android-base/." am: 06ca938c

am: ff4c2c07

* commit 'ff4c2c07':
  Track rename from base/ to android-base/.

parents da21859d ff4c2c07

applypatch/applypatch.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@
		#include <sys/types.h>
		#include <unistd.h>

		#include <base/strings.h>
		#include <android-base/strings.h>

		#include "mincrypt/sha.h"
		#include "applypatch.h"

recovery.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -34,8 +34,8 @@
		#include <chrono>

		#include <adb.h>
		#include <base/file.h>
		#include <base/stringprintf.h>
		#include <android-base/file.h>
		#include <android-base/stringprintf.h>
		#include <cutils/android_reboot.h>
		#include <cutils/properties.h>

screen_ui.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -30,8 +30,8 @@

		#include <vector>

		#include <base/strings.h>
		#include <base/stringprintf.h>
		#include <android-base/strings.h>
		#include <android-base/stringprintf.h>
		#include <cutils/properties.h>

		#include "common.h"

uncrypt/uncrypt.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -53,8 +53,8 @@

		#include <memory>

		#include <base/file.h>
		#include <base/strings.h>
		#include <android-base/file.h>
		#include <android-base/strings.h>
		#include <cutils/android_reboot.h>
		#include <cutils/properties.h>
		#include <fs_mgr.h>

updater/blockimg.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -37,8 +37,8 @@
		#include <string>
		#include <vector>

		#include <base/parseint.h>
		#include <base/strings.h>
		#include <android-base/parseint.h>
		#include <android-base/strings.h>

		#include "applypatch/applypatch.h"
		#include "edify/expr.h"