OSDN Git Service
Colin Cross [Tue, 17 Jun 2014 22:58:58 +0000 (22:58 +0000)]
Merge changes Ic686b4cb,Ie4b6c7ef
* changes:
procrank: support >4GB of memory from 32-bit procrank
libpagemap: support 64-bit kernel from 32-bit libpagemap
Colin Cross [Tue, 17 Jun 2014 21:38:34 +0000 (14:38 -0700)]
procrank: support >4GB of memory from 32-bit procrank
Use uint64_t for sizes.
Change-Id: Ic686b4cbf4406aec1e9b01810924488bff63722e
Colin Cross [Tue, 17 Jun 2014 21:37:06 +0000 (14:37 -0700)]
libpagemap: support 64-bit kernel from 32-bit libpagemap
Use uint64_t and lseek64 to handle 64-bit virtual addresses
when libpagemap is compiled as a 32-bit library.
Change-Id: Ie4b6c7ef05aac604011f3ee28b059d9dfcd63edb
Colin Cross [Tue, 17 Jun 2014 19:37:16 +0000 (19:37 +0000)]
Merge "fix libpagemap for x86_64"
Colin Cross [Tue, 17 Jun 2014 01:52:47 +0000 (18:52 -0700)]
fix libpagemap for x86_64
libpagemap was storing a virtual pfn in an int, which works on arm64
with 39 bits of virtual address space but fails on x86_64. Use an
unsigned long instead.
Fixes errors when running procrank on x86_64:
warning: could not read usage for 1
Change-Id: I171c8ee49faa51accf3c1bb69059d549aee04979
David 'Digit' Turner [Mon, 16 Jun 2014 17:49:36 +0000 (17:49 +0000)]
Merge "Ignore wipe operation on non-block devices."
David 'Digit' Turner [Thu, 12 Jun 2014 18:54:50 +0000 (20:54 +0200)]
Ignore wipe operation on non-block devices.
The implementation of make_ext4fs() calls make_ext4fs_internal() by
forcing the |wipe| parameter to true, which is problematic when the
library is used within the emulator (the wipe operation will always
fail on non-Linux platforms).
This patch does the following:
- Add a 'is_block_device_fd()' function to check that a file descriptor
points to a real block device.
- Modify the implementation of wipe_block_device() uses it to return
silently when trying to wipe a non-block-device file.
- Add a WIPE_IS_SUPPORTED flag in wipe.h that indicates whether
block device wiping is supported on the current platform
(for now, this is only the case on Linux).
BUG=NONE
Change-Id: I62b62b7c3e99b465c3b876154231e7c2fe541b23
Ying Wang [Mon, 9 Jun 2014 22:52:33 +0000 (22:52 +0000)]
Merge "Don't set LOCAL_MODULE_PATH for native test."
Ying Wang [Mon, 9 Jun 2014 22:22:47 +0000 (15:22 -0700)]
Don't set LOCAL_MODULE_PATH for native test.
The build system will set it up automatically.
Change-Id: I528aa6c296f2ca8ffe8c74beca2cd49117b229e3
Colin Cross [Fri, 16 May 2014 00:07:06 +0000 (00:07 +0000)]
Merge "The situation len = 0 and absolute = false need to be handled"
Colin Cross [Thu, 15 May 2014 01:29:02 +0000 (01:29 +0000)]
Merge "libpagemap: handle zero length memory regions"
Colin Cross [Thu, 15 May 2014 01:20:38 +0000 (18:20 -0700)]
libpagemap: handle zero length memory regions
/proc/pid/maps may report a zero-length memory region for a 4kB
PROT_GROWSDOWN region because it subtracts 4kB for the guard page.
Return 0 instead of -1 when this occurs, and set range_out to NULL
and len to 0. All existing callers of pm_process_pagemap_range
will not dereference range_out if len is 0.
Bug:
14683277
Change-Id: If405651ad034dda780b93fab2dc616e177a0b917
Elliott Hughes [Wed, 14 May 2014 01:19:18 +0000 (01:19 +0000)]
Merge "Remove a test for dead code."
Elliott Hughes [Wed, 14 May 2014 01:17:25 +0000 (18:17 -0700)]
Remove a test for dead code.
Bug:
14903517
Change-Id: I139ae922c6c9468606d3145f0c74361ed789d949
Torne (Richard Coles) [Tue, 6 May 2014 10:35:59 +0000 (10:35 +0000)]
Merge "Add {BEGIN,END}_DECLS to header file."
Torne (Richard Coles) [Tue, 6 May 2014 10:31:42 +0000 (11:31 +0100)]
Add {BEGIN,END}_DECLS to header file.
Enable this header to be cleanly included in C++ code.
Change-Id: Ie4ae60629661237ce07b49b17802f01bf95552d8
Benoit Fradin [Wed, 28 Aug 2013 12:44:32 +0000 (14:44 +0200)]
The situation len = 0 and absolute = false need to be handled
Add a return case for len == 0 and absolute == false
Change-Id: Ia36bd67ced6abbe7234eb7e485c1a2d8bd928ffe
Signed-off-by: Benoit Fradin <benoit.fradin@intel.com>
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>
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
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
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
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 [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:41:15 +0000 (01:41 +0000)]
Merge "Remove <time.h> tests."
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: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 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
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 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 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 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: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 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 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
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 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>
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
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
Elliott Hughes [Sat, 23 Nov 2013 01:22:08 +0000 (17:22 -0800)]
am
49e5bca2: Merge "Remove fatblock and libublock."
* commit '
49e5bca23f9759b9d75366a1f611249d6398a5e7':
Remove fatblock and libublock.
Elliott Hughes [Sat, 23 Nov 2013 00:38:02 +0000 (00:38 +0000)]
Merge "Remove fatblock and libublock."
Elliott Hughes [Sat, 23 Nov 2013 00:19:56 +0000 (16:19 -0800)]
Remove fatblock and libublock.
The kernel support for these no longer exists.
Change-Id: I33a613e0185f03486a92b569c7d277e443fd1d48
Elliott Hughes [Thu, 19 Sep 2013 21:30:58 +0000 (14:30 -0700)]
am
67a05c0d: Merge "use BIONIC implementation of mmap64"
* commit '
67a05c0d165d779126a5fa8831cd95a0bf2fd1f2':
use BIONIC implementation of mmap64
Elliott Hughes [Thu, 19 Sep 2013 21:22:48 +0000 (21:22 +0000)]
Merge "use BIONIC implementation of mmap64"
Andrew Boie [Wed, 19 Dec 2012 16:39:49 +0000 (08:39 -0800)]
use BIONIC implementation of mmap64
Change-Id: Idb0c3d3bb98f22ea7d78043b786e931613377b02
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
Colin Cross [Fri, 30 Aug 2013 21:20:42 +0000 (14:20 -0700)]
am
1b72e0d0: Merge "libpagemap: fix memory leak in pm_process_destroy()"
* commit '
1b72e0d0fa93e828facb3f4f2e84facff87d81fb':
libpagemap: fix memory leak in pm_process_destroy()
Colin Cross [Fri, 30 Aug 2013 21:15:20 +0000 (21:15 +0000)]
Merge "libpagemap: fix memory leak in pm_process_destroy()"
Carton He [Wed, 28 Aug 2013 03:19:34 +0000 (11:19 +0800)]
libpagemap: fix memory leak in pm_process_destroy()
procrank/librank not impacted because they end quickly. But other
programs that use libpagemap and last for long time can easily see this
memory leak.
Change-Id: I8c9e9444555bef9145c9d89850987a29f15a9b3b
Signed-off-by: Carton He <carton.he@marvell.com>
Ken Sumrall [Fri, 16 Aug 2013 19:26:05 +0000 (12:26 -0700)]
am
7f026d09: Merge "Avoid underflow on an unsigned int when computering bg overrun"
* commit '
7f026d09fa05a3aa93cea6f6e25df1b5c0f800a0':
Avoid underflow on an unsigned int when computering bg overrun
Ken Sumrall [Fri, 16 Aug 2013 02:31:40 +0000 (02:31 +0000)]
Merge "Avoid underflow on an unsigned int when computering bg overrun"
Ken Sumrall [Fri, 16 Aug 2013 02:06:29 +0000 (19:06 -0700)]
Avoid underflow on an unsigned int when computering bg overrun
A computation for when a block group overruns the end of an image
was consistently storing a negative number in an unsigned var,
and then checking for >0, which is always true for negative numbers.
So first check if the number will be positive before computing it.
Change-Id: Ic8cff8f9ab9f4ea8c5a4dc42143c2430fa87ba12
Christopher Ferris [Wed, 31 Jul 2013 22:23:25 +0000 (15:23 -0700)]
am
5b1efce4: Merge "Add cold versions of benchmarks."
* commit '
5b1efce4aeea83c7b18dfed5d3366d6b84874c23':
Add cold versions of benchmarks.
Christopher Ferris [Wed, 31 Jul 2013 22:14:07 +0000 (22:14 +0000)]
Merge "Add cold versions of benchmarks."
Christopher Ferris [Wed, 24 Jul 2013 22:34:13 +0000 (15:34 -0700)]
Add cold versions of benchmarks.
- Created macros for one and two buffer benchmarks to simplify
addition of new benchmarks.
- Created cold versions of all benchmarks that work on buffer benchmarks.
This means that the benchmark is given buffers that are not in the cache.
- Verified the cold versions are working as intended by
changing it so that the same buffer is written in each loop
instead of the strided buffer. Using this method, the cold and
normal benchmark run at the same speed.
Merge from internal master.
(cherry-picked from
991bcd464d67c3cff76477140331619ff138aafc)
Change-Id: I4b1b55510d90cc9a941fd68244971cb08cfba553
Christopher Ferris [Wed, 24 Jul 2013 22:34:13 +0000 (15:34 -0700)]
Add cold versions of benchmarks.
- Created macros for one and two buffer benchmarks to simplify
addition of new benchmarks.
- Created cold versions of all benchmarks that work on buffer benchmarks.
This means that the benchmark is given buffers that are not in the cache.
- Verified the cold versions are working as intended by
changing it so that the same buffer is written in each loop
instead of the strided buffer. Using this method, the cold and
normal benchmark run at the same speed.
Change-Id: Ie5d1b015dd70d3935cfa2830a82955429a2f5b3c
Rom Lemarchand [Fri, 26 Jul 2013 16:33:20 +0000 (16:33 +0000)]
Merge "ksmutils: display page count"
Colin Cross [Thu, 25 Jul 2013 23:34:46 +0000 (23:34 +0000)]
Merge "Kexec tools for replacing working kernel during crash"
Rom Lemarchand [Thu, 25 Jul 2013 22:47:16 +0000 (15:47 -0700)]
ksmutils: display page count
Change-Id: I90ca712463681c1c59533bd3d4d45509647ca3ff
Signed-off-by: Rom Lemarchand <romlem@google.com>
jp abgrall [Thu, 25 Jul 2013 22:07:34 +0000 (22:07 +0000)]
Merge "Missing include in wipe.h"
Szymon Starzycki [Mon, 15 Jul 2013 22:17:07 +0000 (15:17 -0700)]
Kexec tools for replacing working kernel during crash
Change-Id: I3d2bfacbe2f0e338712babf81efcecb79e9758ad
Szymon Starzycki [Wed, 24 Jul 2013 19:34:50 +0000 (12:34 -0700)]
Changed visibility of get_block_device_size
Change-Id: I5d27f5f50275017134a48eed8d89e452353777f1
Szymon Starzycki [Wed, 24 Jul 2013 00:45:49 +0000 (17:45 -0700)]
Missing include in wipe.h
Change-Id: I6c29d6e90c5bc17b3070595c89fad9ca5c3f75f9
Christopher Ferris [Tue, 16 Jul 2013 23:41:43 +0000 (16:41 -0700)]
am
dd9c23b6: am
23062f99: Merge "Add a static version of the test."
* commit '
dd9c23b6589351ed981e19c636761dc92ad2769c':
Add a static version of the test.
Christopher Ferris [Tue, 16 Jul 2013 23:31:51 +0000 (16:31 -0700)]
am
23062f99: Merge "Add a static version of the test."
* commit '
23062f994c2181d5de4f6f5b764c83d613465bba':
Add a static version of the test.
Christopher Ferris [Tue, 16 Jul 2013 23:30:05 +0000 (23:30 +0000)]
Merge "Add a static version of the test."
Christopher Ferris [Mon, 15 Jul 2013 19:50:30 +0000 (12:50 -0700)]
Add a static version of the test.
Merge from internal master.
(cherry-picked from
4052fe181a499f52729b7178f11ae91212823682)
Change-Id: I90d1320e8d8032d82909a2a7435fda9ee3ec1fdb
Christopher Ferris [Mon, 15 Jul 2013 22:25:54 +0000 (15:25 -0700)]
am
1f5c5c76: am
f23b47e9: am
d8f4bfc7: (-s ours) Merge "Add tests for strcpy and strcat."
* commit '
1f5c5c76aff9d7bb1723f1582b975b190dccc2f6':
Add tests for strcpy and strcat.