From e7d2cc308e5f53f244cc05473e1c51127ef057d9 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Tue, 8 Dec 2015 08:57:14 -0800
Subject: [PATCH] Track rename of base/ to android-base/.

Change-Id: If08a94025fc12433f7e248b7787cee3c14843097
---
 tools/aapt2/flatten/TableFlattener.cpp         | 2 +-
 tools/aapt2/unflatten/BinaryResourceParser.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/aapt2/flatten/TableFlattener.cpp b/tools/aapt2/flatten/TableFlattener.cpp
index f42e6b7b126f4..46ee914c150a1 100644
--- 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>
 
diff --git a/tools/aapt2/unflatten/BinaryResourceParser.cpp b/tools/aapt2/unflatten/BinaryResourceParser.cpp
index 5cc7aa7cdc3ef..46b520592f251 100644
--- 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>