diff options
| author | Dianne Hackborn <hackbod@google.com> | 2013-04-15 23:23:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-15 23:23:31 +0000 |
| commit | 0985ac04310f18be7dd814b9a07c93f144ad21c2 (patch) | |
| tree | 97e9de7d27090b5457c27eed400affcadd80f099 /libs | |
| parent | a59a19abb8f284beb478ff2492493251b91a2847 (diff) | |
| parent | c51d050f1bc2c393707f7c5e1f6906169ace7497 (diff) | |
| download | frameworks_base-0985ac04310f18be7dd814b9a07c93f144ad21c2.zip frameworks_base-0985ac04310f18be7dd814b9a07c93f144ad21c2.tar.gz frameworks_base-0985ac04310f18be7dd814b9a07c93f144ad21c2.tar.bz2 | |
Merge "Maybe fix issue #8620910: Win_sdk build failed and unable to create..." into jb-mr2-dev
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/androidfw/AssetManager.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
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> |