summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 726d921a: am 45cd00cd: Merge "Install all host modules. Don\'t filter out...Joe Onorato2012-08-171-3/+1
|\
| * am 45cd00cd: Merge "Install all host modules. Don\'t filter out ones tagged ...Joe Onorato2012-08-171-3/+1
| |\
| | * Merge "Install all host modules. Don't filter out ones tagged "optional""Joe Onorato2012-08-171-3/+1
| | |\
| | | * Install all host modules. Don't filter out ones tagged "optional"Joe Onorato2012-08-171-3/+1
* | | | am 763c0801: am 687bde38: Merge "Add all the host tools to the list of prereq...Joe Onorato2012-08-171-1/+2
|\ \ \ \ | |/ / /
| * | | am 687bde38: Merge "Add all the host tools to the list of prerequisites for t...Joe Onorato2012-08-171-1/+2
| |\ \ \ | | |/ /
| | * | Merge "Add all the host tools to the list of prerequisites for the SDK."Joe Onorato2012-08-171-1/+2
| | |\ \ | | | |/ | | |/|
| | | * Add all the host tools to the list of prerequisites for the SDK.Joe Onorato2012-08-171-1/+2
| | |/
* | | resolved conflicts for merge of fab83a3d to jb-mr1-devJoe Onorato2012-08-171-4/+4
|\ \ \ | |/ /
| * | am 3b4b11a4: Merge "Another error to warning"Joe Onorato2012-08-171-1/+1
| |\ \ | | |/
| | * Merge "Another error to warning"Joe Onorato2012-08-171-1/+1
| | |\
| | | * Another error to warningJoe Onorato2012-08-171-1/+1
| | |/
* | | am 6b340ad0: am 7c945d24: Merge "Make error a warning for now"Joe Onorato2012-08-171-1/+2
|\ \ \ | |/ /
| * | am 7c945d24: Merge "Make error a warning for now"Joe Onorato2012-08-171-1/+2
| |\ \ | | |/
| | * Merge "Make error a warning for now"Joe Onorato2012-08-171-1/+2
| | |\
| | | * Make error a warning for nowJoe Onorato2012-08-171-1/+2
| | |/
* | | resolved conflicts for merge of 5836d3b3 to jb-mr1-devJoe Onorato2012-08-1716-619/+758
|\ \ \ | |/ /
| * | am f72e34eb: Merge changes I9d3a3c16,I17b5d441,I29e27505,Ia5ca233e,I0a0b200b,...Joe Onorato2012-08-1616-609/+748
| |\ \ | | |/
| | * Merge changes I9d3a3c16,I17b5d441,I29e27505,Ia5ca233e,I0a0b200b,I6f412ed4,I62...Joe Onorato2012-08-1616-609/+748
| | |\
| | | * Move the old user tagged modules over to base.mk so mini and core both share ...Joe Onorato2012-08-163-132/+160
| | | * More product debugging.Joe Onorato2012-08-162-20/+256
| | | * build system changes for jb-aah-dev mergeJoe Onorato2012-08-162-13/+9
| | | * Fail when a non-vendor product references a vendor module.Joe Onorato2012-08-162-6/+8
| | | * Remove support for user tags in the build system.Joe Onorato2012-08-165-612/+49
| | | * List the user modules explicitly, and we can get rid of the support for the u...Joe Onorato2012-08-162-0/+152
| | | * Dump the user tagged modules.Joe Onorato2012-08-162-1/+29
| | | * host modules don't need LOCAL_MODULE_TAGSJoe Onorato2012-08-161-1/+0
| | | * Don't give the user tag to host modules automatically.Joe Onorato2012-08-163-8/+30
| | | * Add a phony "nothing" goal that reads the makefiles but doesn't try to build ...Joe Onorato2012-08-161-0/+4
| | | * Add tool to parse make dependency info from new --deps flag.Joe Onorato2012-08-161-0/+151
| | | * Use a more modern -j flag.Joe Onorato2012-08-161-1/+1
| | | * make product-graph now filteredJoe Onorato2012-08-162-5/+89
| | |/
* | | am dfab95a1: (-s ours) Reconcile with jb-mr0-release jb-release - do not mergeThe Android Open Source Project2012-08-160-0/+0
|\ \ \ | |/ /
| | |
| | \
| *-. \ Reconcile with jb-mr0-release jb-release - do not mergeThe Android Open Source Project2012-08-160-0/+0
| |\ \ \
| | | * | JRO03RThe Android Automerger2012-08-161-1/+1
| | | * | JRO03QThe Android Automerger2012-08-161-1/+1
| | * | | JZO47The Android Automerger2012-08-161-13/+3
| | * | | merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-08-160-0/+0
| | |\ \ \
* | | \ \ \ Merge "Don't include system/core/include/arch/<arch>/Android.mk for apps-only...Ying Wang2012-08-166-35/+38
|\ \ \ \ \ \
| * | | | | | Don't include system/core/include/arch/<arch>/Android.mk for apps-only build.Ying Wang2012-08-166-35/+38
* | | | | | | am d77d8906: am 6020d698: Merge "select.mk: Tune ccache options"Jean-Baptiste Queru2012-08-161-0/+17
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | am 6020d698: Merge "select.mk: Tune ccache options"Jean-Baptiste Queru2012-08-161-0/+17
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge "select.mk: Tune ccache options"Jean-Baptiste Queru2012-08-161-0/+17
| | |\ \ \ \
| | | * | | | select.mk: Tune ccache optionsAndrew Boie2012-08-161-0/+17
* | | | | | | Support to build emmap_mata.zip in unbundled builds.Ying Wang2012-08-162-8/+19
* | | | | | | am 0fc8d635: am f2a618e1: Merge "The zoneinfo stuff is no longer legacy."Elliott Hughes2012-08-151-4/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am f2a618e1: Merge "The zoneinfo stuff is no longer legacy."Elliott Hughes2012-08-151-4/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "The zoneinfo stuff is no longer legacy."Elliott Hughes2012-08-151-4/+1
| | |\ \ \ \ \
| | | * | | | | The zoneinfo stuff is no longer legacy.Elliott Hughes2012-08-151-4/+1
* | | | | | | | fix MIPS buildKeun young Park2012-08-151-5/+5