commit a40d7e7cdc4fd37f03954795e48f6ad279310936
author Dianne Hackborn <hackbod@google.com> Mon Apr 15 21:54:43 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Apr 15 21:54:43 2013 -0700
tree 819eb8e50bac4792c35386fc825c36fbd38c37a2
parent 11dfb30c2f1a5d1718310d714c1f2dc3ba81ca20
parent 15717a32c497895b294396c0000bc571790d3691

am 15717a32: am 0985ac04: Merge "Maybe fix issue #8620910: Win_sdk build failed and unable to create..." into jb-mr2-dev

* commit '15717a32c497895b294396c0000bc571790d3691':
  Maybe fix issue #8620910: Win_sdk build failed and unable to create...

libs/androidfw/AssetManager.cpp

diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp
index e0d96c9..b08c36b 100644
--- a/libs/androidfw/AssetManager.cpp
+++ b/libs/androidfw/AssetManager.cpp
@@ -33,7 +33,9 @@
 #include <utils/threads.h>
 #include <utils/Timers.h>
 #include <utils/ZipFileRO.h>
+#ifdef HAVE_ANDROID_OS
 #include <cutils/trace.h>
+#endif
 
 #include <assert.h>
 #include <dirent.h>