| commit | e7d2cc308e5f53f244cc05473e1c51127ef057d9 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Dec 08 08:57:14 2015 -0800 |
| committer | Elliott Hughes <enh@google.com> | Tue Dec 08 08:57:14 2015 -0800 |
| tree | 6b0dd58fc4b446b792e64913f5ff0cea36b83a88 | |
| parent | f4b4bf633d6a2a79c4804ac3395d5578d08e65f4 [diff] |
Track rename of base/ to android-base/. Change-Id: If08a94025fc12433f7e248b7787cee3c14843097
diff --git a/tools/aapt2/flatten/TableFlattener.cpp b/tools/aapt2/flatten/TableFlattener.cpp index f42e6b7..46ee914 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 5cc7aa7..46b5205 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>