| b12f2410c7bdbf90bd8a77b897846ee2763e3037 |
|
03-Apr-2015 |
Elliott Hughes <enh@google.com> |
Only Windows doesn't have %zd.
Change-Id: I0e4b0fdc61641c5ecb724fd096bd2315dcf8ed4a
/frameworks/base/tools/aapt/StringPool.cpp
|
| 3fd340028fc24198edb23ddf5eb5a0a100bab745 |
|
04-Nov-2014 |
Adam Lesinski <adamlesinski@google.com> |
Merge commit '78be0498' into manualmerge
Conflicts:
libs/androidfw/ResourceTypes.cpp
tools/aapt/Android.mk
tools/aapt/StringPool.cpp
tools/aapt/StringPool.h
Change-Id: I9d69efdfb892032895ace12159d193304f02dc6c
|
| 4bf58108d442b37ab4adf5ce3a4ecd63472ce254 |
|
03-Nov-2014 |
Adam Lesinski <adamlesinski@google.com> |
Fix issues that will be present in C++11
- char16_t is a distinct type, so stay consistent
with it throughout the code base.
- char16_t is defined as minimum size of 16 bits.
Since we mmap and cast data structures onto raw memory,
we need a precise definition (uint16_t), so we cast between
that (and static_assert that they are the same size).
Change-Id: I869c32637543bbcfb39d2643e7d9df10d33acd3c
/frameworks/base/tools/aapt/StringPool.cpp
|
| 87332a7109610d02ac7f5db6af99d3a11813d5c1 |
|
02-Oct-2014 |
Andreas Gampe <agampe@google.com> |
resolved conflicts for merge of 1dcc75b2 to lmp-mr1-dev-plus-aosp
Change-Id: I8f7cbd971beae3ab134195e612d705860665142f
|
| 2412f84064c26b643c722ce914a97c4ec7776c69 |
|
01-Oct-2014 |
Andreas Gampe <agampe@google.com> |
Frameworks/base: Fix AAPT warnings
Turn on -Wall -Werror. Fix warnings.
Change-Id: I287fb3c1e851c654479bcf9ea8c73bd354a6b2a1
/frameworks/base/tools/aapt/StringPool.cpp
|
| 47c23a228deb2fa2e7158c58fc42441e8517ea38 |
|
01-Oct-2014 |
Dan Albert <danalbert@google.com> |
resolved conflicts for merge of fe50cfd5 to lmp-mr1-dev-plus-aosp
Change-Id: Id09c2786db18fa7e747cd1652ea95f575c3f5c46
|
| 0de19adc80d8caeac8ab5da79e70ed4adb18b1c1 |
|
01-Oct-2014 |
Dan Albert <danalbert@google.com> |
Use std::sort instead of qsort_r wrapper.
The HAVE_(BSD|GNU)_QSORT_R in AndroidConfig.h has never worked, and we
should just be using something standard anyway.
Change-Id: I784d6212f6c890a11c4af2f83d1ce2d279708652
/frameworks/base/tools/aapt/StringPool.cpp
|
| 20ec4fa2294a91e5ff87839280904aba4a050cf6 |
|
09-Sep-2014 |
Dan Albert <danalbert@google.com> |
resolved conflicts for merge of 6c585756 to lmp-dev-plus-aosp
Change-Id: I5a25f2bac44ac5efcd7462af91005e09680a1d96
|
| f348c15ecf78e9d58b8238ffcf1d78a279e3a862 |
|
09-Sep-2014 |
Dan Albert <danalbert@google.com> |
Use char16_t for char things.
When compiling in C++ mode, the compiler will complain about conversions
from uint16_t to char16_t. Be consistent in using char16_t for strings.
Change-Id: I052b6176ced635162920b31560052d9a64f92764
/frameworks/base/tools/aapt/StringPool.cpp
|
| 25e9d55e964c180ec6e57ba1d977d6c2e1115f5a |
|
20-May-2014 |
Adam Lesinski <adamlesinski@google.com> |
Don't dump data from a bad ResTable
AAPT dumps data from a bad ResTable, which
causes crashes. Prevent this by checking if
there were errors when creating the ResTable.
Bug:14902008
Change-Id: I5e04ebf967c60b78c511dd175785a13bca52f09a
/frameworks/base/tools/aapt/StringPool.cpp
|
| 282e181b58cf72b6ca770dc7ca5f91f135444502 |
|
24-Jan-2014 |
Adam Lesinski <adamlesinski@google.com> |
Revert "Move frameworks/base/tools/ to frameworks/tools/"
This reverts commit 9f6a119c8aa276432ece4fe2118bd8a3c9b1067e.
/frameworks/base/tools/aapt/StringPool.cpp
|
| 9f6a119c8aa276432ece4fe2118bd8a3c9b1067e |
|
28-Aug-2013 |
Mike Lockwood <lockwood@google.com> |
Move frameworks/base/tools/ to frameworks/tools/
Change-Id: I3ffafdab27cc4aca256c3a5806b630795b75d5c8
/frameworks/base/tools/aapt/StringPool.cpp
|
| 823abb63145c7a7db2b766cf7bb816cbdac1de66 |
|
07-May-2013 |
Dima Zavin <dima@android.com> |
aapt: move qsort_r_compat here as it is sole client
This code is only used on the host for MacOS X compatibility.
Apparently, glibc and Apple's libc disagree on the parameter
ordering.
Change-Id: I214edcf2870b6ac88316306ac5af43f1dadf9b2e
Signed-off-by: Dima Zavin <dima@android.com>
/frameworks/base/tools/aapt/StringPool.cpp
|
| fe75d62eba3935d2d1a4a7790fc7459ded241ad3 |
|
19-Mar-2012 |
Jeff Brown <jeffbrown@google.com> |
Use qsort_r_compat() as a portable wrapper for qsort_r().
Change-Id: Ie79f81625947f4e95122047605d994c86e872e74
/frameworks/base/tools/aapt/StringPool.cpp
|
| 46fc395386f2277a0425b2c46be08fd91f6554f4 |
|
19-Mar-2012 |
Jeff Brown <jeffbrown@google.com> |
Fix build break on glibc hosts.
Change-Id: Ida70bec6ea972d042982428353cbbc33cde25136
/frameworks/base/tools/aapt/StringPool.cpp
|
| c9fd9263feedac32e4f5b1f13a3246347efdc25f |
|
17-Mar-2012 |
Jeff Brown <jeffbrown@google.com> |
Use quicksort to sort the string pool.
The current implementation of Vector::sort uses insertion sort
on the assumption that the data is mostly sorted. It isn't.
This change brings the total time spent sorting packages by config
down to 500ms from about 93 seconds.
Bug: 6186278
Change-Id: Iec8da11e09297acd6c73733d063b0fa9dacf69f7
/frameworks/base/tools/aapt/StringPool.cpp
|
| 61361f376b47d45966b1ca0d24d51622304c93c3 |
|
16-Mar-2012 |
Jeff Brown <jeffbrown@google.com> |
Add some comments about StringPool sort order.
Change-Id: I57f24d46328a6bfef883819eaf95c03114d573bb
/frameworks/base/tools/aapt/StringPool.cpp
|
| 345b7eb8749d6954942fd4e961fff9f2f854934c |
|
16-Mar-2012 |
Jeff Brown <jeffbrown@google.com> |
Remove dead code in StringPool.
The sorted string pool option was no longer used.
Neither were strings with associated identifiers.
Change-Id: Ic5f6368637fbeedfda873d63f4ad0f3ea9d0d603
/frameworks/base/tools/aapt/StringPool.cpp
|
| db6e67d8ec081f43bcf14155741e268a38915719 |
|
08-Mar-2012 |
Ben Gruver <bgruv@google.com> |
Fix an issue where a non-styled string could be made into a styled string
If a styled version of an otherwise identical string is encountered before
a non-styled version, aapt merges the two, effectively making the
non-styled string have a spurious style.
Change-Id: I424a61c0c83c59e0b9c8939e457402efd06a7a4f
/frameworks/base/tools/aapt/StringPool.cpp
|
| 6c997a9e880e08c354ffd809bd62df9e25e9c4d4 |
|
31-Jan-2012 |
Dianne Hackborn <hackbod@google.com> |
aapt now sorts the strings in the resource string pool.
In our current environment with very many translations, this can
save a lot of RAM -- for example over 200K in Gmail just by sorting
the strings in the Gmail .apk (not the framework).
Also add a new aapt command to print the contents of the resource
table string pool.
Change-Id: I1da037b3e2c377b890833ff57ab158965314ac48
/frameworks/base/tools/aapt/StringPool.cpp
|
| f51125d8429ffa71c57ba6fbdca9effc72642a9b |
|
28-Oct-2011 |
Raphael <raphael@google.com> |
AAPT fix printf %zd crash on Windows.
There's no printf %zd on Mingw/Cygwin so the verbose
printf crashes aapt.
SDK bugs: 20395, 20986
Change-Id: I5b8ac36749263205a19f1448b1aaca90d5a2e06d
/frameworks/base/tools/aapt/StringPool.cpp
|
| ddb76c4644756b31be948d70aaa8ee541dd94999 |
|
24-Nov-2010 |
Kenny Root <kroot@google.com> |
Change assets to use 64-bit API
The asset system and supporting libraries were using off_t instead of
off64_t to access files larger than 2GB (32-bit signed). This change
replaces all off_t with off64_t and lseek64.
There is a new utils/Compat.h added for Mac OS compatibility.
Also fixed some size-related compiler warnings.
Bug: 3205336
Change-Id: I9097b3cb7a602e811fe52f245939d8975da55e9e
/frameworks/base/tools/aapt/StringPool.cpp
|
| f1ff21ac62a51f5ba8ca0821ea8a90f70957e25d |
|
14-Jun-2010 |
Steve Block <steveblock@google.com> |
Fixes a few minor problems with AAPT
- Fixes casting problems with stricter compilers
- Adds a couple of missing ifdef guards
This is a first step toward being able to generate APKs on the fly on the device.
Bug: 2766918
Change-Id: Icaaee5a4032afa313256add321b447443861dd85
/frameworks/base/tools/aapt/StringPool.cpp
|
| 780d2a1b714724d85227141c76b3c64f543f00b4 |
|
23-Feb-2010 |
Kenny Root <kroot@google.com> |
Use UTF-8 strings to avoid duplicate caching, part 1
StringBlock instances containing UTF-8 strings use a cache to convert
into UTF-16, but using that cache and then using a JNI call to NewString
causes the UTF-8 string as well as two copies of the UTF-16 string to
be held in memory. Getting the UTF-8 string directly from the StringPool
eliminates one copy of the UTF-16 string being held in memory.
This is part 1. Part 2 will include ResXMLParser optimizations.
Change-Id: Ibd4509a485db746d59cd4b9501f544877139276c
/frameworks/base/tools/aapt/StringPool.cpp
|
| 2fee0ed6eb99b211efa06f095a41268a2021214a |
|
06-Jan-2010 |
Jeff Hamilton <jham@android.com> |
Add the --rename-manifest-package option to aapt.
It allows you to force override the manifest
package listed in the AndroidManifest.xml when
creating an APK file.
Change-Id: I7eac7943c4e56610b65728ae54773a273634fd9d
/frameworks/base/tools/aapt/StringPool.cpp
|
| 19138468caf7050d482dc15f35a344eab11bb756 |
|
04-Dec-2009 |
Kenny Root <kroot@google.com> |
Optional use of UTF-8 strings in resource bundles
Allows the use of UTF-8 for packing resources instead of the
default of UTF-16 for Java. When strings are extracted from the
ResStringPool, they are converted to UTF-16 and the result is
cached for subsequent calls.
When using aapt to package, add in the "-8" switch to pack the
resources using UTF-8. This will result in the value, key, and
type strings as well as the compiled XML string values taking
significantly less space in the final application package in
most scenarios.
Change-Id: I129483f8b3d3b1c5869dced05cb525e494a6c83a
/frameworks/base/tools/aapt/StringPool.cpp
|
| 88721afe2f161ae23de952b790aaa8b4d3560ba8 |
|
21-Aug-2009 |
Kenny Root <kenny@the-b.org> |
Fix bitmask in aapt's StringPool length construction
The StringPool indicates the length of a string with a 16-bit
integer. If the length of the string is greater than 0x7FFF,
it splits it into two 16-bit integers with the first one
having the high bit set.
The length calculation has a small bug that masks off the
19 bits instead of the first 15 bits as intended.
/frameworks/base/tools/aapt/StringPool.cpp
|
| 9066cfe9886ac131c34d59ed0e2d287b0e3c0087 |
|
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
/frameworks/base/tools/aapt/StringPool.cpp
|
| d83a98f4ce9cfa908f5c54bbd70f03eec07e7553 |
|
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
/frameworks/base/tools/aapt/StringPool.cpp
|
| 54b6cfa9a9e5b861a9930af873580d6dc20f773c |
|
21-Oct-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Initial Contribution
/frameworks/base/tools/aapt/StringPool.cpp
|