OSDN Git Service
Nick Kralevich [Sun, 27 Apr 2014 03:26:11 +0000 (03:26 +0000)]
am
fde5b354: am
79950456: Merge "Label lost+found directories with SELinux security contexts."
* commit '
fde5b354c85a30f4dbe79bcf4f19473de11e00ef':
Label lost+found directories with SELinux security contexts.
Nick Kralevich [Sun, 27 Apr 2014 03:22:04 +0000 (03:22 +0000)]
am
79950456: Merge "Label lost+found directories with SELinux security contexts."
* commit '
79950456925b801273cd93d03145aba8477a9eb4':
Label lost+found directories with SELinux security contexts.
Nick Kralevich [Sun, 27 Apr 2014 01:05:28 +0000 (01:05 +0000)]
Merge "Label lost+found directories with SELinux security contexts."
Stephen Smalley [Fri, 25 Apr 2014 18:57:55 +0000 (14:57 -0400)]
Label lost+found directories with SELinux security contexts.
When an asec image is generated, the lost+found directory has no
security.selinux attribute set and thus shows up as unlabeled.
We already handle this correctly when building images from existing
directories with files, so we just need to do it here as well when
generating an otherwise empty initial image.
Change-Id: I6d449dcc67a5cbc2101718e34ea0e184936d7f0e
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Jeff Brown [Mon, 21 Apr 2014 12:45:36 +0000 (12:45 +0000)]
am
6a345c75: am
9a213e07: Ignore VmFlags: and other unrecognized fields.
* commit '
6a345c75c660f010d9e158774a955d52c78b519b':
Ignore VmFlags: and other unrecognized fields.
Jeff Brown [Sat, 19 Apr 2014 00:02:10 +0000 (00:02 +0000)]
am
9a213e07: Ignore VmFlags: and other unrecognized fields.
* commit '
9a213e07f1e1f083bc56dbe707e0ec2af3990b43':
Ignore VmFlags: and other unrecognized fields.
Jeff Brown [Fri, 18 Apr 2014 23:47:20 +0000 (16:47 -0700)]
Ignore VmFlags: and other unrecognized fields.
Fixed a bug that causes showmap to skip items when /proc/pid/smap
included any unrecognized fields.
Change-Id: Ic648d4272d0269ff226047cf2d3271e9e63bb302
Mark Salyzyn [Thu, 17 Apr 2014 19:36:36 +0000 (19:36 +0000)]
am
fb109b89: Merge "directiotest: 64 bit compile issue"
* commit '
fb109b894a5fc2891e49ec8e81c0dda171b45b7f':
directiotest: 64 bit compile issue
Mark Salyzyn [Thu, 17 Apr 2014 14:12:48 +0000 (14:12 +0000)]
Merge "directiotest: 64 bit compile issue"
Mark Salyzyn [Wed, 16 Apr 2014 23:13:53 +0000 (16:13 -0700)]
directiotest: 64 bit compile issue
Change-Id: Iaef4f2aebfc1258594fca64615cd52758ac23a75
Geremy Condra [Tue, 15 Apr 2014 18:18:41 +0000 (11:18 -0700)]
verity: optimize for memory usage
Reading the entire image into memory and then blockifying it will
peak at using 2x the size of the image, and hold the size of the
image in memory for the entire computation. Instead, read
up to 16MB at a time and compute its block hashes before throwing
it away and continuing.
Change-Id: Ibbf1317616765a0dd8de4195b1046a75394c1815
Ben Murdoch [Fri, 21 Mar 2014 10:19:50 +0000 (10:19 +0000)]
Add a cleanspec
Change-Id: I2506d7f7a3ed8e66e5ae22b0a55d4be4ba96032d
Mark Salyzyn [Thu, 20 Mar 2014 23:51:51 +0000 (23:51 +0000)]
am
75cd8ffa: Merge "qtaguid test: 64-bit compile issues"
* commit '
75cd8ffa850aa6414d1771bbc44c4ae806702b85':
qtaguid test: 64-bit compile issues
Mark Salyzyn [Thu, 20 Mar 2014 23:47:28 +0000 (23:47 +0000)]
am
c42f1cc2: Merge "micro_bench: 64 bit compile issues"
* commit '
c42f1cc240aa3828bf5982f2d05a7804cc06d5ef':
micro_bench: 64 bit compile issues
Mark Salyzyn [Thu, 20 Mar 2014 23:22:29 +0000 (23:22 +0000)]
Merge "qtaguid test: 64-bit compile issues"
Mark Salyzyn [Thu, 20 Mar 2014 20:24:32 +0000 (13:24 -0700)]
qtaguid test: 64-bit compile issues
Change-Id: If3d83ccc4a50eae503f15a9de948b8c21641d8de
Mark Salyzyn [Thu, 20 Mar 2014 22:27:58 +0000 (22:27 +0000)]
Merge "micro_bench: 64 bit compile issues"
Mark Salyzyn [Thu, 20 Mar 2014 19:46:42 +0000 (12:46 -0700)]
micro_bench: 64 bit compile issues
- use %zu for size_t operands
- suppress unused argument warning messages
Change-Id: Ib39b8763414320d9e3a29408bc1b396ddb376293
Colin Cross [Thu, 20 Mar 2014 18:15:26 +0000 (11:15 -0700)]
taskstats: fix warnings
Fix warnings on arm64 build
Change-Id: Icc1b497361e8f532f10c850fb0bf5e3fa22249b5
Colin Cross [Thu, 20 Mar 2014 18:10:50 +0000 (11:10 -0700)]
taskstats: convert to libnl
libnl_2 has been replaced with libnl.
Change-Id: Ie96a92c3a77a1a4dcbf0646b1a8f41659f0027e8
Geremy Condra [Tue, 18 Mar 2014 22:26:35 +0000 (22:26 +0000)]
Merge "Cleanup."
Geremy Condra [Tue, 18 Mar 2014 00:41:07 +0000 (17:41 -0700)]
Cleanup.
Remove syspatch (now under external/syspatch) and spurious
makefile noise.
Change-Id: I2fa4b133ff18f9584b35f202de0639899906fd30
Mohamad Ayyash [Tue, 18 Mar 2014 17:44:09 +0000 (17:44 +0000)]
Merge "fstest: Add a set of filesystem recovery tests with gTest."
Mark Salyzyn [Mon, 17 Mar 2014 23:33:13 +0000 (23:33 +0000)]
am
73950d61: Merge "librank: 64-bit compile issues"
* commit '
73950d6149af1256356be6d309c766bcb3763c62':
librank: 64-bit compile issues
Mark Salyzyn [Mon, 17 Mar 2014 22:44:24 +0000 (22:44 +0000)]
Merge "librank: 64-bit compile issues"
Mark Salyzyn [Mon, 17 Mar 2014 15:58:40 +0000 (08:58 -0700)]
librank: 64-bit compile issues
- size_t format and comparisons
Change-Id: I00ad92ecf2566c7aa02b145e1b8679164b2c9f8a
Mohamad Ayyash [Fri, 14 Mar 2014 03:56:12 +0000 (20:56 -0700)]
fstest: Add a set of filesystem recovery tests with gTest.
Tests to verify recovery from super block and gdt corruption.
TESTED:
Verified in dmesg that e2fsck is detecting and fixing errors in the
filesystem.
Change-Id: I1da6352c67fda3466b57875554a42291bd11809c
Mark Salyzyn [Fri, 14 Mar 2014 21:35:40 +0000 (21:35 +0000)]
am
374a2de9: Merge "ksmutils: 64 bit compile issues"
* commit '
374a2de9dab15cfed120c9165ec94815f6236bd8':
ksmutils: 64 bit compile issues
Mark Salyzyn [Fri, 14 Mar 2014 20:53:21 +0000 (20:53 +0000)]
Merge "ksmutils: 64 bit compile issues"
Mark Salyzyn [Fri, 14 Mar 2014 18:15:07 +0000 (11:15 -0700)]
ksmutils: 64 bit compile issues
Change-Id: I9c4f141b6c436611a3a85e692b4fb47104d4f783
Elliott Hughes [Wed, 12 Mar 2014 19:57:00 +0000 (19:57 +0000)]
am
4936b689: Merge "Remove test_thread_max."
* commit '
4936b689521aa10882b6b59afc4b812dd413b56f':
Remove test_thread_max.
Elliott Hughes [Wed, 12 Mar 2014 19:57:00 +0000 (19:57 +0000)]
am
e5ca5673: Merge "Remove test_pthread_getcpuclockid."
* commit '
e5ca56733f8f2c453e32189bf3a0097f9a6663b9':
Remove test_pthread_getcpuclockid.
Elliott Hughes [Wed, 12 Mar 2014 19:57:00 +0000 (19:57 +0000)]
am
5426daff: Merge "Remove obsolete system(3) test."
* commit '
5426daff0a39422ea921b547f67c0606a52c5718':
Remove obsolete system(3) test.
Elliott Hughes [Wed, 12 Mar 2014 19:56:59 +0000 (19:56 +0000)]
am
ba2d8722: Merge "Remove obsolete benchmarks."
* commit '
ba2d8722ba758aec5ebb1c3d3153ba87f6a8510d':
Remove obsolete benchmarks.
Elliott Hughes [Tue, 11 Mar 2014 20:05:34 +0000 (20:05 +0000)]
Merge "Remove test_thread_max."
Elliott Hughes [Tue, 11 Mar 2014 20:04:27 +0000 (13:04 -0700)]
Remove test_thread_max.
Not actually a useful test, and we already test creating threads, including
error conditions in bionic as part of CTS.
Change-Id: If478b1e389c5cf65a9827da7f57efd696afc6523
Elliott Hughes [Tue, 11 Mar 2014 20:00:54 +0000 (20:00 +0000)]
Merge "Remove test_pthread_getcpuclockid."
Elliott Hughes [Tue, 11 Mar 2014 20:00:18 +0000 (13:00 -0700)]
Remove test_pthread_getcpuclockid.
Bionic already has a better test that's part of CTS.
Change-Id: I2e6bfb795d5fe1393432673a082338d85c083444
Elliott Hughes [Tue, 11 Mar 2014 19:58:32 +0000 (19:58 +0000)]
Merge "Remove obsolete system(3) test."
Elliott Hughes [Tue, 11 Mar 2014 19:55:31 +0000 (12:55 -0700)]
Remove obsolete system(3) test.
Change-Id: Ife11d1d526b92062090da231853f65329c0c8962
Elliott Hughes [Tue, 11 Mar 2014 19:48:30 +0000 (19:48 +0000)]
Merge "Remove obsolete benchmarks."
Elliott Hughes [Tue, 11 Mar 2014 18:17:30 +0000 (11:17 -0700)]
Remove obsolete benchmarks.
bionic now has all of these.
Change-Id: I0b65f019b88bc9ac7d33bd424361497320c66b7b
Elliott Hughes [Tue, 11 Mar 2014 01:59:46 +0000 (01:59 +0000)]
am
fe9aee47: Merge "Remove <time.h> tests."
* commit '
fe9aee4780d561b6d3990094f74168bc9560fd8b':
Remove <time.h> tests.
Elliott Hughes [Tue, 11 Mar 2014 01:41:15 +0000 (01:41 +0000)]
Merge "Remove <time.h> tests."
Elliott Hughes [Tue, 11 Mar 2014 01:35:19 +0000 (01:35 +0000)]
am
9fe52666: Merge "Remove bench_locks, which is a subset of bench_pthread."
* commit '
9fe526664d60e92800b281c37d564d8fe3eabb54':
Remove bench_locks, which is a subset of bench_pthread.
Elliott Hughes [Tue, 11 Mar 2014 01:20:02 +0000 (18:20 -0700)]
Remove <time.h> tests.
I've turned the strftime and strptime tests into CTS tests, and it's
not obvious what the other test was usefully testing.
Change-Id: I9d0ba08c6f2e2170e902e4a2aa379dd7289bdf6c
Elliott Hughes [Tue, 11 Mar 2014 01:26:12 +0000 (01:26 +0000)]
Merge "Remove bench_locks, which is a subset of bench_pthread."
Elliott Hughes [Tue, 11 Mar 2014 01:25:06 +0000 (18:25 -0700)]
Remove bench_locks, which is a subset of bench_pthread.
Change-Id: Id8d952d2ca634f86aaaf01e05c98524d9110b054
Elliott Hughes [Tue, 11 Mar 2014 01:10:48 +0000 (01:10 +0000)]
am
454a3f86: Merge "Remove tests that are already better tested as part of CTS."
* commit '
454a3f866acd76f477c60e224fad017e86285476':
Remove tests that are already better tested as part of CTS.
Elliott Hughes [Tue, 11 Mar 2014 01:00:25 +0000 (01:00 +0000)]
Merge "Remove tests that are already better tested as part of CTS."
Elliott Hughes [Tue, 11 Mar 2014 00:51:21 +0000 (17:51 -0700)]
Remove tests that are already better tested as part of CTS.
Change-Id: I06592a245c2229ca455156bab40eb1a815eef75b
Elliott Hughes [Mon, 10 Mar 2014 23:06:13 +0000 (23:06 +0000)]
am
d22a6b47: Merge "Remove timer tests."
* commit '
d22a6b47204f7866039049fba566fc8c75598ff0':
Remove timer tests.
Elliott Hughes [Mon, 10 Mar 2014 22:55:52 +0000 (22:55 +0000)]
Merge "Remove timer tests."
Elliott Hughes [Tue, 4 Mar 2014 22:21:34 +0000 (14:21 -0800)]
Remove timer tests.
bionic contains a superset of these tests, and the binoic tests are
part of CTS.
Change-Id: I9e05d44749c6d6c94271a150fd8b71a297d6ebca
Paul Lawrence [Mon, 3 Mar 2014 18:51:58 +0000 (10:51 -0800)]
Remove warnings
Remove warnings called by duplicate definition of ALIGN macro.
Note that bionic/libc/include/sys/param.h defines ALIGN as
#define ALIGN(p) (((uintptr_t)(p) + ALIGNBYTES) &~ ALIGNBYTES)
which is not good - clashes with every other definition of ALIGN.
Change-Id: I2d716c41ededd2fa072f944e21d94a0c93ca9c46
Ying Wang [Fri, 28 Feb 2014 01:22:16 +0000 (01:22 +0000)]
Merge "Fix 64-bit build."
Ying Wang [Thu, 27 Feb 2014 22:13:37 +0000 (14:13 -0800)]
Fix 64-bit build.
Change-Id: I52f4acaab3e2dcd59c23701f60ac12fed40828c6
Mark Salyzyn [Thu, 27 Feb 2014 20:37:24 +0000 (20:37 +0000)]
am
57f6553a: Merge "perm_checker: Add permission for /dev/socket/logd*"
* commit '
57f6553aa48cdcce383d3c5aac2c8280b6747da8':
perm_checker: Add permission for /dev/socket/logd*
Mark Salyzyn [Thu, 27 Feb 2014 20:29:57 +0000 (20:29 +0000)]
Merge "perm_checker: Add permission for /dev/socket/logd*"
Mark Salyzyn [Fri, 8 Nov 2013 23:40:02 +0000 (15:40 -0800)]
perm_checker: Add permission for /dev/socket/logd*
Change-Id: I9140384e3cd557c1e346ed386800921632af9c28
Elliott Hughes [Thu, 27 Feb 2014 18:00:47 +0000 (18:00 +0000)]
am
fb03a168: Merge "Don\'t abuse KERNEL_HEADERS."
* commit '
fb03a168b8d3ed9e298e03f66bc45c49ed939eee':
Don't abuse KERNEL_HEADERS.
Elliott Hughes [Thu, 27 Feb 2014 17:50:45 +0000 (17:50 +0000)]
Merge "Don't abuse KERNEL_HEADERS."
Elliott Hughes [Thu, 27 Feb 2014 17:42:34 +0000 (09:42 -0800)]
Don't abuse KERNEL_HEADERS.
You get the right ones for free, and this would be wrong on multi-arch.
Change-Id: I832ae5343bfa24a9c45a305afa62a0cf4ac75615
JP Abgrall [Sat, 15 Feb 2014 02:11:33 +0000 (02:11 +0000)]
am
d27ada97: Merge "ext4_utils: don\'t leave bad image file in case of error"
* commit '
d27ada97706b61c6e302a94bd845b877121556c3':
ext4_utils: don't leave bad image file in case of error
JP Abgrall [Sat, 15 Feb 2014 01:59:51 +0000 (01:59 +0000)]
Merge "ext4_utils: don't leave bad image file in case of error"
JP Abgrall [Sat, 15 Feb 2014 01:31:40 +0000 (17:31 -0800)]
ext4_utils: don't leave bad image file in case of error
Bug:
13029951
Change-Id: Ibe50a503c2d3988813b362790b7fba83383fb51e
Geremy Condra [Thu, 13 Feb 2014 22:05:49 +0000 (22:05 +0000)]
am
c0f813af: Merge "Set s_flags to 2 to prevent a write on first mount."
* commit '
c0f813afc35c1ca497f35b46181b37c9b837726e':
Set s_flags to 2 to prevent a write on first mount.
Geremy Condra [Thu, 13 Feb 2014 21:54:09 +0000 (21:54 +0000)]
Merge "Set s_flags to 2 to prevent a write on first mount."
Geremy Condra [Wed, 12 Feb 2014 23:34:20 +0000 (15:34 -0800)]
Set s_flags to 2 to prevent a write on first mount.
The s_flags field is used to indicate whether characters are signed
or unsigned, which differs between ARM and x86 targets. Setting
this value to 0 causes the correct value for the target to be
written back to the superblock on first mount, even if the fs is
marked read only.
Since this value is only used to ensure interoperability with 2.4
series kernels (which we don't need) in dirhash (which we don't
use), we'll just set it to 2 to prevent the write.
Change-Id: I92698235909791fb5f423cfd61ff5299307a8f97
Colin Cross [Thu, 6 Feb 2014 07:51:24 +0000 (07:51 +0000)]
am
fb2fc9e5: Merge "kexecload: fix LP64 warnings"
* commit '
fb2fc9e55a52c50adfb5b62ba1b70e8dac646ab4':
kexecload: fix LP64 warnings
Colin Cross [Thu, 6 Feb 2014 07:33:44 +0000 (07:33 +0000)]
Merge "kexecload: fix LP64 warnings"
Colin Cross [Thu, 6 Feb 2014 02:57:04 +0000 (18:57 -0800)]
kexecload: fix LP64 warnings
Use uintptr_t for pointer arithmetic.
Change-Id: I69385fe67ce823f3b13d8dc73acf0a0ff5bb1e83
Colin Cross [Wed, 5 Feb 2014 23:11:55 +0000 (23:11 +0000)]
am
991d0bbb: Merge "make_ext4fs: fix block allocation to be best-fit"
* commit '
991d0bbb02662ef36b3d770e914bd61cbe9d392a':
make_ext4fs: fix block allocation to be best-fit
Colin Cross [Wed, 5 Feb 2014 22:59:44 +0000 (22:59 +0000)]
Merge "make_ext4fs: fix block allocation to be best-fit"
Colin Cross [Tue, 21 Jan 2014 08:04:04 +0000 (00:04 -0800)]
make_ext4fs: fix block allocation to be best-fit
The block allocation algorithm was failing to allocate parts of large
files out of partially filled block groups. Update the allocation
algorithm to be a simpler best fit loop - if the remaining length to
allocate is larger than any single contiguous region, allocate the
largest single contiguous region and continue allocating, otherwise
allocate the smallest contiguous that can hold the length.
Change-Id: Idcc60df91ed0a266d3128ea46e86408a581d3f40
Ian Rogers [Fri, 31 Jan 2014 17:41:38 +0000 (17:41 +0000)]
am
a17a2525: Merge "Remove bogus semicolons"
* commit '
a17a25251597b76de47edd1b43a2b972303d9318':
Remove bogus semicolons
Colin Cross [Fri, 31 Jan 2014 17:38:20 +0000 (09:38 -0800)]
resolved conflicts for merge of
74da0434 to master
Change-Id: I0a7745ecf65a2188c32e7bf2e89fe93259c71b83
Ian Rogers [Fri, 31 Jan 2014 16:38:37 +0000 (16:38 +0000)]
Merge "Remove bogus semicolons"
Colin Cross [Thu, 30 Jan 2014 04:00:05 +0000 (04:00 +0000)]
Merge changes Icaf79989,I185352ec,I5a72147f,Ied3dc6a0
* changes:
ext4_utils: fix build for 64 bit
ext4_utils: move superblock parsing to its own compilation unit
ext4_utils: move sparse file pointer out of fs_info
ext4_utils: refactor kernel headers
Colin Cross [Thu, 23 Jan 2014 21:19:27 +0000 (13:19 -0800)]
ext4_utils: fix build for 64 bit
Correct u64/s64 definitions
Use PRIu64 to print u64
Change-Id: Icaf7998946b0a2faa03495b404af8b94e4e3d047
Paul Lawrence [Tue, 21 Jan 2014 16:26:21 +0000 (08:26 -0800)]
ext4 utils: Refactor read_ext, and expose some of the functions
Make read_ext an externally useable function. Use case is to
enable fast encryption by being able to look at whether each block
is in use or not.
Bug:
11985952
Change-Id: Ief71f408a55db7261c75ebe974620415ed8cfd29
Bernhard Rosenkränzer [Fri, 24 Jan 2014 21:55:43 +0000 (22:55 +0100)]
Remove bogus semicolons
Remove semicolons after function declarations.
They don't (currently) hurt, but they're invalid and might
break future compilers.
Change-Id: I82a2b414f2e465d40948c4a4f8f103023a7830de
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
Colin Cross [Thu, 23 Jan 2014 21:13:02 +0000 (13:13 -0800)]
ext4_utils: move superblock parsing to its own compilation unit
Move ext4_parse_sb to its own compilation unit so it can be used
from fs_mgr without pulling in all of libext4_utils' dependencies
when compiling with ld.bfd.
Change-Id: I185352ecea0e0d577b8cdddfd519f2826d631277
Colin Cross [Thu, 23 Jan 2014 21:08:16 +0000 (13:08 -0800)]
ext4_utils: move sparse file pointer out of fs_info
Move the sparse file pointer out of the fs_info struct in
preparation for exporting fs_info without sparse file support.
Change-Id: I5a72147fe4fb24296e615cb82dbba91c6dc6f7f0
Colin Cross [Thu, 23 Jan 2014 20:53:30 +0000 (12:53 -0800)]
ext4_utils: refactor kernel headers
Move the kernel header includes into a single include file that
can deal with getting the kernel int types correct on all
platforms.
Change-Id: Ied3dc6a0f5cbb3ceb686aa3de72f16e10a36462a
Elliott Hughes [Thu, 12 Dec 2013 21:15:15 +0000 (21:15 +0000)]
am
e35f7fed: Merge "procmem: Use size_t instead of int to remove a potential bug."
* commit '
e35f7fedabf9346d299abe10af25eaf88207a133':
procmem: Use size_t instead of int to remove a potential bug.
Elliott Hughes [Thu, 12 Dec 2013 21:11:38 +0000 (21:11 +0000)]
am
907516b8: Merge "procrank: Use %zu for size_t and %d for pid_t"
* commit '
907516b85ac4e604393e8573bda8d77fe7f6ccdc':
procrank: Use %zu for size_t and %d for pid_t
Elliott Hughes [Thu, 12 Dec 2013 20:58:20 +0000 (20:58 +0000)]
Merge "procmem: Use size_t instead of int to remove a potential bug."
Elliott Hughes [Thu, 12 Dec 2013 20:53:50 +0000 (20:53 +0000)]
Merge "procrank: Use %zu for size_t and %d for pid_t"
Ashok Bhat [Thu, 10 Jan 2013 16:24:59 +0000 (16:24 +0000)]
procmem: Use size_t instead of int to remove a potential bug.
In procmem.c, num_maps and num_pages are declared as
int. Pointers (int*) to these variables are being
passed to functions pm_process_maps and pm_map_pagemap
respectively, both of which expect size_t * argument.
This will lead to problems in 64-bit systems where
size_t and int_t have different size.
To avoid the issue, num_maps and num_pages are declared
as size_t. In addition, loop counters i and j are now
declared as size_t to avoid comparison of signed int with
unsigned int.
Change-Id: I3fc51f9386c9b2d289d34808e19e3811ca4a3dae
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Ashok Bhat [Thu, 10 Jan 2013 15:52:55 +0000 (15:52 +0000)]
procrank: Use %zu for size_t and %d for pid_t
Change-Id: Ic339a05a3091ec6b33b68bc5e76082de3513e9c7
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Doug Zongker [Fri, 6 Dec 2013 19:19:07 +0000 (19:19 +0000)]
Merge "allow fixing timestamps when building ext4 filesystem"
Doug Zongker [Thu, 5 Dec 2013 23:51:28 +0000 (15:51 -0800)]
allow fixing timestamps when building ext4 filesystem
When building an image, make_ext4fs currently sets the timestamps in
the image to the timestamps of the source files. Allow this time to
be overridden with a fixed value provided on the command line, to make
it easier to reproduce bit-identical images from a target_files zip.
Change-Id: I52ddab4575a334ee52404f4d5d1c61b55513c618
Christopher Ferris [Wed, 4 Dec 2013 21:18:40 +0000 (21:18 +0000)]
am
144d160d: Merge "Remove dead test."
* commit '
144d160d4d21e70472fcc6a725ceb2358c1de3fc':
Remove dead test.
Christopher Ferris [Wed, 4 Dec 2013 20:26:29 +0000 (20:26 +0000)]
Merge "Remove dead test."
Christopher Ferris [Wed, 4 Dec 2013 20:00:51 +0000 (12:00 -0800)]
Remove dead test.
All of the functionality of these tests has moved in to bionic/tests.
Bug:
9797008
Change-Id: I45f395cafb8dc83fbfc8179b004da920e4a34c87
Dmitry Shmidt [Tue, 3 Dec 2013 21:52:59 +0000 (13:52 -0800)]
Add initial alsa tests
Change-Id: Iffc30bfe3fe79c720a721ceb98a2618eb81326c1
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Elliott Hughes [Mon, 25 Nov 2013 21:58:28 +0000 (13:58 -0800)]
am
8a24d92c: Merge "kexec.h is a uapi header."
* commit '
8a24d92c5cd4087f3efd309cc8b0b036d2d33be9':
kexec.h is a uapi header.
Elliott Hughes [Mon, 25 Nov 2013 21:45:07 +0000 (21:45 +0000)]
Merge "kexec.h is a uapi header."
Elliott Hughes [Mon, 25 Nov 2013 19:44:19 +0000 (11:44 -0800)]
kexec.h is a uapi header.
Uapi is not a subdirectory of the old headers; it's the new alternative.
Look for it in the right place. (Required by a recent external/kernel-headers
fix.)
Change-Id: I3ae468d3eb79b355dc1bf4127536c6e0f397555a