summaryrefslogtreecommitdiffstats
path: root/tools/aapt
Commit message (Collapse)AuthorAgeFilesLines
* am 816b873d: Move the automatic namespace outside of the res namespace. do ↵Xavier Ducrohet2012-02-231-1/+1
|\ | | | | | | | | | | | | not merge. * commit '816b873df1ab98d0e79913cf589b7b1fbaf14e85': Move the automatic namespace outside of the res namespace. do not merge.
| * Move the automatic namespace outside of the res namespace. do not merge.Xavier Ducrohet2012-02-231-1/+1
| | | | | | | | | | | | (cherry picked from commit d9fe8018ffbf94f18a840005e688ad1d712f0225) Change-Id: I48ca78d5fccc75392b3f1cf9525890e5145293c4
| * Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.inazaruk2012-02-231-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | Added support for predefined namespace http://schemas.android.com/apk/res/auto that aapt tool recognizes and treats as namespace with package name taken from current application's AndroidManifest.xml, //manifest/package attribute. Signed-off-by: inazaruk <ievgenii.nazaruk@gmail.com> (cherry picked from commit e348909c1966c3d192841cc131a32be6ed90da18) Change-Id: I4bff836c42a309bac36e5d1ce1899131b3c4c194
* | am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android ↵Jean-Baptiste Queru2012-02-231-3/+9
|\ \ | | | | | | | | | | | | | | | | | | Libraries" * commit '63e43ba56a95708c229eec539a544967f1bbb7d7': Fix for issue 9656 - custom xml attributes in Android Libraries
| * \ Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"Jean-Baptiste Queru2012-02-231-3/+9
| |\ \
| | * | Fix for issue 9656 - custom xml attributes in Android Librariesinazaruk2011-05-281-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for predefined namespace http://schemas.android.com/apk/res/auto that aapt tool recognizes and treats as namespace with package name taken from current application's AndroidManifest.xml, //manifest/package attribute. Signed-off-by: inazaruk <ievgenii.nazaruk@gmail.com> Change-Id: I4b24a7265511e416cc7e02b5bb8a08ef32b598eb
* | | | am f8aea993: Make aapt ignore tools-related data.Xavier Ducrohet2012-02-061-31/+46
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| * commit 'f8aea99385df8373b6edd6d5dd1d15b7b36b525b': Make aapt ignore tools-related data.
| * | Make aapt ignore tools-related data.Xavier Ducrohet2012-02-061-31/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patchset introduces a new standard namespace http://schemas.android.com/tools which will be used for tools specific XML attributes. Any attributes using this namespace will not be compiled into the binary XML file. The namespace node is also not written at all, and its string is not collected to ensure that there is no impact on the devices. (cherry picked from commit a5d5e9d906583ebeb590ca200ca9840302a5cd1a) Change-Id: I62937b8bc34c07ac544930aa8eadd7797e0179d5
* | | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)Steve Block2012-01-191-2/+2
| | | | | | | | | | | | Change-Id: I1de629b4632a4b3187ca1a28d6416daccd35f924
* | | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)Steve Block2012-01-192-3/+3
| | | | | | | | | | | | Change-Id: I8fbdfa7a7581f481968dbb65aa40f7042936d7cb
* | | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)Steve Block2012-01-191-1/+1
| | | | | | | | | | | | Change-Id: I26f76452ac49e2890b14d133c065493d8df0fb4a
* | | Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)Steve Block2012-01-192-57/+57
| | | | | | | | | | | | Change-Id: I44f267700356967dc51e8f85ebf457dc85cfb229
* | | Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)Steve Block2012-01-192-18/+18
|/ / | | | | | | Change-Id: I5321ebd12e9c6248a108529e82c4e1af2a4405e3
* | Merge "AAPT fix printf %zd crash on Windows". Do not merge.Raphael2011-12-112-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | There's no printf %zd on Mingw/Cygwin so the verbose printf crashes aapt. SDK bugs: 20395, 20986 Bug: 5742142 (cherry picked from commit f51125d8429ffa71c57ba6fbdca9effc72642a9b) Change-Id: I7545734ce8ce4a1f3e95f8a255daa8a909f870a1
* | add -ldl to host executablesIliyan Malchev2011-10-201-1/+1
| | | | | | | | | | | | | | | | This fixes the build on Linux when RefBase is compiled with reference tracking enabled. Change-Id: I3e931e0b463ce836f6fdb30c37068d77144631a3 Signed-off-by: Iliyan Malchev <malchev@google.com>
* | Whoops, remove left-over debug output.Dianne Hackborn2011-10-161-1/+1
| | | | | | | | Change-Id: Ib30571b22a6750629f975319a403d38de5e9462c
* | New aapt feature to do smarter filtering of configurations.Dianne Hackborn2011-10-1613-286/+615
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a --preferred-configurations flag that specifies the specific configurations you would like to have. It is smarter than "-c" because it will avoid stripping a configuration if that would result in there being no value for the resource. It is dumber than "-c" because it can't process as many kinds of resources. It is really only intended for bitmaps and use with density configs. This required re-arranging AaptAssets to group files together by config again, like they used to be. I think this hasn't broken anything. Hopefully. Change-Id: I4e9d12ff6e6dbd1abb8fd4cb1814c6674b19d0e5
* | Add package-verifier to aapt dump badgingKenny Root2011-09-291-0/+10
| | | | | | | | | | | | Print out the package-verifier information when printing out badging. Change-Id: I9c79c163261d5d4f1094bda76d90b3ff6e1ce540
* | Don't lose product variant strings that also vary between locales.Eric Fischer2011-09-272-1/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Localized strings with product variants were not being included in the APK, apparently because the check to ensure that a different variation of the string had not already been included in the APK was matching the version of it from the default, untranslated configuration. Now check to make sure that the string not only exists but also exists in the correct configuration. Bug 5372711 Change-Id: I52975570b75e0f11827dc6bcf1cb4a987d0541aa
* | am d98e1be2: am f4750724: am 9d829f98: am 21e6e2de: Merge "Change generated ↵Xavier Ducrohet2011-08-183-9/+33
|\ \ | | | | | | | | | | | | | | | | | | dependency file names" * commit 'd98e1be20e1cca5c36c7e0344500d4a5574568aa': Change generated dependency file names
| * \ am f4750724: am 9d829f98: am 21e6e2de: Merge "Change generated dependency ↵Xavier Ducrohet2011-08-183-9/+33
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | file names" * commit 'f4750724cf8db972a052cb388dc9a39fc7aa6dd6': Change generated dependency file names
| | * | Change generated dependency file namesJosiah Gaskin2011-08-163-9/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the name of the generated dependency files to R.java.d and <ApkName>.ap_.d respectively. Change-Id: I17e18770fc0d0a5d31c7b37b40ac1949f45ef13a
* | | | am 6abf2f50: am 0b45ca88: am cd01ad7c: am 20339b24: Merge "Remove Debug Code"Xavier Ducrohet2011-07-271-15/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '6abf2f501e60132a5369ad5b15b388912c8e9e5b': Remove Debug Code
| * | | am 0b45ca88: am cd01ad7c: am 20339b24: Merge "Remove Debug Code"Xavier Ducrohet2011-07-271-15/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '0b45ca8884acfd2e9ccdcb3fbe641a46b116bda0': Remove Debug Code
| | * | Remove Debug CodeJosiah Gaskin2011-07-271-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change removes debugging code from FileFinder. This code was considered harmful because it uses the std::cout from <iostream>. Change-Id: Iad9b5e8a631883bd4854abdb29bc6df8a5b4a056
* | | | Change ZipFile flags anonymous enumKenny Root2011-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The arguments that ZipFile takes were apparently meant to be a typed enum, but the name of the type was taken out because it creates invalid conversion warnings in C++ since this is an invalid use of enum. Just change the typedef enum to an anonymous enum so we get rid of the compiler warnings. It will be implicitly converted to int instead. Change-Id: Ie72c4c235c8f9ee8fd1b795e1010b77c55e983de
* | | | am b3ab070e: am 3a2d1c23: am ddb8e3b2: am 9bac0a9f: Merge "Fix to compile ↵Xavier Ducrohet2011-07-202-4/+27
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | for windows" * commit 'b3ab070edb17f00a4b2d0f511ca539c885b28b6f': Fix to compile for windows
| * | | am 3a2d1c23: am ddb8e3b2: am 9bac0a9f: Merge "Fix to compile for windows"Xavier Ducrohet2011-07-202-4/+27
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '3a2d1c2351c0b4eeb4dc4d91d1c334b9f8ba00ed': Fix to compile for windows
| | * | Fix to compile for windowsJosiah Gaskin2011-07-202-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This change includes a workaround for dirent.h on windows not including d_type. Change-Id: Ieaa3f298d2e6b32f2d8367384a1d02a2f5d06cca
* | | | am 84be06e4: resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aospXavier Ducrohet2011-07-2020-13/+1206
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '84be06e4ce0778fbf0c1ac72f94795ef8433439b': Added Caching for PreProcessed PNGs
| * | | resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aospXavier Ducrohet2011-07-2020-13/+1206
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I8e047147a4d2c899b6654c03a5f32b04d929e602
| | * | Added Caching for PreProcessed PNGsJosiah Gaskin2011-07-2020-13/+1206
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a cache management system for pre-processed PNG files along with unit tests. The cache system will be used if the --no-crunch flag is passed to AAPT during the package phase. The cache can be updated by a call to 'aapt crunch' (see usage statement). Also put in benchmarking code. Change-Id: I58271fb2ee2f5f9075fd74d4ff6f15e7afabd05c
* | | | am a125c937: resolved conflicts for merge of 2c311be7 to honeycomb-plus-aospXavier Ducrohet2011-07-208-26/+62
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'a125c937de06b1cc43368743592f47513eb88b76': Add generation of dependency file for .ap_ package
| * | | resolved conflicts for merge of 2c311be7 to honeycomb-plus-aospXavier Ducrohet2011-07-208-26/+62
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I806c7b4ae95f66df621587e52497dd8739a115fe
| | * | Add generation of dependency file for .ap_ packageJosiah Gaskin2011-07-188-27/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Aapt generate a dependency file in the same directory as the output ap_ file if the --generate-dependencies flag is set. This dependency file can then be read by the ant exec loop task to see whether to repackage resources. Change-Id: I763679414daf76369700aa599c26dcf78d4de099
* | | | am 9139868b: am ba6c98db: am 82943ecf: am d40c93f6: Merge "Add dependency ↵Xavier Ducrohet2011-07-197-18/+110
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | generation to Aapt for R.java" * commit '9139868b6c5cb29b3665984225dceb0193fec31d': Add dependency generation to Aapt for R.java
| * | | am ba6c98db: am 82943ecf: am d40c93f6: Merge "Add dependency generation to ↵Xavier Ducrohet2011-07-197-18/+110
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Aapt for R.java" * commit 'ba6c98db8f21016f81ecac35bb0ea3c433044bb7': Add dependency generation to Aapt for R.java
| | * | Add dependency generation to Aapt for R.javaJosiah Gaskin2011-06-278-19/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Aapt generate a dependency file in the location specified by RClassDir for R.java if the --generate-dependencies flag is set. This dependency file is then read by the ant exec loop task to see whether to recreate R.java. Change-Id: I7152dac86b6ea0e448ef65e3a95694afe233c789
* | | | am bf31250b: am d5431ed5: am 2e659ae5: am 42755155: Merge "Copy once-created ↵Xavier Ducrohet2011-07-193-1/+26
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | R.java into library projects" * commit 'bf31250ba0858a2e72a3906a1f0216846683bc2e': Copy once-created R.java into library projects
| * | | am d5431ed5: am 2e659ae5: am 42755155: Merge "Copy once-created R.java into ↵Xavier Ducrohet2011-07-193-1/+26
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | library projects" * commit 'd5431ed5505a42e5e33c8bf7cc2ff72792979be9': Copy once-created R.java into library projects
| | * | Copy once-created R.java into library projectsJosiah Gaskin2011-06-273-1/+26
| | |/ | | | | | | | | | | | | | | | | | | | | | This change adds functionality in Aapt to allow specification of library projects to copy the generated R.java file into rather than regenerating the file for each library project. Change-Id: I05939d1dc875bd875be9298ca47cb639235070c6
| | * Merge changes I0ab47e2f,Ib8016996Conley Owens2011-04-271-1/+2
| | |\ | | | | | | | | | | | | | | | | | | | | * changes: Remove errant tag terminator Normalize output of XMLtree content
| | | * Normalize output of XMLtree contentShachar Shemesh2011-04-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the output from aapt dump xmltree normalized, so that it is unambigously displayed regardless of the content of the strings. Previous patch left out handling of XML element content. Change-Id: Ib8016996c769f3dde7a87f7ecbdf850333f2426a
* | | | Output Proguard options for also overlay layouts.Ying Wang2011-06-201-0/+5
|/ / / | | | | | | | | | Change-Id: I7bfac476247bd7b532510e295cb1a3e61e9af88b
* | | am f1c5dbbd: am abd4dffc: Merge "New orientation handling. Only impacts SDK ↵Dianne Hackborn2011-06-161-8/+48
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | (aapt dump badging)." into honeycomb-mr2 * commit 'f1c5dbbd457bb14d3673508aaba497cdc328a1ef': New orientation handling. Only impacts SDK (aapt dump badging).
| * | | New orientation handling. Only impacts SDK (aapt dump badging).Dianne Hackborn2011-06-161-8/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a new way of determining whether an application requires specific orientations, done by looking at any requirements in its activity tags. Note that this won't catch all possible issues, because applications can still force an orientation through Java APIs, but the vast majority of applications that actually require a specific orientation should be doing it this way because it the easiest way and the only way to cleanly launch into the app from a different orientation without doing some serious activity tricks. Change-Id: I11d32104f6bc3d2a72aeeff1ca150b8f1c9f5588
* | | | am 6c0533f9: am c5193c62: Merge "Add new landscape and portrait orientation ↵Dianne Hackborn2011-06-141-22/+134
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | features." into honeycomb-mr2 * commit '6c0533f994e7991b3bd60cab48362e8e2e6d86f0': Add new landscape and portrait orientation features.
| * | | Add new landscape and portrait orientation features.Dianne Hackborn2011-06-141-22/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates aapt to know about these. Also updates aapt badging to: - No longer crash due to the change to how we match unspecified configuration resources. - Report the new "smallest screen" supported screen configs. - Infer old screen size buckets based on new smallest width attrs. - Report all of the different labels and icons in an app. Change-Id: I7376042b817391bd070f549cebbc7f03be4635c8
* | | | am c6adfed6: am f795e9a8: Okay *now* really enforce the limit on non-public ↵Dianne Hackborn2011-06-101-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | styles. * commit 'c6adfed6dcea8482e482db58bd396ea8de08426a': Okay *now* really enforce the limit on non-public styles.
| * | | Okay *now* really enforce the limit on non-public styles.Dianne Hackborn2011-06-091-2/+2
| | | | | | | | | | | | | | | | Change-Id: Ie8df6acf7cc3dec00f615b2fa9a5122ec79a0aae
generated by cgit v1.1 at 2025-01-13 00:03:29 +0000