summaryrefslogtreecommitdiffstats
path: root/native
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2012-02-17 18:27:36 -0800
committerMathias Agopian <mathias@google.com>2012-02-17 19:01:26 -0800
commitb13b9bdad2baf6ad1ec2e56b6b7598fa20f55fc4 (patch)
tree2b90dc39a35d8081ea47b038893624b69a01202d /native
parent6db0608dff408130b35e6f21abe746a635648b18 (diff)
downloadframeworks_base-b13b9bdad2baf6ad1ec2e56b6b7598fa20f55fc4.zip
frameworks_base-b13b9bdad2baf6ad1ec2e56b6b7598fa20f55fc4.tar.gz
frameworks_base-b13b9bdad2baf6ad1ec2e56b6b7598fa20f55fc4.tar.bz2
frameworks/base refactoring.
step 2: move libutils headers to their new home: androidfw Change-Id: I14624ba23db92a81f2cb929f104386e1fab293ef
Diffstat (limited to 'native')
-rw-r--r--native/android/asset_manager.cpp6
-rw-r--r--native/android/configuration.cpp2
-rw-r--r--native/android/obb.cpp2
3 files changed, 5 insertions, 5 deletions
diff --git a/native/android/asset_manager.cpp b/native/android/asset_manager.cpp
index f5db57c..01db1d3 100644
--- a/native/android/asset_manager.cpp
+++ b/native/android/asset_manager.cpp
@@ -18,9 +18,9 @@
#include <utils/Log.h>
#include <android/asset_manager_jni.h>
-#include <utils/AssetManager.h>
-#include <utils/AssetDir.h>
-#include <utils/Asset.h>
+#include <androidfw/Asset.h>
+#include <androidfw/AssetDir.h>
+#include <androidfw/AssetManager.h>
#include <utils/threads.h>
#include "jni.h"
diff --git a/native/android/configuration.cpp b/native/android/configuration.cpp
index 687924b..7eb51dd 100644
--- a/native/android/configuration.cpp
+++ b/native/android/configuration.cpp
@@ -17,7 +17,7 @@
#define LOG_TAG "Configuration"
#include <utils/Log.h>
-#include <utils/AssetManager.h>
+#include <androidfw/AssetManager.h>
#include <android_runtime/android_content_res_Configuration.h>
diff --git a/native/android/obb.cpp b/native/android/obb.cpp
index e0cb1a6..e990024 100644
--- a/native/android/obb.cpp
+++ b/native/android/obb.cpp
@@ -18,8 +18,8 @@
#include <android/obb.h>
+#include <androidfw/ObbFile.h>
#include <utils/Log.h>
-#include <utils/ObbFile.h>
using namespace android;