Merge "Track rename of base/ to android-base/."

2015-12-08 16:57:57 +00:00
parent fbc65644b9 e7d2cc308e
commit 62b8dfd270
2 changed files with 2 additions and 2 deletions
--- a/tools/aapt2/flatten/TableFlattener.cpp
+++ b/tools/aapt2/flatten/TableFlattener.cpp
@@ -23,7 +23,7 @@
 #include "flatten/TableFlattener.h"
 #include "util/BigBuffer.h"

-#include <base/macros.h>
+#include <android-base/macros.h>
 #include <type_traits>
 #include <numeric>

--- a/tools/aapt2/unflatten/BinaryResourceParser.cpp
+++ b/tools/aapt2/unflatten/BinaryResourceParser.cpp
@@ -27,7 +27,7 @@

 #include <androidfw/ResourceTypes.h>
 #include <androidfw/TypeWrappers.h>
-#include <base/macros.h>
+#include <android-base/macros.h>

 #include <map>
 #include <string>