summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge "Add LOCAL_CONLYFLAGS."Ying Wang2012-08-153-2/+4
|\
| * Add LOCAL_CONLYFLAGS.Ying Wang2012-08-153-2/+4
* | am 7b559162: am a8811fda: fix MIPS buildKeun young Park2012-08-151-5/+5
|\ \ | |/ |/|
| * fix MIPS buildKeun young Park2012-08-151-5/+5
* | am 526097e4: am 0016a9ba: Merge "build: register BOARD_HAVE_BLUETOOTH_QCOM" i...Iliyan Malchev2012-08-151-0/+1
|\ \ | |/
| * 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 d68ef45f: am 1196c824: am 7159a992: am 4eddad55: Merge "Set the AOSP maste...Jean-Baptiste Queru2012-08-141-1/+0
|\ \ \ | |/ /
| * | 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
* | | | Force out LOCAL_NDK_VERSION.Ying Wang2012-08-141-0/+3
* | | | Retire LOCAL_NDK_VERSION.Ying Wang2012-08-145-35/+17
* | | | am d88c10d7: am f59a64b7: am d3d0beca: am 392bdc1f: Merge "Move the selinux m...Ying Wang2012-08-131-8/+4
|\ \ \ \ | |/ / /
| * | | 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 721cd087: am 4150db69: am d7547163: am 679b7498: Merge "Add mac_permission...Ying Wang2012-08-131-1/+1
|\ \ \ \ | |/ / /
| * | | 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
| | | |\
| | | | * Add mac_permissions.xml dependency.rpcraig2012-07-201-1/+1
* | | | | Merge "Automatically add Java resources carried by static Java libraries."Ying Wang2012-08-134-1/+18
|\ \ \ \ \
| * | | | | Automatically add Java resources carried by static Java libraries.Ying Wang2012-08-094-1/+18
* | | | | | am d99a3665: am 880d3f39: resolved conflicts for merge of 0ac38a4e to jb-mr1-devElliott Hughes2012-08-111-185/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | resolved conflicts for merge of 0ac38a4e to jb-mr1-devElliott Hughes2012-08-111-185/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | am 20e713d1: Merge "Remove TARGET_linux-sh.mk."Elliott Hughes2012-08-111-185/+0
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Remove TARGET_linux-sh.mk.Elliott Hughes2012-08-101-185/+0
* | | | | | Merge "Don't pass LOCAL_CFLAGS when compiling assembly code."Ying Wang2012-08-113-9/+8
|\ \ \ \ \ \
| * | | | | | Don't pass LOCAL_CFLAGS when compiling assembly code.Ying Wang2012-08-103-9/+8
* | | | | | | Merge "Adopt the new prebuilts/ndk/<number> paths."Ying Wang2012-08-113-12/+5
|\ \ \ \ \ \ \
| * | | | | | | Adopt the new prebuilts/ndk/<number> paths.Ying Wang2012-08-103-12/+5
* | | | | | | | am e4662db1: am 62f03479: Merge "Use new flag for emma instrumented build and...Guang Zhu2012-08-101-0/+15
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | |
| * | | | | | Merge "Use new flag for emma instrumented build and limit to apps only" into ...Guang Zhu2012-08-101-0/+15
| |\ \ \ \ \ \
| | * | | | | | Use new flag for emma instrumented build and limit to apps onlyGuang Zhu2012-08-081-0/+15
* | | | | | | | am 1b3914f5: am 62481e30: Merge "arm: add --warn-shared-textrel" into jb-mr1-devNick Kralevich2012-08-101-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "arm: add --warn-shared-textrel" into jb-mr1-devNick Kralevich2012-08-101-0/+1
| |\ \ \ \ \ \ \
| | * | | | | | | arm: add --warn-shared-textrelNick Kralevich2012-08-101-0/+1
* | | | | | | | | am 224f28a8: am 049d97d7: am 2387857d: am 968f20a4: Merge "MIPS support to *....Jean-Baptiste Queru2012-08-104-6/+15
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 2387857d: am 968f20a4: Merge "MIPS support to *.mk files and envsetup.sh"Jean-Baptiste Queru2012-08-104-6/+15
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | am 968f20a4: Merge "MIPS support to *.mk files and envsetup.sh"Jean-Baptiste Queru2012-08-104-6/+15
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | | * | | | | | MIPS support to *.mk files and envsetup.shRaghu Gandham2012-08-104-6/+15
* | | | | | | | | am 8e175c8a: am c244634e: am 64b8c6e9: am 6e6d92c4: Merge "Support for MIPS B...Jean-Baptiste Queru2012-08-109-0/+402
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | / / / | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | am 64b8c6e9: am 6e6d92c4: Merge "Support for MIPS Build targets."Jean-Baptiste Queru2012-08-109-0/+402
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 6e6d92c4: Merge "Support for MIPS Build targets."Jean-Baptiste Queru2012-08-109-0/+402
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge "Support for MIPS Build targets."Jean-Baptiste Queru2012-08-109-0/+402
| | | |\ \ \ \ \