summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |\
| | | * Add mac_permissions.xml dependency.rpcraig2012-07-201-1/+1
* | | | 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 "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
* | | | | 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 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 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
| | |\ \ \ \
| | | * | | | Support for MIPS Build targets.Raghu Gandham2012-08-019-0/+402
* | | | | | | tidy up building of recovery ramdisk imageDoug Zongker2012-08-091-19/+18
| |_|_|/ / / |/| | | | |
* | | | | | Merge "recovery: don't delete hardware specific init*.rc files" into jb-mr1-devColin Cross2012-08-081-1/+1
|\ \ \ \ \ \
| * | | | | | recovery: don't delete hardware specific init*.rc filesColin Cross2012-08-081-1/+1
* | | | | | | Don't install overridden packages in pdk fusion files.Ying Wang2012-08-081-1/+5
| |_|_|_|/ / |/| | | | |
* | | | | | am 35b24a82: am 8776f34a: Merge "x86: cleanups for toolchain"Jean-Baptiste Queru2012-08-081-7/+10
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 8776f34a: Merge "x86: cleanups for toolchain"Jean-Baptiste Queru2012-08-081-7/+10
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge "x86: cleanups for toolchain"Jean-Baptiste Queru2012-08-081-7/+10
| | |\ \ \ \
| | | * | | | x86: cleanups for toolchainBruce Beare2012-07-171-7/+10
* | | | | | | am a4814370: am 4733cfd2: Merge "definitions.mk: Don\'t use GCC \'@\' parameter"Jean-Baptiste Queru2012-08-081-4/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 4733cfd2: Merge "definitions.mk: Don\'t use GCC \'@\' parameter"Jean-Baptiste Queru2012-08-081-4/+4
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "definitions.mk: Don't use GCC '@' parameter"Jean-Baptiste Queru2012-08-081-4/+4
| | |\ \ \ \ \
| | | * | | | | definitions.mk: Don't use GCC '@' parameterAndrew Boie2012-07-261-4/+4
* | | | | | | | am 04363aa5: am af541a64: Merge "core/Makefile: also look for device/*/build/...Jean-Baptiste Queru2012-08-081-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | / / / | |_|_|_|/ / / |/| | | | | |
| * | | | | | am af541a64: Merge "core/Makefile: also look for device/*/build/tasks"Jean-Baptiste Queru2012-08-081-0/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "core/Makefile: also look for device/*/build/tasks"Jean-Baptiste Queru2012-08-081-0/+1
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | | * | | | core/Makefile: also look for device/*/build/tasksAndrew Boie2012-07-171-0/+1
| * | | | | | am 47e63bb4: Merge "Fix build."Jean-Baptiste Queru2012-07-272-2/+5
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Fix build.Ying Wang2012-07-272-2/+5
| | | |/ / / | | |/| | |
* | | | | | Merge "Add libstagefright and libstagefright_chromium_http to core.mk." into...Ying Wang2012-08-031-1/+0
|\ \ \ \ \ \
| * | | | | | Add libstagefright and libstagefright_chromium_http to core.mk.Ying Wang2012-08-031-1/+0
* | | | | | | Fix build: After merging in Clang, -Wno-psabi is no longer supported.Shih-wei Liao2012-08-031-0/+5
* | | | | | | Merge "add extra args to mkbootimg" into jb-mr1-devDoug Zongker2012-08-022-3/+4
|\ \ \ \ \ \ \