summaryrefslogtreecommitdiffstats
path: root/core
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
| |\ \ \ | | |/ /
| | * | 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
| |\ \ | | |/
| | * 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
| |\ \ | | |/
| | * Make error a warning for nowJoe Onorato2012-08-171-1/+2
* | | resolved conflicts for merge of 5836d3b3 to jb-mr1-devJoe Onorato2012-08-177-614/+200
|\ \ \ | |/ /
| * | am f72e34eb: Merge changes I9d3a3c16,I17b5d441,I29e27505,Ia5ca233e,I0a0b200b,...Joe Onorato2012-08-167-605/+191
| |\ \ | | |/
| | * More product debugging.Joe Onorato2012-08-161-20/+96
| | * build system changes for jb-aah-dev mergeJoe Onorato2012-08-161-6/+7
| | * 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
| | * Dump the user tagged modules.Joe Onorato2012-08-162-1/+29
| | * 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
| | * make product-graph now filteredJoe Onorato2012-08-161-5/+21
* | | 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
* | | | | Merge "build: register BOARD_HAVE_BLUETOOTH_QCOM" into jb-mr1-devIliyan Malchev2012-08-151-0/+1
|\ \ \ \ \
| * | | | | build: register BOARD_HAVE_BLUETOOTH_QCOMIliyan Malchev2012-08-151-0/+1
* | | | | | Force out LOCAL_NDK_VERSION.Ying Wang2012-08-141-0/+3
|/ / / / /
* | | | | Retire LOCAL_NDK_VERSION.Ying Wang2012-08-145-35/+17
* | | | | Merge "Adopt the new prebuilts/ndk/<number> paths." into jb-mr1-devYing Wang2012-08-143-12/+5
|\ \ \ \ \
| * | | | | Adopt the new prebuilts/ndk/<number> paths.Ying Wang2012-08-143-12/+5
* | | | | | am 7159a992: am 4eddad55: Merge "Set the AOSP master to be API level 16"Jean-Baptiste Queru2012-08-141-1/+0
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | am 4eddad55: Merge "Set the AOSP master to be API level 16"Jean-Baptiste Queru2012-08-141-2/+1
| |\ \ \ \ | | |/ / /
| | * | | Set the AOSP master to be API level 16Jean-Baptiste Queru2012-08-141-2/+1
* | | | | am d3d0beca: am 392bdc1f: Merge "Move the selinux modules to core PRODUCT_PAC...Ying Wang2012-08-131-8/+4
|\ \ \ \ \ | |/ / / /
| * | | | am 392bdc1f: Merge "Move the selinux modules to core PRODUCT_PACKAGES"Ying Wang2012-08-131-8/+4
| |\ \ \ \ | | |/ / /
| | * | | Move the selinux modules to core PRODUCT_PACKAGESYing Wang2012-08-131-8/+4
* | | | | am d7547163: am 679b7498: Merge "Add mac_permissions.xml dependency."Ying Wang2012-08-131-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 679b7498: Merge "Add mac_permissions.xml dependency."Ying Wang2012-08-131-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge "Add mac_permissions.xml dependency."Ying Wang2012-08-131-1/+1
| | |\ \ \ | | | |_|/ | | |/| |