summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 928821bd: am 72d77449: am 4ca26ce8: Merge "Host multilib build of both ↵Ian Rogers2014-06-053-0/+4
|\ | | | | | | | | | | | | 32-bit and 64-bit libraries." * commit '928821bd123aa38094289b9c62debb4d92b84069': Host multilib build of both 32-bit and 64-bit libraries.
| * am 72d77449: am 4ca26ce8: Merge "Host multilib build of both 32-bit and ↵Ian Rogers2014-06-053-0/+4
| |\ | | | | | | | | | | | | | | | | | | 64-bit libraries." * commit '72d77449d99833140f7dd838db6556484031da29': Host multilib build of both 32-bit and 64-bit libraries.
| | * am 4ca26ce8: Merge "Host multilib build of both 32-bit and 64-bit libraries."Ian Rogers2014-06-053-0/+4
| | |\ | | | | | | | | | | | | | | | | * commit '4ca26ce8ec3436727a92eb35d1698d2ae540faef': Host multilib build of both 32-bit and 64-bit libraries.
| | | * Merge "Host multilib build of both 32-bit and 64-bit libraries."Ian Rogers2014-06-053-0/+4
| | | |\
| | | | * Host multilib build of both 32-bit and 64-bit libraries.Ian Rogers2014-06-053-0/+4
| | | |/ | | | | | | | | | | | | Change-Id: I54f91f385b109fc664a1a1f9320affb2a846fef1
* | | | am d1b8fc43: am bc28beda: am e0115dd1: Merge "Build host with multilib both ↵Ian Rogers2014-06-051-0/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | enabled." * commit 'd1b8fc4378451894a7f66a66a318f4f54c64f83a': Build host with multilib both enabled.
| * | | am bc28beda: am e0115dd1: Merge "Build host with multilib both enabled."Ian Rogers2014-06-051-0/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'bc28bedaf886e7dc05c7477e78a350f914115074': Build host with multilib both enabled.
| | * | am e0115dd1: Merge "Build host with multilib both enabled."Ian Rogers2014-06-051-0/+2
| | |\ \ | | | |/ | | | | | | | | | | | | * commit 'e0115dd1302f6156879938dfb8bcc9ac5a43d7a6': Build host with multilib both enabled.
| | | * Merge "Build host with multilib both enabled."Ian Rogers2014-06-051-0/+2
| | | |\
| | | | * Build host with multilib both enabled.Ian Rogers2014-06-051-0/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I58fa91bc097dfba573b6db27e389f5ed6556032f
* | | | | am b7c07da2: am 33154817: am 46fbaf06: Merge "Create world-searchable ↵Robin Lee2014-06-051-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | /data/misc/user directory" * commit 'b7c07da2f4606ca36b93c2b9221e43e6ebe68831': Create world-searchable /data/misc/user directory
| * | | | am 33154817: am 46fbaf06: Merge "Create world-searchable /data/misc/user ↵Robin Lee2014-06-051-0/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | directory" * commit '33154817e274a4c7c381e2f5ef73ead7093e3985': Create world-searchable /data/misc/user directory
| | * | | am 46fbaf06: Merge "Create world-searchable /data/misc/user directory"Robin Lee2014-06-051-0/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '46fbaf062fd94e3fecc7165f4b42d42145e0603d': Create world-searchable /data/misc/user directory
| | | * | Merge "Create world-searchable /data/misc/user directory"Robin Lee2014-06-051-0/+1
| | | |\ \ | | | | |/ | | | |/|
| | | | * Create world-searchable /data/misc/user directoryRobin Lee2014-04-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | installd will create a separate subdirectory for each user. Change-Id: I95ec09169ea70f35443bbb3209237611e174ca29
* | | | | am 147d158e: am dd3b7f94: am aa2be4fd: Merge "[MIPS64] Use generic ↵Elliott Hughes2014-06-052-6/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | cpu-independent libpixelflinger for mips64" * commit '147d158e2d2e9b6f6c520564b4a0c02d31af8513': [MIPS64] Use generic cpu-independent libpixelflinger for mips64
| * | | | am dd3b7f94: am aa2be4fd: Merge "[MIPS64] Use generic cpu-independent ↵Elliott Hughes2014-06-052-6/+6
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | libpixelflinger for mips64" * commit 'dd3b7f94d8339bb9f85a30a090492d3c5939dc68': [MIPS64] Use generic cpu-independent libpixelflinger for mips64
| | * | | am aa2be4fd: Merge "[MIPS64] Use generic cpu-independent libpixelflinger for ↵Elliott Hughes2014-06-052-6/+6
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | mips64" * commit 'aa2be4fd691933524b91680cd7517a9334d9a2a7': [MIPS64] Use generic cpu-independent libpixelflinger for mips64
| | | * | Merge "[MIPS64] Use generic cpu-independent libpixelflinger for mips64"Elliott Hughes2014-06-052-6/+6
| | | |\ \
| | | | * | [MIPS64] Use generic cpu-independent libpixelflinger for mips64Duane Sand2014-06-032-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For now, use generic C code instead of generated mips instructions, in the same manner as used on x86 and x86_64 targets. Change-Id: If3607484e0a446a755c62c030b3069d46ab5beb2
* | | | | | am 047a1cdd: am 29413726: am 20df39a0: Merge "Adding ABI output to debuggerd ↵Elliott Hughes2014-06-041-11/+21
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tombstones." * commit '047a1cdd119aa626b1ea603873efcd52f0d6ecbb': Adding ABI output to debuggerd tombstones.
| * | | | | am 29413726: am 20df39a0: Merge "Adding ABI output to debuggerd tombstones."Elliott Hughes2014-06-041-11/+21
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '294137266378371a3d08da1d6fb82a25d5b42cea': Adding ABI output to debuggerd tombstones.
| | * | | | am 20df39a0: Merge "Adding ABI output to debuggerd tombstones."Elliott Hughes2014-06-041-11/+21
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '20df39a08981f6283359917382db4270ed3a4503': Adding ABI output to debuggerd tombstones.
| | | * | | Merge "Adding ABI output to debuggerd tombstones."Elliott Hughes2014-06-041-11/+21
| | | |\ \ \
| | | | * | | Adding ABI output to debuggerd tombstones.Brigid Smith2014-06-041-11/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15084471 Change-Id: If9fb260a3403e86f80928f2f5f79331fc0936030
* | | | | | | am 63cdd840: am e948c9fa: am 489797c2: Merge "Add new AID shared by all apps ↵Robin Lee2014-06-041-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in a profile" * commit '63cdd840f81839bf6ce6e3723c42f09256cf4b3e': Add new AID shared by all apps in a profile
| * | | | | | am e948c9fa: am 489797c2: Merge "Add new AID shared by all apps in a profile"Robin Lee2014-06-041-0/+2
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'e948c9faaa4861f578ebe00c8d2fabe7908e24a6': Add new AID shared by all apps in a profile
| | * | | | | am 489797c2: Merge "Add new AID shared by all apps in a profile"Robin Lee2014-06-041-0/+2
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit '489797c2cbf9e22ea64dc9b88dec8271129e77bd': Add new AID shared by all apps in a profile
| | | * | | | Merge "Add new AID shared by all apps in a profile"Robin Lee2014-06-041-0/+2
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | | * | | Add new AID shared by all apps in a profileRobin Lee2014-04-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatically assigned as a GID to all apps running under the same Android profile. Used for exposing to or sharing files with apps running in a specific profile. Analogous to AID_SHARED_GID only the sharing is between processes with the same userId rather than with the same appId. The name to be displayed for uids/gids with this AID is 'u*_everyone'. Change-Id: I46efb749f74cb86868c5609a0ce1a6aab2f9e9c9
* | | | | | | am b2a9129e: am bf0ed824: am 60ca7a22: Merge "libutils: turn on -Werror"Mark Salyzyn2014-06-0413-60/+80
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'b2a9129e8f0666884dee660515c51d4dd5c17c7a': libutils: turn on -Werror
| * | | | | | am bf0ed824: am 60ca7a22: Merge "libutils: turn on -Werror"Mark Salyzyn2014-06-0413-60/+80
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'bf0ed82485e0166dd5f5c9415026c2dc3fd2ae4b': libutils: turn on -Werror
| | * | | | | am 60ca7a22: Merge "libutils: turn on -Werror"Mark Salyzyn2014-06-0413-60/+80
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit '60ca7a222315569c043e23a515cd990d2857df17': libutils: turn on -Werror
| | | * | | | Merge "libutils: turn on -Werror"Mark Salyzyn2014-06-0413-60/+80
| | | |\ \ \ \
| | | | * | | | libutils: turn on -WerrorMark Salyzyn2014-06-0213-60/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Deal with some -Wunused issues - Override PRI macros (windows) - Revert use of PRI macros on off64_t (linux) - Deal with a gnu++11 complaince issue Change-Id: Ie66751293bd84477a5a6dfd8a57e700a16e36964
* | | | | | | | am 35ea352c: (-s ours) am 9924bfba: (-s ours) am 6e3fffec: (-s ours) DO NOT ↵Colin Cross2014-06-040-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE: Revert "delete libnl_2" * commit '35ea352cb8e26a12835deb3fd034161c04961f7c': DO NOT MERGE: Revert "delete libnl_2"
| * | | | | | | am 9924bfba: (-s ours) am 6e3fffec: (-s ours) DO NOT MERGE: Revert "delete ↵Colin Cross2014-06-040-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libnl_2" * commit '9924bfba6972861b0d0429717e02a27501a4e983': DO NOT MERGE: Revert "delete libnl_2"
| | * | | | | | am 6e3fffec: (-s ours) DO NOT MERGE: Revert "delete libnl_2"Colin Cross2014-06-040-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '6e3fffeca6ac00379b0a22888d04a58ee0f51057': DO NOT MERGE: Revert "delete libnl_2"
| | | * | | | | DO NOT MERGE: Revert "delete libnl_2"Colin Cross2014-06-0413-0/+1450
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7097f052d946bc9fbe298c7a88e1d943f54f684e. libnl_2 needs to stay in AOSP for now for compatibility with GPL test builds.
* | | | | | | am 4e3f28e7: am 7ab32aca: Merge "Use format(gnu_printf, ...) for windows ↵Andrew Hsieh2014-06-041-0/+8
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | build with __USE_MINGW_ANSI_STDIO" * commit '4e3f28e748e0fe6e71d34a898c6a670621786200': Use format(gnu_printf, ...) for windows build with __USE_MINGW_ANSI_STDIO
| * | | | | | am 7ab32aca: Merge "Use format(gnu_printf, ...) for windows build with ↵Andrew Hsieh2014-06-041-0/+8
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | __USE_MINGW_ANSI_STDIO" * commit '7ab32aca56fe8df4575fc2e2e40ff7e1d38fca60': Use format(gnu_printf, ...) for windows build with __USE_MINGW_ANSI_STDIO
| | * | | | | Merge "Use format(gnu_printf, ...) for windows build with ↵Andrew Hsieh2014-06-041-0/+8
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | __USE_MINGW_ANSI_STDIO"
| | | * | | | | Use format(gnu_printf, ...) for windows build with __USE_MINGW_ANSI_STDIOAndrew Hsieh2014-05-091-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With __USE_MINGW_ANSI_STDIO mingw compiler uses its own replacement printf*/scanf* libraries instead of Microsoft's ones which aren't always C99 compatible. Declare "archetype" of attribute format to gnu_printf because the default "printf" in mingw follows MS standard. One result is that "%z" (a gnu-extension) is accepted w/o warning by mingw compiler Change-Id: I3e92f34e2a1e8d664b4f1f55d450f7c2790671f3
* | | | | | | | am e7110ac0: am b122da64: Merge "Fix libcutils/dlmalloc_stubs.c build breakage."Elliott Hughes2014-06-041-1/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e7110ac09bdc77c4a8f7823aa666c9929a33984c': Fix libcutils/dlmalloc_stubs.c build breakage.
| * | | | | | | am b122da64: Merge "Fix libcutils/dlmalloc_stubs.c build breakage."Elliott Hughes2014-06-041-1/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b122da648dd1a7860776bc90b219ffa8c215faa6': Fix libcutils/dlmalloc_stubs.c build breakage.
| | * | | | | | Merge "Fix libcutils/dlmalloc_stubs.c build breakage."Elliott Hughes2014-06-041-1/+0
| | |\ \ \ \ \ \
| | | * | | | | | Fix libcutils/dlmalloc_stubs.c build breakage.Elliott Hughes2014-06-031-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I344c410c100ce13c7a88063bf5354ad61c50094b
* | | | | | | | | am 04511126: am d586e356: Merge "Fix build."Mathieu Chartier2014-06-041-1/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '04511126a6e127705abce84735a3fe4eb48d882c': Fix build.
| * | | | | | | | am d586e356: Merge "Fix build."Mathieu Chartier2014-06-041-1/+3
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd586e356526b77d3d64d4d247cd8f8e0871824d5': Fix build.
| | * | | | | | | Merge "Fix build."Mathieu Chartier2014-06-041-1/+3
| | |\ \ \ \ \ \ \