summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* am 051e28fe: Merge "Fix incorrect x86 build rules."Stephen Hines2014-02-143-2/+2
|\
| * Merge "Fix incorrect x86 build rules."Stephen Hines2014-02-143-2/+2
| |\
| | * Fix incorrect x86 build rules.Stephen Hines2014-02-133-2/+2
* | | am a9baf879: Merge "fix build"Colin Cross2014-02-141-1/+1
|\ \ \ | |/ /
| * | fix buildColin Cross2014-02-131-1/+1
* | | resolved conflicts for merge of 2fbe5018 to klp-modular-dev-plus-aospColin Cross2014-02-132-3/+2
|\ \ \ | |/ /
* | | am 3bbaab31: Merge changes I2514f66f,I71fed98dColin Cross2014-02-143-215/+236
|\ \ \ | |/ /
| * | Merge changes I2514f66f,I71fed98dColin Cross2014-02-143-215/+236
| |\ \
| | * | support LOCAL_MODULE_TARGET_ARCH for prebuiltsColin Cross2014-02-132-214/+235
| | * | Add generated sources dir to the default include pathColin Cross2014-02-131-1/+1
* | | | am e2f06adb: Merge "Don\'t check the existence for the 64-bit modules for 32-...Ying Wang2014-02-141-0/+4
|\ \ \ \ | |/ / /
| * | | Don't check the existence for the 64-bit modules for 32-bit SDK build.Ying Wang2014-02-131-0/+4
| |/ /
* | | am 7ea5cd95: Merge "don\'t use LOCAL_*_arch for host builds"Colin Cross2014-02-142-10/+40
|\ \ \ | |/ /
| * | don't use LOCAL_*_arch for host buildsColin Cross2014-02-132-10/+40
| |/
* | am 5c7039fb: Merge "Remove dead code."Ying Wang2014-02-131-30/+0
|\ \ | |/
| * Remove dead code.Ying Wang2014-02-121-30/+0
* | resolved conflicts for merge of 7cd7bd65 to klp-modular-dev-plus-aospColin Cross2014-02-1212-494/+656
|\ \ | |/
| * HACK: add 64-bit directory blacklistColin Cross2014-02-126-8/+72
| * add support for module supported or unsupported target architecturesColin Cross2014-02-127-489/+587
* | am fd841351: Merge "Support custom sdk.atree files." into klp-modular-devYing Wang2014-02-122-0/+7
|\ \
| * \ Merge "Support custom sdk.atree files." into klp-modular-devYing Wang2014-02-122-0/+7
| |\ \
| | * | Support custom sdk.atree files.Ying Wang2014-01-292-0/+7
* | | | am bec954d0: Merge "Clean up dangling module names"Ying Wang2014-02-121-1/+5
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge "Clean up dangling module names"Ying Wang2014-02-121-1/+5
| |\ \ \
| | * | | Clean up dangling module namesYing Wang2014-02-111-1/+5
* | | | | am b12cce10: Merge "Refine module name resolving in multilib build"Ying Wang2014-02-123-2/+67
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Refine module name resolving in multilib build"Ying Wang2014-02-123-2/+67
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Refine module name resolving in multilib buildYing Wang2014-02-103-2/+67
* | | | | am 993ffb80: Merge "Add all-S-files-under."Elliott Hughes2014-02-121-0/+13
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Add all-S-files-under."Elliott Hughes2014-02-111-0/+13
| |\ \ \ \
| | * | | | Add all-S-files-under.Elliott Hughes2014-02-111-0/+13
| | |/ / /
* | | | | am 90ed06ef: Merge "fix 2nd target clang prebuilt paths"Colin Cross2014-02-113-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | fix 2nd target clang prebuilt pathsColin Cross2014-02-113-3/+3
| |/ / /
* | | | am 2d72094f: am 960d919e: resolved conflicts for merge of 4df82b3e to klp-dev...Ying Wang2014-02-083-2/+10
|\ \ \ \ | | |/ / | |/| |
| * | | am 960d919e: resolved conflicts for merge of 4df82b3e to klp-dev-plus-aospYing Wang2014-02-083-2/+10
| |\ \ \
| | * \ \ resolved conflicts for merge of 4df82b3e to klp-dev-plus-aospYing Wang2014-02-083-2/+10
| | |\ \ \
| | | * | | Allow proguarding the main app and the test app in a single run.Mihail Dumitrescu2014-02-073-2/+10
* | | | | | am 6c5d8976: Merge "Refreshed gcc predefines __ANDROID__"Ben Cheng2014-02-071-3/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge "Refreshed gcc predefines __ANDROID__"Ben Cheng2014-02-071-3/+0
| |\ \ \ \ \
| | * | | | | Refreshed gcc predefines __ANDROID__Ben Cheng2014-02-071-3/+0
* | | | | | | am 5cc7f8a7: Merge "Select the arch_variant_cflags for the 2nd arch."Ying Wang2014-02-071-3/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Select the arch_variant_cflags for the 2nd arch.Ying Wang2014-02-071-3/+3
| |/ / / / /
* | | | | | am 737a51dd: Merge "Refactor llvm_config.mk and support the 2nd arch"Ying Wang2014-02-0721-286/+654
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Refactor llvm_config.mk and support the 2nd arch"Ying Wang2014-02-0721-286/+654
| |\ \ \ \ \
| | * | | | | Refactor llvm_config.mk and support the 2nd archYing Wang2014-02-0721-286/+654
* | | | | | | am 5e9a2033: Merge "don\'t rename 32-bit packages to *_32"Colin Cross2014-02-071-0/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | don't rename 32-bit packages to *_32Colin Cross2014-02-061-0/+4
| |/ / / / /
* | | | | | am 8b20d5b9: Merge "Turn 64-bit-related warnings into errors on 64-bit builds."Elliott Hughes2014-02-062-2/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Turn 64-bit-related warnings into errors on 64-bit builds."Elliott Hughes2014-02-062-2/+14
| |\ \ \ \ \
| | * | | | | Turn 64-bit-related warnings into errors on 64-bit builds.Elliott Hughes2014-02-052-2/+14