summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* am 9efc18fb: am da3eec42: am 708242d5: Merge "Increase the maximum javac heap...Ying Wang2014-03-271-1/+1
|\
| * am da3eec42: am 708242d5: Merge "Increase the maximum javac heap size."Ying Wang2014-03-271-1/+1
| |\
| | * Increase the maximum javac heap size.Ying Wang2014-03-261-1/+1
* | | am 441e9452: resolved conflicts for merge of f3e25fea to klp-modular-dev-plus...Colin Cross2014-03-278-17/+116
|\ \ \ | |/ /
| * | resolved conflicts for merge of f3e25fea to klp-modular-dev-plus-aospColin Cross2014-03-268-17/+116
| |\ \ | | |/
| | * add support for LOCAL_MULTILIBColin Cross2014-03-268-17/+115
* | | am c8fea2ae: am 7c629a72: am cc851243: Merge "Add annotation support lib." in...Xavier Ducrohet2014-03-261-0/+1
|\ \ \ | |/ /
| * | am 7c629a72: am cc851243: Merge "Add annotation support lib." into klp-ub-devXavier Ducrohet2014-03-261-0/+1
| |\ \
| | * \ am cc851243: Merge "Add annotation support lib." into klp-ub-devXavier Ducrohet2014-03-261-0/+1
| | |\ \
| | | * \ Merge "Add annotation support lib." into klp-ub-devXavier Ducrohet2014-03-261-0/+1
| | | |\ \
| | | | * | Add annotation support lib.Xavier Ducrohet2014-03-261-0/+1
* | | | | | Merge "Temporarily use a separate var for including shared resources"Adam Lesinski2014-03-263-5/+6
|\ \ \ \ \ \
| * | | | | | Temporarily use a separate var for including shared resourcesAdam Lesinski2014-03-253-5/+6
* | | | | | | am 8295d6cd: am ce087413: am 36a67a90: Merge topic \'tests\'Colin Cross2014-03-256-28/+38
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | am ce087413: am 36a67a90: Merge topic \'tests\'Colin Cross2014-03-256-28/+38
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | add support for LOCAL_MODULE_STEM_32 and LOCAL_MODULE_STEM_64Colin Cross2014-03-255-26/+23
| | * | | | add support for LOCAL_MODULE_PATH_32 and LOCAL_MODULE_PATH_64Colin Cross2014-03-253-2/+15
* | | | | | Set up dependency of resource_export_packageYing Wang2014-03-251-1/+2
* | | | | | am 9c08a73b: am 6440fb0c: am b35094ec: am 01aa01db: Merge "Make Clang host bu...Tim Murray2014-03-256-10/+82
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am b35094ec: am 01aa01db: Merge "Make Clang host builds hermetic on Linux."Tim Murray2014-03-256-10/+82
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Make Clang host builds hermetic on Linux."Tim Murray2014-03-256-10/+82
| | |\ \ \ \
| | | * | | | Make Clang host builds hermetic on Linux.Tim Murray2014-03-246-10/+82
* | | | | | | am 3c1183a6: am 3a943c9e: am 0143ee4a: am a3c76c28: Merge "remove libeffects ...Colin Cross2014-03-251-4/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 0143ee4a: am a3c76c28: Merge "remove libeffects from 64-bit blacklist"Colin Cross2014-03-251-4/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "remove libeffects from 64-bit blacklist"Colin Cross2014-03-251-4/+0
| | |\ \ \ \ \
| | | * | | | | remove libeffects from 64-bit blacklistColin Cross2014-03-241-4/+0
* | | | | | | | am 264a5ed3: am 711951ab: am 78a819d6: am 266cf4f2: am f39752e9: Skip the pro...Ying Wang2014-03-251-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 78a819d6: am 266cf4f2: am f39752e9: Skip the product-scoped --product flag...Ying Wang2014-03-251-1/+1
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | am 266cf4f2: am f39752e9: Skip the product-scoped --product flag if it\'s set...Ying Wang2014-03-251-1/+1
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | | * | | | | am f39752e9: Skip the product-scoped --product flag if it\'s set in LOCAL_AAP...Ying Wang2014-03-241-1/+1
| | | |\ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | | * | | | Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGSYing Wang2014-03-201-1/+1
| | | * | | | | am 7503e736: 4.4.3 is MR2, version boogaloo!Dianne Hackborn2014-03-111-1/+1
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | 4.4.3 is MR2, version boogaloo!Dianne Hackborn2014-03-111-1/+1
* | | | | | | | Add LOCAL_APK_LIBRARIES to the AAPT -I flagAdam Lesinski2014-03-251-2/+12
* | | | | | | | am cde91b3e: am 0adc6431: am c550cd45: am fa97fe67: Merge "Pick gnu-libstdc++...Andrew Hsieh2014-03-251-3/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am c550cd45: am fa97fe67: Merge "Pick gnu-libstdc++ based on TARGET_GCC_VERSION"Andrew Hsieh2014-03-251-3/+3
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Pick gnu-libstdc++ based on TARGET_GCC_VERSIONAndrew Hsieh2014-03-251-3/+3
| | | |_|_|/ / | | |/| | | |
* | | | | | | am 7a93f683: am 82a2ae71: am 5a4c783c: am 8c60a1df: Merge "Complete installed...Ying Wang2014-03-241-32/+39
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 5a4c783c: am 8c60a1df: Merge "Complete installed shared library dependency"Ying Wang2014-03-221-32/+39
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Complete installed shared library dependencyYing Wang2014-03-211-32/+39
| | | |_|_|/ | | |/| | |
* | | | | | Merge "Add warning message for java6 builds."Narayan Kamath2014-03-211-1/+12
|\ \ \ \ \ \
| * | | | | | Add warning message for java6 builds.Narayan Kamath2014-03-201-1/+12
* | | | | | | am e07f9225: am 7e998752: am 189a874f: am 8c1bbdb9: Merge "remove more projec...Colin Cross2014-03-201-8/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am 189a874f: am 8c1bbdb9: Merge "remove more projects from 64-bit blacklist"Colin Cross2014-03-201-8/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge "remove more projects from 64-bit blacklist"Colin Cross2014-03-201-8/+0
| | |\ \ \ \ \
| | | * | | | | remove more projects from 64-bit blacklistColin Cross2014-03-201-8/+0
* | | | | | | | am 84fbc7e8: am 996f3826: am c5a56344: am 1c43aaea: Merge "Remove the redunda...Ying Wang2014-03-202-2/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am c5a56344: am 1c43aaea: Merge "Remove the redundant DISABLE_DEXPREOPT"Ying Wang2014-03-202-2/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Remove the redundant DISABLE_DEXPREOPTYing Wang2014-03-202-2/+1
* | | | | | | | resolved conflicts for merge of ad495272 to masterYing Wang2014-03-203-8/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | / / / / | |_|_|/ / / / |/| | | | | |