Ian Rogers
|
1165cf4f44
|
am 928821bd : am 72d77449 : am 4ca26ce8 : Merge "Host multilib build of both 32-bit and 64-bit libraries."
* commit '928821bd123aa38094289b9c62debb4d92b84069':
Host multilib build of both 32-bit and 64-bit libraries.
|
2014-06-05 23:00:09 +00:00 |
|
Ian Rogers
|
928821bd12
|
am 72d77449 : am 4ca26ce8 : Merge "Host multilib build of both 32-bit and 64-bit libraries."
* commit '72d77449d99833140f7dd838db6556484031da29':
Host multilib build of both 32-bit and 64-bit libraries.
|
2014-06-05 22:56:00 +00:00 |
|
Ian Rogers
|
72d77449d9
|
am 4ca26ce8 : Merge "Host multilib build of both 32-bit and 64-bit libraries."
* commit '4ca26ce8ec3436727a92eb35d1698d2ae540faef':
Host multilib build of both 32-bit and 64-bit libraries.
|
2014-06-05 22:49:53 +00:00 |
|
Ian Rogers
|
4ca26ce8ec
|
Merge "Host multilib build of both 32-bit and 64-bit libraries."
|
2014-06-05 22:38:15 +00:00 |
|
Ian Rogers
|
59ec765382
|
Host multilib build of both 32-bit and 64-bit libraries.
Change-Id: I54f91f385b109fc664a1a1f9320affb2a846fef1
|
2014-06-05 15:26:22 -07:00 |
|
Ian Rogers
|
fc5f049c5c
|
am d1b8fc43 : am bc28beda : am e0115dd1 : Merge "Build host with multilib both enabled."
* commit 'd1b8fc4378451894a7f66a66a318f4f54c64f83a':
Build host with multilib both enabled.
|
2014-06-05 20:14:07 +00:00 |
|
Ian Rogers
|
d1b8fc4378
|
am bc28beda : am e0115dd1 : Merge "Build host with multilib both enabled."
* commit 'bc28bedaf886e7dc05c7477e78a350f914115074':
Build host with multilib both enabled.
|
2014-06-05 20:07:37 +00:00 |
|
Ian Rogers
|
bc28bedaf8
|
am e0115dd1 : Merge "Build host with multilib both enabled."
* commit 'e0115dd1302f6156879938dfb8bcc9ac5a43d7a6':
Build host with multilib both enabled.
|
2014-06-05 18:53:13 +00:00 |
|
Ian Rogers
|
e0115dd130
|
Merge "Build host with multilib both enabled."
|
2014-06-05 18:45:05 +00:00 |
|
Ian Rogers
|
46601793e3
|
Build host with multilib both enabled.
Change-Id: I58fa91bc097dfba573b6db27e389f5ed6556032f
|
2014-06-05 11:42:26 -07:00 |
|
Robin Lee
|
a54b7ca156
|
am b7c07da2 : am 33154817 : am 46fbaf06 : Merge "Create world-searchable /data/misc/user directory"
* commit 'b7c07da2f4606ca36b93c2b9221e43e6ebe68831':
Create world-searchable /data/misc/user directory
|
2014-06-05 17:30:13 +00:00 |
|
Robin Lee
|
b7c07da2f4
|
am 33154817 : am 46fbaf06 : Merge "Create world-searchable /data/misc/user directory"
* commit '33154817e274a4c7c381e2f5ef73ead7093e3985':
Create world-searchable /data/misc/user directory
|
2014-06-05 17:26:31 +00:00 |
|
Robin Lee
|
33154817e2
|
am 46fbaf06 : Merge "Create world-searchable /data/misc/user directory"
* commit '46fbaf062fd94e3fecc7165f4b42d42145e0603d':
Create world-searchable /data/misc/user directory
|
2014-06-05 17:15:07 +00:00 |
|
Robin Lee
|
46fbaf062f
|
Merge "Create world-searchable /data/misc/user directory"
|
2014-06-05 17:07:43 +00:00 |
|
Elliott Hughes
|
b575c3e37a
|
am 147d158e : am dd3b7f94 : am aa2be4fd : Merge "[MIPS64] Use generic cpu-independent libpixelflinger for mips64"
* commit '147d158e2d2e9b6f6c520564b4a0c02d31af8513':
[MIPS64] Use generic cpu-independent libpixelflinger for mips64
|
2014-06-05 09:48:01 +00:00 |
|
Elliott Hughes
|
147d158e2d
|
am dd3b7f94 : am aa2be4fd : Merge "[MIPS64] Use generic cpu-independent libpixelflinger for mips64"
* commit 'dd3b7f94d8339bb9f85a30a090492d3c5939dc68':
[MIPS64] Use generic cpu-independent libpixelflinger for mips64
|
2014-06-05 03:51:24 +00:00 |
|
Elliott Hughes
|
dd3b7f94d8
|
am aa2be4fd : Merge "[MIPS64] Use generic cpu-independent libpixelflinger for mips64"
* commit 'aa2be4fd691933524b91680cd7517a9334d9a2a7':
[MIPS64] Use generic cpu-independent libpixelflinger for mips64
|
2014-06-05 03:41:22 +00:00 |
|
Elliott Hughes
|
aa2be4fd69
|
Merge "[MIPS64] Use generic cpu-independent libpixelflinger for mips64"
|
2014-06-05 03:26:11 +00:00 |
|
Elliott Hughes
|
3daee33b96
|
am 047a1cdd : am 29413726 : am 20df39a0 : Merge "Adding ABI output to debuggerd tombstones."
* commit '047a1cdd119aa626b1ea603873efcd52f0d6ecbb':
Adding ABI output to debuggerd tombstones.
|
2014-06-04 21:49:26 +00:00 |
|
Elliott Hughes
|
047a1cdd11
|
am 29413726 : am 20df39a0 : Merge "Adding ABI output to debuggerd tombstones."
* commit '294137266378371a3d08da1d6fb82a25d5b42cea':
Adding ABI output to debuggerd tombstones.
|
2014-06-04 21:44:21 +00:00 |
|
Elliott Hughes
|
2941372663
|
am 20df39a0 : Merge "Adding ABI output to debuggerd tombstones."
* commit '20df39a08981f6283359917382db4270ed3a4503':
Adding ABI output to debuggerd tombstones.
|
2014-06-04 21:29:03 +00:00 |
|
Elliott Hughes
|
20df39a089
|
Merge "Adding ABI output to debuggerd tombstones."
|
2014-06-04 21:11:47 +00:00 |
|
Brigid Smith
|
9c8dacce55
|
Adding ABI output to debuggerd tombstones.
Bug: 15084471
Change-Id: If9fb260a3403e86f80928f2f5f79331fc0936030
|
2014-06-04 12:29:24 -07:00 |
|
Robin Lee
|
f086a8134c
|
am 63cdd840 : am e948c9fa : am 489797c2 : Merge "Add new AID shared by all apps in a profile"
* commit '63cdd840f81839bf6ce6e3723c42f09256cf4b3e':
Add new AID shared by all apps in a profile
|
2014-06-04 19:06:23 +00:00 |
|
Robin Lee
|
63cdd840f8
|
am e948c9fa : am 489797c2 : Merge "Add new AID shared by all apps in a profile"
* commit 'e948c9faaa4861f578ebe00c8d2fabe7908e24a6':
Add new AID shared by all apps in a profile
|
2014-06-04 19:04:12 +00:00 |
|
Robin Lee
|
e948c9faaa
|
am 489797c2 : Merge "Add new AID shared by all apps in a profile"
* commit '489797c2cbf9e22ea64dc9b88dec8271129e77bd':
Add new AID shared by all apps in a profile
|
2014-06-04 18:51:44 +00:00 |
|
Robin Lee
|
489797c2cb
|
Merge "Add new AID shared by all apps in a profile"
|
2014-06-04 18:45:02 +00:00 |
|
Mark Salyzyn
|
c9573e147e
|
am b2a9129e : am bf0ed824 : am 60ca7a22 : Merge "libutils: turn on -Werror"
* commit 'b2a9129e8f0666884dee660515c51d4dd5c17c7a':
libutils: turn on -Werror
|
2014-06-04 18:29:49 +00:00 |
|
Mark Salyzyn
|
b2a9129e8f
|
am bf0ed824 : am 60ca7a22 : Merge "libutils: turn on -Werror"
* commit 'bf0ed82485e0166dd5f5c9415026c2dc3fd2ae4b':
libutils: turn on -Werror
|
2014-06-04 18:26:41 +00:00 |
|
Mark Salyzyn
|
bf0ed82485
|
am 60ca7a22 : Merge "libutils: turn on -Werror"
* commit '60ca7a222315569c043e23a515cd990d2857df17':
libutils: turn on -Werror
|
2014-06-04 18:12:44 +00:00 |
|
Mark Salyzyn
|
60ca7a2223
|
Merge "libutils: turn on -Werror"
|
2014-06-04 17:55:05 +00:00 |
|
Colin Cross
|
cc29030cc9
|
am 35ea352c : (-s ours) am 9924bfba : (-s ours) am 6e3fffec : (-s ours) DO NOT MERGE: Revert "delete libnl_2"
* commit '35ea352cb8e26a12835deb3fd034161c04961f7c':
DO NOT MERGE: Revert "delete libnl_2"
|
2014-06-04 17:32:13 +00:00 |
|
Colin Cross
|
35ea352cb8
|
am 9924bfba : (-s ours) am 6e3fffec : (-s ours) DO NOT MERGE: Revert "delete libnl_2"
* commit '9924bfba6972861b0d0429717e02a27501a4e983':
DO NOT MERGE: Revert "delete libnl_2"
|
2014-06-04 17:28:42 +00:00 |
|
Colin Cross
|
9924bfba69
|
am 6e3fffec : (-s ours) DO NOT MERGE: Revert "delete libnl_2"
* commit '6e3fffeca6ac00379b0a22888d04a58ee0f51057':
DO NOT MERGE: Revert "delete libnl_2"
|
2014-06-04 15:19:39 +00:00 |
|
Colin Cross
|
6e3fffeca6
|
DO NOT MERGE: Revert "delete libnl_2"
This reverts commit 7097f052d9 .
libnl_2 needs to stay in AOSP for now for compatibility with
GPL test builds.
|
2014-06-04 08:15:48 -07:00 |
|
Andrew Hsieh
|
213fce951b
|
am 4e3f28e7 : am 7ab32aca : Merge "Use format(gnu_printf, ...) for windows build with __USE_MINGW_ANSI_STDIO"
* commit '4e3f28e748e0fe6e71d34a898c6a670621786200':
Use format(gnu_printf, ...) for windows build with __USE_MINGW_ANSI_STDIO
|
2014-06-04 12:32:30 +00:00 |
|
Andrew Hsieh
|
4e3f28e748
|
am 7ab32aca : Merge "Use format(gnu_printf, ...) for windows build with __USE_MINGW_ANSI_STDIO"
* commit '7ab32aca56fe8df4575fc2e2e40ff7e1d38fca60':
Use format(gnu_printf, ...) for windows build with __USE_MINGW_ANSI_STDIO
|
2014-06-04 12:27:05 +00:00 |
|
Andrew Hsieh
|
7ab32aca56
|
Merge "Use format(gnu_printf, ...) for windows build with __USE_MINGW_ANSI_STDIO"
|
2014-06-04 07:11:00 +00:00 |
|
Elliott Hughes
|
a0c01818a2
|
am e7110ac0 : am b122da64 : Merge "Fix libcutils/dlmalloc_stubs.c build breakage."
* commit 'e7110ac09bdc77c4a8f7823aa666c9929a33984c':
Fix libcutils/dlmalloc_stubs.c build breakage.
|
2014-06-04 04:09:52 +00:00 |
|
Elliott Hughes
|
e7110ac09b
|
am b122da64 : Merge "Fix libcutils/dlmalloc_stubs.c build breakage."
* commit 'b122da648dd1a7860776bc90b219ffa8c215faa6':
Fix libcutils/dlmalloc_stubs.c build breakage.
|
2014-06-04 04:06:03 +00:00 |
|
Elliott Hughes
|
b122da648d
|
Merge "Fix libcutils/dlmalloc_stubs.c build breakage."
|
2014-06-04 03:50:33 +00:00 |
|
Elliott Hughes
|
7f0ef73e70
|
Fix libcutils/dlmalloc_stubs.c build breakage.
Change-Id: I344c410c100ce13c7a88063bf5354ad61c50094b
|
2014-06-03 20:48:44 -07:00 |
|
Mathieu Chartier
|
39526f7740
|
am 04511126 : am d586e356 : Merge "Fix build."
* commit '04511126a6e127705abce84735a3fe4eb48d882c':
Fix build.
|
2014-06-04 01:42:00 +00:00 |
|
Mathieu Chartier
|
04511126a6
|
am d586e356 : Merge "Fix build."
* commit 'd586e356526b77d3d64d4d247cd8f8e0871824d5':
Fix build.
|
2014-06-04 01:39:29 +00:00 |
|
Mathieu Chartier
|
d586e35652
|
Merge "Fix build."
|
2014-06-04 01:17:07 +00:00 |
|
Mathieu Chartier
|
e942d1f9ea
|
Fix build.
Change-Id: I7b0cf6a248c74f1a06e0b5d51a5be13124ced6a0
|
2014-06-03 18:12:29 -07:00 |
|
Christopher Ferris
|
82cc77e8ed
|
am 2e389193 : am a8a7f001 : Merge "Fix x86 and x86_64 builds."
* commit '2e389193b01adb2d8f75e6c4038caaab4334b3ab':
Fix x86 and x86_64 builds.
|
2014-06-04 00:38:48 +00:00 |
|
Christopher Ferris
|
2e389193b0
|
am a8a7f001 : Merge "Fix x86 and x86_64 builds."
* commit 'a8a7f001f142a77a2c406455ace4a8c00e692111':
Fix x86 and x86_64 builds.
|
2014-06-04 00:33:18 +00:00 |
|
Eric Laurent
|
2624df514a
|
Merge "add definitions for sound trigger"
|
2014-06-04 00:22:29 +00:00 |
|
Christopher Ferris
|
a8a7f001f1
|
Merge "Fix x86 and x86_64 builds."
|
2014-06-04 00:17:54 +00:00 |
|