diff options
| author | Bjorn Bringert <bringert@android.com> | 2013-03-18 21:17:26 +0000 |
|---|---|---|
| committer | Bjorn Bringert <bringert@android.com> | 2013-04-26 15:07:09 +0100 |
| commit | fb903a45d7b924c1dfacadaa99ebdf93fd8a1de4 (patch) | |
| tree | 6db6caa0c8d1cb6ac02175c5e2721fc8e5e605dd /libs | |
| parent | 007d4d7040c9b41de584e79ba7dbd15d25f54971 (diff) | |
| download | frameworks_base-fb903a45d7b924c1dfacadaa99ebdf93fd8a1de4.zip frameworks_base-fb903a45d7b924c1dfacadaa99ebdf93fd8a1de4.tar.gz frameworks_base-fb903a45d7b924c1dfacadaa99ebdf93fd8a1de4.tar.bz2 | |
Allow compiling aapt for the device
Changes:
- The static device version of libandroidfw now includes
the extra functions needed by aapt. I could only find
a few host tools that use the static library, so this is
hopefully not a problem.
- The pseudolocalization code is moved into aapt.
It was previously in libhost, but only used by aapt.
Change-Id: Ib393ebb7dcebee8abbb628cbe5255ea1679674ac
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/androidfw/Android.mk | 3 | ||||
| -rw-r--r-- | libs/androidfw/ResourceTypes.cpp | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/libs/androidfw/Android.mk b/libs/androidfw/Android.mk index 3ed75a2..018ed40 100644 --- a/libs/androidfw/Android.mk +++ b/libs/androidfw/Android.mk @@ -52,6 +52,8 @@ LOCAL_MODULE:= libandroidfw LOCAL_MODULE_TAGS := optional +LOCAL_CFLAGS += -DSTATIC_ANDROIDFW_FOR_TOOLS + LOCAL_C_INCLUDES := \ external/zlib @@ -92,6 +94,7 @@ include $(BUILD_SHARED_LIBRARY) ifeq ($(TARGET_OS),linux) include $(CLEAR_VARS) +LOCAL_CFLAGS += -DSTATIC_ANDROIDFW_FOR_TOOLS LOCAL_C_INCLUDES += \ external/skia/include/core \ external/zlib \ diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp index a730065..9c58513 100644 --- a/libs/androidfw/ResourceTypes.cpp +++ b/libs/androidfw/ResourceTypes.cpp @@ -5324,7 +5324,7 @@ bool ResTable::getIdmapInfo(const void* idmap, size_t sizeBytes, } -#ifndef HAVE_ANDROID_OS +#ifdef STATIC_ANDROIDFW_FOR_TOOLS #define CHAR16_TO_CSTR(c16, len) (String8(String16(c16,len)).string()) #define CHAR16_ARRAY_EQ(constant, var, len) \ @@ -5621,6 +5621,6 @@ void ResTable::print(bool inclValues) const } } -#endif // HAVE_ANDROID_OS +#endif // STATIC_ANDROIDFW_FOR_TOOLS } // namespace android |