summaryrefslogtreecommitdiffstats
path: root/core/binary.mk
Commit message (Expand)AuthorAgeFilesLines
* am 17967eb7: Merge "[MIPSR6] Adjust prebuilts/ndk libraries for mips32r6"Ying Wang2015-01-161-6/+12
|\
| * [MIPSR6] Adjust prebuilts/ndk libraries for mips32r6Duane Sand2015-01-161-6/+12
* | am 64606bd5: Merge "Update protobuf library from 2.3 to 2.6."Jeff Davidson2015-01-151-10/+0
|\ \ | |/
| * Merge "Update protobuf library from 2.3 to 2.6."Jeff Davidson2015-01-151-10/+0
| |\
| | * Update protobuf library from 2.3 to 2.6.Jeff Davidson2015-01-081-10/+0
* | | am dd198b77: Merge "Move installed module dependency setup after proto handli...Jeff Davidson2015-01-091-23/+25
|\ \ \ | |/ /
| * | Move installed module dependency setup after proto handling.Jeff Davidson2015-01-081-23/+25
| |/
* | am e98755f9: Merge "Add a SANITIZE_HOST flag."Dan Albert2014-12-091-13/+1
|\ \ | |/
| * Add a SANITIZE_HOST flag.Dan Albert2014-12-051-13/+1
* | am cd814343: Merge "Let clang decide ASan linker flags for the host."Dan Albert2014-12-091-13/+10
|\ \ | |/
| * Let clang decide ASan linker flags for the host.Dan Albert2014-12-051-13/+10
* | am 4bad2d21: Merge "Add more support for GLOBAL_CONLYFLAGS."Stephen Hines2014-12-021-1/+10
|\ \ | |/
| * Add more support for GLOBAL_CONLYFLAGS.Stephen Hines2014-12-011-1/+10
* | am 7dcbc563: Merge "Fix a typo in my_cppflags assignment."Dan Albert2014-12-011-1/+1
|\ \ | |/
| * Fix a typo in my_cppflags assignment.Dan Albert2014-11-281-1/+1
* | am 9b0ccb74: Merge "Fix the libgcc/libatomic link order."Dan Albert2014-11-181-1/+0
|\ \ | |/
| * Merge "Fix the libgcc/libatomic link order."Dan Albert2014-11-171-1/+0
| |\
| | * Fix the libgcc/libatomic link order.Dan Albert2014-11-131-1/+0
* | | am f63ca1e9: Merge "Disable gnu style linker hash for NDK builds."Dan Albert2014-11-171-40/+46
|\ \ \ | |/ /
| * | Disable gnu style linker hash for NDK builds.Dan Albert2014-11-151-40/+46
| |/
* | am 201f6b3e: Merge "Make modules depend on their makefile."Dan Albert2014-11-111-13/+14
|\ \ | |/
| * Make modules depend on their makefile.Dan Albert2014-11-111-13/+14
* | am 1f637158: Merge "Use platform protobuf unless building with NDK."Dan Albert2014-11-111-2/+12
|\ \ | |/
| * Use platform protobuf unless building with NDK.Dan Albert2014-11-111-2/+12
* | am ed9981d9: am 427d1e98: Merge "Pull in latest protolib when using LOCAL_PRO...Jeff Davidson2014-10-291-2/+10
|\ \ | |/
| * am 427d1e98: Merge "Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_...Jeff Davidson2014-10-291-2/+10
| |\
| | * Merge "Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE."Jeff Davidson2014-10-291-2/+10
| | |\
| | | * Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE.Jeff Davidson2014-10-231-2/+10
* | | | am ef8912d9: am d274e04a: Merge "Don\'t sort shared library link order."Dan Albert2014-10-291-3/+2
|\ \ \ \ | |/ / /
| * | | am d274e04a: Merge "Don\'t sort shared library link order."Dan Albert2014-10-281-3/+2
| |\ \ \ | | |/ /
| | * | Don't sort shared library link order.Dan Albert2014-10-231-3/+2
| * | | am cc0aa4da: am 28c265dd: Merge "We also need -rdynamic for host ASAN."Dan Albert2014-10-201-0/+2
| |\ \ \ | | |/ /
| * | | resolved conflicts for merge of 96c22133 to lmp-dev-plus-aospDan Albert2014-10-201-2/+13
| |\ \ \
| * \ \ \ am 24c1d149: am a01fa4f8: Merge "LOCAL_NATIVE_COVERAGE should imply -O0."Dan Albert2014-10-091-4/+6
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | am e4e50f9b: am 8330c4c5: Merge "Apply LOCAL_CXX_STL to also prebuilts."Ying Wang2014-10-071-61/+1
| |\ \ \ \
| * \ \ \ \ am 55c2adff: am b6361968: Merge "Remove unused my_compiler_dependencies."Dan Albert2014-10-061-20/+9
| |\ \ \ \ \
| * \ \ \ \ \ am b9b2d21c: am 4a8d5c1a: Merge "Add local Clang+target specific flags."Chih-Hung Hsieh2014-09-271-0/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am 145eddfd: am 670018fd: Merge "Remove unnecessary CLANG_CONFIG_EXTRA_*_C_IN...Stephen Hines2014-09-261-2/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ resolved conflicts for merge of 326f9450 to lmp-dev-plus-aospDan Albert2014-09-241-0/+26
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am 92421720: am 98f7742a: Merge "Move selection of C++ STL into the build sys...Dan Albert2014-09-191-5/+61
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ am cc0aa4da: am 28c265dd: Merge "We also need -rdynamic for host ASAN."Dan Albert2014-10-201-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | We also need -rdynamic for host ASAN.Dan Albert2014-10-201-0/+2
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | resolved conflicts for merge of 96c22133 to lmp-mr1-dev-plus-aospDan Albert2014-10-201-2/+13
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Add support for ASAN in host modules.Dan Albert2014-10-201-2/+13
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | am 24c1d149: am a01fa4f8: Merge "LOCAL_NATIVE_COVERAGE should imply -O0."Dan Albert2014-10-091-4/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | LOCAL_NATIVE_COVERAGE should imply -O0.Dan Albert2014-10-081-4/+6
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | am e4e50f9b: am 8330c4c5: Merge "Apply LOCAL_CXX_STL to also prebuilts."Ying Wang2014-10-071-61/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Apply LOCAL_CXX_STL to also prebuilts.Ying Wang2014-10-071-61/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | resolved conflicts for merge of 55c2adff to lmp-mr1-dev-plus-aospDan Albert2014-10-061-21/+10
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Remove unused my_compiler_dependencies.Dan Albert2014-10-061-20/+9
| | |_|_|_|/ | |/| | | |