summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* am 0b42554f: am 12eeb000: Merge "Add generic aarch64 board config and build r...Ben Cheng2013-10-073-0/+595
|\
| * am 12eeb000: Merge "Add generic aarch64 board config and build rules."Ben Cheng2013-10-073-0/+595
| |\
| | * Merge "Add generic aarch64 board config and build rules."Ben Cheng2013-10-073-0/+595
| | |\
| | | * Add generic aarch64 board config and build rules.Ben Cheng2013-10-073-0/+595
* | | | am a035abc5: am 1303aa28: Merge "Remove useless x86 options that were always ...Elliott Hughes2013-10-048-77/+9
|\ \ \ \ | |/ / /
| * | | am 1303aa28: Merge "Remove useless x86 options that were always hardcoded on."Elliott Hughes2013-10-048-77/+9
| |\ \ \ | | |/ /
| | * | Remove useless x86 options that were always hardcoded on.Elliott Hughes2013-10-048-77/+9
| | |/
* | | am 36e95f31: Merge "don\'t check paths of non-installed or host modules" into...Colin Cross2013-10-031-4/+5
|\ \ \
| * \ \ Merge "don't check paths of non-installed or host modules" into klp-devColin Cross2013-10-031-4/+5
| |\ \ \
| | * | | don't check paths of non-installed or host modulesColin Cross2013-10-021-4/+5
* | | | | am 9f615938: am 9a788285: Merge "Duplicate i686 target arch options for x86_64."Ying Wang2013-10-021-0/+17
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | am 9a788285: Merge "Duplicate i686 target arch options for x86_64."Ying Wang2013-10-021-0/+17
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge "Duplicate i686 target arch options for x86_64."Ying Wang2013-10-021-0/+17
| | |\ \ \
| | | * | | Duplicate i686 target arch options for x86_64.Stephen Hines2013-10-021-0/+17
* | | | | | am ab7b53b8: am 5d92a933: Merge "x86_64: Adding new target"Ying Wang2013-10-027-4/+354
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 5d92a933: Merge "x86_64: Adding new target"Ying Wang2013-10-027-4/+354
| |\ \ \ \ \ | | |/ / / /
| | * | | | x86_64: Adding new targetPavel Chupin2013-10-027-4/+354
| | |/ / /
* | | | | am d4b1d52b: support protos in host java librariesChris Wren2013-10-021-7/+24
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | support protos in host java librariesChris Wren2013-10-021-7/+24
* | | | | am d74b538d: Add the FRAMEWORKS_BASE_JAVA_SRC_DIRS to aidl includesYing Wang2013-10-021-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | Add the FRAMEWORKS_BASE_JAVA_SRC_DIRS to aidl includesYing Wang2013-10-011-3/+3
| | |_|/ | |/| |
* | | | am 392d042c: am b6da30c3: am 2408479c: Allow module to specify LOCAL_INSTALLE...Ying Wang2013-09-253-11/+18
|\ \ \ \ | |/ / /
| * | | am b6da30c3: am 2408479c: Allow module to specify LOCAL_INSTALLED_MODULE_STEMYing Wang2013-09-253-11/+18
| |\ \ \
| | * \ \ am 2408479c: Allow module to specify LOCAL_INSTALLED_MODULE_STEMYing Wang2013-09-253-11/+18
| | |\ \ \
| | | * | | Allow module to specify LOCAL_INSTALLED_MODULE_STEMYing Wang2013-09-253-11/+18
| | | * | | bump version to 4.3.1Baligh Uddin2013-09-231-1/+1
* | | | | | am ac079b1d: Merge "Add android-ex-camera2 static java library to PDK." into ...Eino-Ville Talvala2013-09-241-1/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Add android-ex-camera2 static java library to PDK." into klp-devEino-Ville Talvala2013-09-251-1/+2
| |\ \ \ \ \
| | * | | | | Add android-ex-camera2 static java library to PDK.Eino-Ville Talvala2013-09-241-1/+2
* | | | | | | am f47d5802: Don\'t check vendor path for phony packagesDan Willemsen2013-09-241-4/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Don't check vendor path for phony packagesDan Willemsen2013-09-241-4/+5
| |/ / / / /
* | | | | | am 71fc41df: Enable art for user buildsBrian Carlstrom2013-09-193-2/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Enable art for user buildsBrian Carlstrom2013-09-193-2/+4
* | | | | | resolved conflicts for merge of 70190a2b to klp-dev-plus-aospYing Wang2013-09-196-18/+95
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | am b71677b1: Merge "Extend x86 to have different arch variants"Ying Wang2013-09-196-19/+96
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge "Extend x86 to have different arch variants"Ying Wang2013-09-196-19/+96
| | |\ \ \ \
| | | * | | | Extend x86 to have different arch variantsNegreanu Marius Adrian2013-09-186-19/+96
| | * | | | | Remove unnecessary dependencies between host and target modules.Ying Wang2013-09-181-1/+11
| * | | | | | am a85afdb8: Merge "Add support for WITHOUT_CLANG"Ying Wang2013-09-161-0/+4
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Add support for WITHOUT_CLANGMike Lockwood2013-09-161-0/+4
* | | | | | | am fad629f4: am 7f2ad751: Merge "Switch x86 default compiler to multilib vers...Ying Wang2013-09-143-6/+6
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 7f2ad751: Merge "Switch x86 default compiler to multilib version"Ying Wang2013-09-143-6/+6
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Switch x86 default compiler to multilib version"Ying Wang2013-09-143-6/+6
| | |\ \ \ \ \
| | | * | | | | Switch x86 default compiler to multilib versionPavel Chupin2013-08-263-6/+6
* | | | | | | | resolved conflicts for merge of 65d5e788 to klp-dev-plus-aospYing Wang2013-09-131-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 4b7d8f11: Merge "Fix parsing string parameters in BOARD_MKBOOTIMG_ARGS"Ying Wang2013-09-131-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Fix parsing string parameters in BOARD_MKBOOTIMG_ARGS"Ying Wang2013-09-141-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | Fix parsing string parameters in BOARD_MKBOOTIMG_ARGSJianxun Zhang2013-08-271-1/+1
| | | |/ / / / /
| * | | | | | | am 43077645: Merge "Add libcore.conscrypt tests back to CTS"Kenny Root2013-09-121-2/+9
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Add libcore.conscrypt tests back to CTSKenny Root2013-09-121-2/+9
| | | |/ / / / | | |/| | | |