commit 255735a38b9d5c3755c7b819bdc8fdaf4357d860
author Pawin Vongmasa <pawin@google.com> Wed Jul 19 11:24:56 2017 -0700
committer Pawin Vongmasa <pawin@google.com> Mon Jul 24 20:29:36 2017 -0700
tree f1c83bce136d5f122f57dc3281ab9d5fa0597f05
parent 5c2bdf6a7042d68f9ae2d2f58cf3bae1c44fcab9

Organize header dependencies

Header files that are exported are moved to a specific place for
exporting.

Test: make cts -j123 && cts-tradefed run cts-dev -m \
CtsMediaTestCases --compatibility:module-arg \
CtsMediaTestCases:include-annotation:\
android.platform.test.annotations.RequiresDevice
Bug: 63821829

Change-Id: Ia578e3c0dd1ff157335b3a49af896acb922586e8

media/libmedia/CharacterEncodingDetector.cpp

diff --git a/media/libmedia/CharacterEncodingDetector.cpp b/media/libmedia/CharacterEncodingDetector.cpp
index 808c2b5..990d260 100644
--- a/media/libmedia/CharacterEncodingDetector.cpp
+++ b/media/libmedia/CharacterEncodingDetector.cpp
@@ -18,15 +18,15 @@
 #define LOG_TAG "CharacterEncodingDector"
 #include <utils/Log.h>
 
-#include <CharacterEncodingDetector.h>
+#include <media/CharacterEncodingDetector.h>
 #include "CharacterEncodingDetectorTables.h"
 
-#include "utils/Vector.h"
-#include "StringArray.h"
+#include <utils/Vector.h>
+#include <media/StringArray.h>
 
-#include "unicode/ucnv.h"
-#include "unicode/ucsdet.h"
-#include "unicode/ustring.h"
+#include <unicode/ucnv.h>
+#include <unicode/ucsdet.h>
+#include <unicode/ustring.h>
 
 namespace android {