summaryrefslogtreecommitdiffstats
path: root/tools/aapt
Commit message (Expand)AuthorAgeFilesLines
* aapt: add option for stricter symbol generationAdrian Roos2015-06-025-3/+49
* Add -round and -notround qualifier to android runtime/aaptAdam Lesinski2015-05-154-1/+48
* Remove unused aapt target.Chih-Hung Hsieh2015-05-061-24/+0
* am 815d9bb1: Merge "Add a static dependency on libbase."Narayan Kamath2015-04-291-1/+2
|\
| * Add a static dependency on libbase.Narayan Kamath2015-04-291-1/+2
* | AAPT: Add flag to disable versioning of vector related XMLAdam Lesinski2015-04-213-4/+20
* | am 106f83ee: am 4cead39a: am 1be312df: Merge "Re-enable -Wall and -Werror tha...Colin Cross2015-04-094-5/+2
|\ \ | |/
| * Merge "Re-enable -Wall and -Werror that were lost in a merge"Colin Cross2015-04-094-5/+2
| |\
| | * Re-enable -Wall and -Werror that were lost in a mergeColin Cross2015-04-084-5/+2
* | | am 66d94512: am dbb5f5d6: am efcbaec1: Merge "Only Windows doesn\'t have %zd."Elliott Hughes2015-04-034-4/+4
|\ \ \ | |/ /
| * | Only Windows doesn't have %zd.Elliott Hughes2015-04-034-4/+4
| |/
* | Merge "Output modified bcp47 tag in ResTable_config::toString()"Adam Lesinski2015-03-203-30/+1
|\ \
| * | Output modified bcp47 tag in ResTable_config::toString()Adam Lesinski2015-03-163-30/+1
* | | am 0634fba5: am 89da4ca6: Merge "Remove unused printapk.cpp."Elliott Hughes2015-03-191-127/+0
|\ \ \ | | |/ | |/|
| * | Remove unused printapk.cpp.Elliott Hughes2015-03-191-127/+0
* | | Handle malformed manifests in printXMLBlockVishwath Mohan2015-03-121-14/+22
| |/ |/|
* | am 7a79c4ca: am f8d6a4ba: resolved conflicts for merge of 701f9c2f to stage-a...Dan Albert2015-03-053-26/+19
|\ \ | |/
| * resolved conflicts for merge of 701f9c2f to stage-aosp-masterDan Albert2015-03-053-26/+19
| |\
| | * Stop using namespace std.Dan Albert2015-03-043-26/+19
* | | Merge "Parse res-car as resources for UI_MODE_TYPE_CAR.."Narayan Kamath2015-02-112-1/+8
|\ \ \ | |/ / |/| |
| * | Parse res-car as resources for UI_MODE_TYPE_CAR..Narayan Kamath2015-02-102-1/+8
* | | am 510c24e8: Merge "Fix AAPT daemon mode with paths containg spaces." into lm...Chris Warrington2015-02-101-15/+10
|\ \ \ | |/ / |/| |
| * | Fix AAPT daemon mode with paths containg spaces.Chris Warrington2015-02-091-15/+10
* | | Merge "AAPT: Use the right enum when checking for density configurations" int...Adam Lesinski2015-01-231-1/+1
|\ \ \ | |/ /
| * | AAPT: Use the right enum when checking for density configurationsAdam Lesinski2015-01-221-1/+1
* | | am e488ce86: am 94e30215: Merge "AAPT: Handle all old unversioned attribute u...Adam Lesinski2015-01-143-48/+127
|\ \ \ | |/ /
| * | AAPT: Handle all old unversioned attribute usageAdam Lesinski2015-01-143-48/+127
* | | am c04a21a0: Merge "Fixup aapt usage message" automerge: 64044d0Adam Lesinski2015-01-081-1/+1
|\ \ \ | | |/ | |/|
| * | Fixup aapt usage messageJohan Redestig2015-01-071-1/+1
| * | Add appropriate casts for char16_t.Dan Albert2014-11-201-2/+2
* | | am 503a4494: am f1f179a7: Merge "AAPT: Copy android:revisionCode to Splits" i...Adam Lesinski2014-12-162-0/+16
|\ \ \ | | |/ | |/|
| * | Merge "AAPT: Copy android:revisionCode to Splits" into lmp-mr1-devAdam Lesinski2014-12-162-0/+16
| |\ \
| | * | AAPT: Copy android:revisionCode to SplitsAdam Lesinski2014-12-162-0/+16
* | | | am 0f0e85a6: Merge "AAPT: attributes showing up after v21 attributes would be...Adam Lesinski2014-12-161-25/+17
|\ \ \ \ | |/ / /
| * | | Merge "AAPT: attributes showing up after v21 attributes would be removed for ...Adam Lesinski2014-12-151-25/+17
| |\ \ \
| | * | | AAPT: attributes showing up after v21 attributes would be removed for pre-21 ...Adam Lesinski2014-12-101-25/+17
| | |/ /
* | | | am c765655a: am fbba9b57: Merge "AAPT: Dump status of required flag for uses-...Adam Lesinski2014-12-091-5/+3
|\ \ \ \ | |/ / /
| * | | AAPT: Dump status of required flag for uses-featureAdam Lesinski2014-12-081-5/+3
| |/ /
* | | Merge commit '0953ab27' into manualmergeAdam Lesinski2014-12-052-22/+164
|\ \ \ | |/ /
| * | Merge "AAPT: Move private attrs to new type for framework" into lmp-mr1-devAdam Lesinski2014-12-042-22/+161
| |\ \
| | * | AAPT: Move private attrs to new type for frameworkAdam Lesinski2014-12-032-22/+161
* | | | am 72a6aeac: am 91ca64ea: Merge "AAPT: Add pathMotion custom classes to Progu...Adam Lesinski2014-12-031-6/+9
|\ \ \ \ | |/ / /
| * | | AAPT: Add pathMotion custom classes to Proguard Keep setAdam Lesinski2014-12-021-6/+9
* | | | am f17611a2: am 130e30fe: Merge "AAPT: Add custom transition classes to Progu...Adam Lesinski2014-12-031-0/+9
|\ \ \ \ | |/ / /
| * | | AAPT: Add custom transition classes to Proguard keep setAdam Lesinski2014-12-021-0/+9
| |/ /
* | | am 537888be: Merge "kill HAVE_LOCALTIME_R"Yabin Cui2014-11-131-2/+2
|\ \ \ | | |/ | |/|
| * | kill HAVE_LOCALTIME_RYabin Cui2014-11-131-2/+2
* | | resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aospDan Albert2014-11-121-1/+0
|\ \ \ | |/ /
| * | Move frameworks/base over to libc++.Dan Albert2014-11-121-1/+0
* | | am da772234: Merge "AAPT: Ignore densities specified in -c flag" into lmp-mr1...Adam Lesinski2014-11-111-0/+7
|\ \ \ | | |/ | |/|