Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | | | | | | | | | | | | | | am 87a25ea7: am bce52ca5: Merge "Remove arm64 clang build warning" | Ying Wang | 2014-03-18 | 3 | -12/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "Try to catch more misuse of $(my-dir)." into klp-dev-plus-aosp | Brian Carlstrom | 2014-03-18 | 1 | -4/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | Try to catch more misuse of $(my-dir). | Ying Wang | 2014-03-18 | 1 | -4/+0 | |
| | * | | | | | | | | | | | | | | | | | | | | | am 023c2865: am 97542cc9: Merge "Don\'t blacklist all of frameworks/av for 64... | Glenn Kasten | 2014-03-18 | 1 | -4/+5 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | am 5a4183f3: am 267afcde: Merge "HACK: disable emulator on x86_64" | Greg Hackmann | 2014-03-18 | 1 | -2/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 5462f7f9: am 255ea2bd: Merge "Remove unused LOCAL_ASSET_FILES." | Ying Wang | 2014-03-18 | 1 | -1/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am bb79f9d2: am b7b49711: add some css to support android wear sub-site | Scott Main | 2014-03-18 | 1 | -0/+22 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am d14f3cc7: am 5384c187: Merge "Add LOCAL_NDK_STL_VARIANT:=c++_static and c+... | Andrew Hsieh | 2014-03-18 | 2 | -4/+28 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am a660d06e: am 1cda15d3: Merge "Don\'t modify LOCAL_STRIP_MODULE" | Ying Wang | 2014-03-16 | 1 | -4/+5 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 6e92ade0: am db24577b: Merge "Work in progress to enable build system supp... | Colin Cross | 2014-03-16 | 3 | -8/+3 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | resolved conflicts for merge of 264d4001 to klp-dev-plus-aosp | Dianne Hackborn | 2014-03-13 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am de8edc8a: am 933e8940: Merge "Fix HOST_TOOLCHAIN_PREFIX" | Andrew Hsieh | 2014-03-14 | 1 | -6/+6 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 237f5414: (-s ours) am cc8d6dab: Merge "Revert "Remove external/chromium f... | Narayan Kamath | 2014-03-13 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge topic 'klp-dev-plus-aosp-fix-skips' into klp-dev-plus-aosp | Colin Cross | 2014-03-13 | 13 | -501/+643 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Remove external/chromium from the 64 bit blacklist." | Narayan Kamath | 2014-03-13 | 1 | -0/+1 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove external/chromium from the 64 bit blacklist. | Narayan Kamath | 2014-03-13 | 1 | -1/+0 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OProfile is no longer compiled now. | Ben Cheng | 2014-03-13 | 2 | -6/+0 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Amend 64 bit blacklist. | Narayan Kamath | 2014-03-13 | 1 | -10/+6 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok | JP Abgrall | 2014-03-13 | 1 | -1/+0 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad | JP Abgrall | 2014-03-13 | 1 | -0/+1 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove external/tcpdump from 64-bit build blacklist. | Ying Wang | 2014-03-13 | 1 | -1/+0 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | oprofile/daemon doesn't build for x86_64. | Elliott Hughes | 2014-03-13 | 1 | -0/+1 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove external/wpa_supplicant_8 and external/android-clat | Ying Wang | 2014-03-13 | 1 | -5/+0 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Take libcore off the LP64 blacklist. | Elliott Hughes | 2014-03-13 | 1 | -1/+0 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HACK: add 64-bit directory blacklist | Colin Cross | 2014-03-13 | 6 | -8/+72 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add support for module supported or unsupported target architectures | Colin Cross | 2014-03-13 | 7 | -489/+583 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 70916972: (-s ours) am 25249624: Merge "Remove external/chromium from the ... | Narayan Kamath | 2014-03-13 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am d842e6d6: am c62d6f76: Merge "Add TARGET_2ND_ARCH to dumpvar" | Dmitriy Ivanov | 2014-03-13 | 1 | -0/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 446f00c9: am ce156811: Merge "Split WITHOUT_CLANG to WITHOUT_HOST_CLANG an... | Ying Wang | 2014-03-13 | 4 | -3/+11 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 21060b30: am 775d15e0: Merge "Define __STDC_CONSTANT_MACROS globally to wo... | Ian Rogers | 2014-03-13 | 3 | -3/+3 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am bc39fd5c: am f1e697be: Merge "Revert "Define __STDC_LIMIT_MACROS globally ... | Ian Rogers | 2014-03-13 | 3 | -3/+3 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am a520bfbe: am 4783dc7a: Merge "Define __STDC_LIMIT_MACROS globally to work ... | Ian Rogers | 2014-03-11 | 3 | -3/+3 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 61cf1df7: am 60ef9d5b: Merge "jdk error message should not mention the ver... | Ying Wang | 2014-03-11 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 25f47659: am 05192e5a: Merge "Docs: replacing analytics ID from D.A.C. Bug... | Clay Murphy | 2014-03-11 | 4 | -19/+29 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 21ef9705: (-s ours) am f230bcf4: Merge "OProfile is no longer compiled now." | Ben Cheng | 2014-03-11 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am db48d145: am 247dd0c4: Merge "Do not remove the generated .hpp file from y... | Nicolas Geoffray | 2014-03-11 | 1 | -1/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am b11697d3: am 68d38154: Merge "Remove host-prefix command line argument to ... | Nicolas Geoffray | 2014-03-11 | 1 | -2/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 12493c89: am 6808c260: Merge "Use analyzer at new location: prebuilts/misc... | Andrew Hsieh | 2014-03-11 | 2 | -3/+3 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 4e965ac6: am 38626e63: Merge "Add external/google-fonts/*/fonts.mk." | Victoria Lease | 2014-03-11 | 2 | -0/+6 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am d85ef325: am 460ed38a: Merge "Extend YACC and LEX handling to .yy and .ll ... | Nicolas Geoffray | 2014-03-11 | 1 | -12/+42 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am ff157c76: am 368faf83: Merge "Add usage comment to explain how to limit mo... | Primiano Tucci | 2014-03-11 | 1 | -0/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am e8bb5c3a: (-s ours) am 0d08449c: Merge "Amend 64 bit blacklist." | Narayan Kamath | 2014-03-11 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am a6230641: am 26bcd640: Merge "Try to catch more misuse of ." | Ying Wang | 2014-03-11 | 2 | -2/+9 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am d86da81f: am 2bd77d5e: Merge "Make gdbclient smarter for gdb[server] setup." | Ben Cheng | 2014-03-11 | 1 | -13/+61 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 8e286fbf: am cf1b7d4b: Merge "Select src arch for prebuilts." | Ying Wang | 2014-03-11 | 2 | -2/+13 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am a0bea538: (-s ours) am 031bff45: (-s ours) Merge "DO NOT MERGE: Revert the... | JP Abgrall | 2014-03-11 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am a90e346c: am cd07521f: Merge "Revert "generic_x86: toggle 64bit binder ABI"" | Ying Wang | 2014-03-11 | 1 | -1/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 4c65c202: am 7fc3a06d: Merge "build: add logd" | Mark Salyzyn | 2014-03-11 | 1 | -0/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 24bbd72d: (-s ours) am 5d0dd222: (-s ours) Merge "DO NOT MERGE: Fix aosp 6... | JP Abgrall | 2014-03-11 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 66a9b789: Merge "Include privileged apps with app zip file." | Ying Wang | 2014-03-11 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |