summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | Merge "libnetutils: Turn on -Werror"Mark Salyzyn2014-05-232-7/+11
| | |\ \ \
| | | * | | libnetutils: Turn on -WerrorMark Salyzyn2014-05-232-7/+11
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Get rid of a pair of out of range comparison warnings. - Turn on -Werror for compilation Change-Id: Ie6754f41f9348852a02cc0ff35befb5a76ac2883
* | | | | am 3bc628b2: am f5e2dc89: Merge "libctest: zap"Mark Salyzyn2014-05-223-358/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '3bc628b2d4ddc3f53989bdb17f630bdf105aa1d8': libctest: zap
| * | | | am f5e2dc89: Merge "libctest: zap"Mark Salyzyn2014-05-223-358/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'f5e2dc8967d66362a1d57ce6f764e4585aad9883': libctest: zap
| | * | | Merge "libctest: zap"Mark Salyzyn2014-05-223-358/+0
| | |\ \ \
| | | * | | libctest: zapMark Salyzyn2014-05-223-358/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related Changes: - https://android-review.googlesource.com/#/c/95364 - https://googleplex-android-review.git.corp.google.com/#/c/470584 - https://googleplex-android-review.git.corp.google.com/#/c/470591 - https://googleplex-android-review.git.corp.google.com/#/c/470590 Change-Id: I28a017104f48cc4216df876eb9102ecd332d28e3
* | | | | | am 17c3a227: am 617c28b8: Merge "Fix list_for_each_safe macro"Colin Cross2014-05-221-3/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '17c3a227505988b33e1219a8e0a921de874f9b70': Fix list_for_each_safe macro
| * | | | | am 617c28b8: Merge "Fix list_for_each_safe macro"Colin Cross2014-05-221-3/+3
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '617c28b8f2c9b90efa8b164ce2af2c7cd3007fbd': Fix list_for_each_safe macro
| | * | | | Merge "Fix list_for_each_safe macro"Colin Cross2014-05-221-3/+3
| | |\ \ \ \
| | | * | | | Fix list_for_each_safe macroThierry Escande2014-05-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The second macro parameter is named 'next' like listnode structure 'next' field. Since the precompiler will expand all 'next' occurrences in the macro definition with what is passed by the caller, it is not possible to call this macro with something else than 'next' as second parameter. This patch replaces the 'next' parameter with 'n' allowing use of a next node not named 'next'. Change-Id: I78c859caf8193f21fe0bedaeaa8342d6e89ad14b Signed-off-by: Thierry Escande <thierry.escande@linux.intel.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
* | | | | | | am 184eecf0: am 4ecbda41: Merge "Add list_add_head to libcutils"Colin Cross2014-05-221-0/+8
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '184eecf017b847bcb6999919f5aa4628521aca2d': Add list_add_head to libcutils
| * | | | | | am 4ecbda41: Merge "Add list_add_head to libcutils"Colin Cross2014-05-221-0/+8
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '4ecbda41c921f3209e96a3d72928a4bcba9422e6': Add list_add_head to libcutils
| | * | | | | Merge "Add list_add_head to libcutils"Colin Cross2014-05-221-0/+8
| | |\ \ \ \ \
| | | * | | | | Add list_add_head to libcutilsSamuel Ortiz2014-05-131-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a node to the head of the linked list. Change-Id: I03fc81f348c5c4fdab8680928b6e353413e4bc3c Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: Yong Yao <yong.yao@intel.com>
* | | | | | | | am 55c3401b: am 08befc3a: Merge "ueventd: support by-name symlinks for PCI ↵Colin Cross2014-05-221-6/+44
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | block devices" * commit '55c3401b103bfe075aded28e0b5112f53f8a1fa1': ueventd: support by-name symlinks for PCI block devices
| * | | | | | | am 08befc3a: Merge "ueventd: support by-name symlinks for PCI block devices"Colin Cross2014-05-221-6/+44
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '08befc3a8066626bb7336dd9ad656e737712153e': ueventd: support by-name symlinks for PCI block devices
| | * | | | | | Merge "ueventd: support by-name symlinks for PCI block devices"Colin Cross2014-05-221-6/+44
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | | * | | | | ueventd: support by-name symlinks for PCI block devicesAndrew Boie2014-05-131-6/+44
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To ensure that well-crafted removable media can't spoof the internal partitions, for platform devices the controller id is inside the generated path. We now do the same for PCI devices. The generated path has two levels; the PCI domain/bus, and then the peripheral ID. This lets us get by-name symlinks for PCI media, such as the SATA controllers on PC-like hardware. The symlinks will be created under /dev/block/pci/. For example: /dev/block/pci/pci0000:00/0000:00:1f.2/by-name/ Change-Id: Icee3e86bef5569c2bbd94c26bc00d49028345e3b Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
* | | | | | | am 6b5f4c34: am 0c7e5cda: Merge "libusbhost: Turn on -Werror"Mark Salyzyn2014-05-221-1/+3
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '6b5f4c3413f993e36b37eecae15a53af8d8b9c43': libusbhost: Turn on -Werror
| * | | | | | am 0c7e5cda: Merge "libusbhost: Turn on -Werror"Mark Salyzyn2014-05-221-1/+3
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '0c7e5cdaebc96fb1aee8860303eaeab351acf4bc': libusbhost: Turn on -Werror
| | * | | | | Merge "libusbhost: Turn on -Werror"Mark Salyzyn2014-05-221-1/+3
| | |\ \ \ \ \
| | | * | | | | libusbhost: Turn on -WerrorMark Salyzyn2014-05-211-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia765b56197c28d6cde633db9c429001993f75f17
* | | | | | | | am c5fa4b19: am 065c2706: Merge "libsuspend: Turn on -Werror"Mark Salyzyn2014-05-221-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c5fa4b19e3ea88905a02cf28c59410638445c485': libsuspend: Turn on -Werror
| * | | | | | | am 065c2706: Merge "libsuspend: Turn on -Werror"Mark Salyzyn2014-05-221-0/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '065c2706ab105ff09212850bb521573afc0418db': libsuspend: Turn on -Werror
| | * | | | | | Merge "libsuspend: Turn on -Werror"Mark Salyzyn2014-05-221-0/+2
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | libsuspend: Turn on -WerrorMark Salyzyn2014-05-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4ea982ab7d68a596ac79d93a01c05a109d24672d
* | | | | | | | am 1010b672: am b05866af: Merge "libion: Turn on -Werror"Mark Salyzyn2014-05-221-1/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '1010b672718576c7099e95c8872e5113bed03f5a': libion: Turn on -Werror
| * | | | | | | am b05866af: Merge "libion: Turn on -Werror"Mark Salyzyn2014-05-221-1/+3
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b05866afccd10b005e97804319abdd361b311f2a': libion: Turn on -Werror
| | * | | | | | Merge "libion: Turn on -Werror"Mark Salyzyn2014-05-221-1/+3
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | libion: Turn on -WerrorMark Salyzyn2014-05-211-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0a933623147fb7bfb7251b1d9213cc174619ed42
* | | | | | | | am 7d28098b: am 99337883: Merge "sdcard: Turn on -Werror"Mark Salyzyn2014-05-221-4/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '7d28098b9adc450ca26c73b02b025a02891a0766': sdcard: Turn on -Werror
| * | | | | | | am 99337883: Merge "sdcard: Turn on -Werror"Mark Salyzyn2014-05-221-4/+4
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '993378832e6f580b3b13b189f3656066492fe80a': sdcard: Turn on -Werror
| | * | | | | | Merge "sdcard: Turn on -Werror"Mark Salyzyn2014-05-221-4/+4
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | sdcard: Turn on -WerrorMark Salyzyn2014-05-211-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I40fce5a69a898e79542aa7688d077ff7bc40ed4f
* | | | | | | | am f1c66a85: am 5e9c2b9f: Merge "reboot: Turn on -Werror"Mark Salyzyn2014-05-221-4/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f1c66a852f8b6a888308c6a154a7d98bf262e480': reboot: Turn on -Werror
| * | | | | | | am 5e9c2b9f: Merge "reboot: Turn on -Werror"Mark Salyzyn2014-05-221-4/+6
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '5e9c2b9faa6fbf6ce8dab3a7d5029f582066b487': reboot: Turn on -Werror
| | * | | | | | Merge "reboot: Turn on -Werror"Mark Salyzyn2014-05-221-4/+6
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | reboot: Turn on -WerrorMark Salyzyn2014-05-211-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic3186e457b80ee6149ef89321b0d16422872aea7
* | | | | | | | am 3ab1d61b: am 3b5cd911: Merge "Remove libstdc++ dependency from host ↵Dan Albert2014-05-221-0/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libbacktrace" * commit '3ab1d61b75239515cbb3086a9991650301048cd3': Remove libstdc++ dependency from host libbacktrace
| * | | | | | | am 3b5cd911: Merge "Remove libstdc++ dependency from host libbacktrace"Dan Albert2014-05-221-0/+3
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '3b5cd9117df7e7420055352b496383a477f008d3': Remove libstdc++ dependency from host libbacktrace
| | * | | | | | Merge "Remove libstdc++ dependency from host libbacktrace"Dan Albert2014-05-221-0/+3
| | |\ \ \ \ \ \
| | | * | | | | | Remove libstdc++ dependency from host libbacktraceDan Albert2014-05-211-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The libc++ version of libbacktrace on the host was still linking against libstdc++, and this was causing problems in art. Change-Id: I1d14fb9e18abd074affcf46c8044407041970669
* | | | | | | | | am 337f94f1: am e9a6d0a0: Merge "Remove unnecessary #includes of ↵Elliott Hughes2014-05-222-3/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <sys/atomics.h>." * commit '337f94f1eb6d65e37689e78d9d33ae0a33ce6607': Remove unnecessary #includes of <sys/atomics.h>.
| * | | | | | | | am e9a6d0a0: Merge "Remove unnecessary #includes of <sys/atomics.h>."Elliott Hughes2014-05-222-3/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e9a6d0a09950b9d28f63c8bb3e05530cd23574c0': Remove unnecessary #includes of <sys/atomics.h>.
| | * | | | | | | Merge "Remove unnecessary #includes of <sys/atomics.h>."Elliott Hughes2014-05-222-3/+0
| | |\ \ \ \ \ \ \
| | | * | | | | | | Remove unnecessary #includes of <sys/atomics.h>.Elliott Hughes2014-05-222-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14903517 Change-Id: I5b0a418dd982f1a2fd90609b12bd8364f7f34996
* | | | | | | | | | am 8c6245e1: am 80e16069: Merge "libsync: Turn on -Werror"Mark Salyzyn2014-05-221-0/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8c6245e11d7a3467719b75438e1690c4f2222236': libsync: Turn on -Werror
| * | | | | | | | | am 80e16069: Merge "libsync: Turn on -Werror"Mark Salyzyn2014-05-221-0/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '80e160693c795aacfecd5ba34caa1485a6c717f4': libsync: Turn on -Werror
| | * | | | | | | | Merge "libsync: Turn on -Werror"Mark Salyzyn2014-05-221-0/+2
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | / / / / / | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | libsync: Turn on -WerrorMark Salyzyn2014-05-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie34f935694034a069e844be64d6011eb9e3f9869