summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2017-08-11 21:35:31 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-08-11 21:35:31 +0000
commite17aa091366feafed96adc418a8a4699cf870917 (patch)
tree0d61a12276d0750e2bfbab256ada4a431d573c30
parente04a0bf5c7156e1f7a2965a3d88dc95c4112a3e5 (diff)
parent8eebd694e59fb01c13267c509ea98179f149e69b (diff)
Merge "aapt2_jni: use proper nativehelper headers" into stage-aosp-master
-rw-r--r--tools/aapt2/jni/aapt2_jni.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt2/jni/aapt2_jni.cpp b/tools/aapt2/jni/aapt2_jni.cpp
index ad5ad4c336e5..4315713e9c51 100644
--- a/tools/aapt2/jni/aapt2_jni.cpp
+++ b/tools/aapt2/jni/aapt2_jni.cpp
@@ -22,7 +22,7 @@
#include <vector>
#include "android-base/logging.h"
-#include "ScopedUtfChars.h"
+#include "nativehelper/ScopedUtfChars.h"
#include "Diagnostics.h"
#include "util/Util.h"