summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Remove superfluous OpenSSL include paths.Adam Langley2015-01-221-1/+0
* Fixup aapt usage messageJohan Redestig2015-01-071-1/+1
* Add appropriate casts for char16_t.Dan Albert2014-11-201-2/+2
* kill HAVE_LOCALTIME_RYabin Cui2014-11-131-2/+2
* Move frameworks/base over to libc++.Dan Albert2014-11-121-1/+0
* Merge "Fixing NULL pointer access causing segmentation fault in aapt"Adam Lesinski2014-11-111-1/+1
|\
| * Fixing NULL pointer access causing segmentation fault in aaptJörgen Ekström2014-11-071-1/+1
* | kill OS_CASE_SENSITIVEYabin Cui2014-11-101-1/+2
|/
* am 9295a135: am e40974d9: Merge "Fix an overflow found by ASAN."Dan Albert2014-10-201-1/+1
|\
| * am e40974d9: Merge "Fix an overflow found by ASAN."Dan Albert2014-10-201-1/+1
| |\
| | * Fix an overflow found by ASAN.Dan Albert2014-10-201-1/+1
* | | am 3f8c7dec: Merge "AAPT: Fix path for final generated resources on Windows" ...Adam Lesinski2014-10-201-1/+4
|\ \ \
| * | | AAPT: Fix path for final generated resources on WindowsAdam Lesinski2014-10-201-1/+4
* | | | am 3cd840f4: Merge "AAPT: Fix an issue where a resource name was incorrectly ...Adam Lesinski2014-10-171-1/+1
|\ \ \ \ | |/ / /
| * | | AAPT: Fix an issue where a resource name was incorrectly derived on WindowsAdam Lesinski2014-10-171-1/+1
* | | | am f47f8855: Merge "Added a daemon mode to aapt to receive streams of command...Jerome Dochez2014-10-104-0/+40
|\ \ \ \ | |/ / /
| * | | Merge "Added a daemon mode to aapt to receive streams of commands from gradle...Jerome Dochez2014-10-104-0/+40
| |\ \ \
| | * | | Added a daemon mode to aapt to receive streams of commands from gradle.Jerome Dochez2014-10-024-0/+40
* | | | | am b68fe9e5: am ae1b6805: Merge "Track change to private libcore data structu...Elliott Hughes2014-10-091-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | am ae1b6805: Merge "Track change to private libcore data structure."Elliott Hughes2014-10-091-1/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Track change to private libcore data structure.Elliott Hughes2014-10-081-1/+1
* | | | | am 908a4f9a: am 4f133894: Exclude KXmlParser from LayoutLib.Deepanshu Gupta2014-10-085-22/+125
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | am 4f133894: Exclude KXmlParser from LayoutLib.Deepanshu Gupta2014-10-085-22/+125
| |\ \ \ \
| | * | | | Exclude KXmlParser from LayoutLib.Deepanshu Gupta2014-10-085-22/+125
| | * | | | LayoutLib: Use ICU's line break algo. [DO NOT MERGE]Deepanshu Gupta2014-10-082-0/+56
| | * | | | Resource resolution bug fix. [DO NOT MERGE]Deepanshu Gupta2014-10-011-2/+1
| | * | | | Fix Tests after cherry picks. [DO NOT MERGE]Deepanshu Gupta2014-10-012-5/+5
| | * | | | Update intelliJ copyright profile [DO NOT MERGE]Deepanshu Gupta2014-10-011-1/+1
| | * | | | Build layoutlib create tests as part of sdk build. [DO NOT MERGE]Deepanshu Gupta2014-10-011-0/+3
| | * | | | Add layoutlib tests to DIST_DIR [DO NOT MERGE]Deepanshu Gupta2014-10-012-0/+6
| | * | | | Build layoutlib_create tests. [DO NOT MERGE]Deepanshu Gupta2014-10-011-0/+32
| | * | | | Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]Deepanshu Gupta2014-10-0113-23/+75
| | * | | | Get filename from File faster [DO NOT MERGE]Deepanshu Gupta2014-10-011-9/+6
| | * | | | Add testing framework to LayoutLib. [DO NOT MERGE]Deepanshu Gupta2014-10-0165-26/+1965
| | * | | | Add tests to the layoutlib eclipse project. [DO NOT MERGE]Deepanshu Gupta2014-10-011-1/+3
| | * | | | Fix error when using list as actionBarNavMode. [DO NOT MERGE]Deepanshu Gupta2014-09-251-2/+7
| | * | | | Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-modula...Deepanshu Gupta2014-09-041-0/+4
| | |\ \ \ \
| | | * | | | Resolve color xml attributes properly. [DO NOT MERGE]Deepanshu Gupta2014-08-261-0/+4
| | * | | | | Fix "@null" resource values in LayoutLib. [DO NOT MERGE]Deepanshu Gupta2014-08-261-2/+3
| | |/ / / /
* | | | | | am a80aba70: Merge "AAPT: Gate v21 resource synthesizing logging behind -v fl...Adam Lesinski2014-10-031-20/+26
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "AAPT: Gate v21 resource synthesizing logging behind -v flag" into lmp-devAdam Lesinski2014-10-031-20/+26
| |\ \ \ \ \
| | * | | | | AAPT: Gate v21 resource synthesizing logging behind -v flagAdam Lesinski2014-10-031-20/+26
| | | |_|_|/ | | |/| | |
* | | | | | am c74a2b34: Merge "Minor style changes." into lmp-devDeepanshu Gupta2014-10-031-3/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Minor style changes." into lmp-devDeepanshu Gupta2014-10-031-3/+3
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Minor style changes.Deepanshu Gupta2014-10-021-3/+3
* | | | | | resolved conflicts for merge of ee665151 to lmp-dev-plus-aospNeil Fuller2014-10-024-141/+3
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | am 0c1faf43: Merge "Switch from FloatMath -> Math and Math.hypot where possible"Neil Fuller2014-10-024-141/+3
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge "Switch from FloatMath -> Math and Math.hypot where possible"Neil Fuller2014-10-024-141/+3
| | |\ \ \ \
| | | * | | | Switch from FloatMath -> Math and Math.hypot where possibleNeil Fuller2014-10-014-141/+3
* | | | | | | am 152d9aae: am 31629651: Merge "Frameworks/base: Fix more aapt issues"Andreas Gampe2014-10-024-30/+51
|\ \ \ \ \ \ \ | |/ / / / / /