OSDN Git Service
Jeff Sharkey [Thu, 16 Aug 2012 21:35:55 +0000 (14:35 -0700)]
am
4228ed68: Merge "Support custom path when saving bugreports." into jb-mr1-dev
* commit '
4228ed68c2cb70a2c79620619b4ef01cfcdc8a3d':
Support custom path when saving bugreports.
Jeff Sharkey [Thu, 16 Aug 2012 21:33:04 +0000 (14:33 -0700)]
Merge "Support custom path when saving bugreports." into jb-mr1-dev
Jeff Sharkey [Thu, 16 Aug 2012 17:32:14 +0000 (10:32 -0700)]
Support custom path when saving bugreports.
When running on multi-user devices, we need to save bugreport data
to a write path, and launch intents using a different read path.
Bug:
6925012
Change-Id: I32773b733e8a4dd75a30f5b9b05424c4238243af
The Android Open Source Project [Wed, 15 Aug 2012 15:29:20 +0000 (08:29 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I024b531fa1a5981a894bbd56f91e263b15928a1b
The Android Automerger [Tue, 14 Aug 2012 14:08:12 +0000 (07:08 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Ken Sumrall [Tue, 14 Aug 2012 05:37:58 +0000 (22:37 -0700)]
Merge "Add manta support to android_emmc_perf_tests.sh" into jb-mr1-dev
Ken Sumrall [Tue, 14 Aug 2012 05:34:58 +0000 (22:34 -0700)]
Add manta support to android_emmc_perf_tests.sh
Also tweak the script a little bit. This is only for testing,
and doesn't ship in any product.
Change-Id: I9506d6babddef91fc6d9c0083064e0ef8a2d70a8
Guang Zhu [Fri, 10 Aug 2012 04:07:50 +0000 (21:07 -0700)]
sendbug improvements on email address handling
* use a property to indicate a preferred domain in case multiple
email addresses are detected; otherwise just pick the first
one that matches email address regex
* don't fire the intent if no email account is configured, there
have been reports on confusing behavior when capturing
bugreport for setup wizard
Bug:
6720467
Change-Id: Ib9b0b8a09e4e565b2531f3ec53723cd46186596f
Guang Zhu [Fri, 10 Aug 2012 04:07:50 +0000 (21:07 -0700)]
sendbug improvements on email address handling
* use a property to indicate a preferred domain in case multiple
email addresses are detected; otherwise just pick the first
one that matches email address regex
* don't fire the intent if no email account is configured, there
have been reports on confusing behavior when capturing
bugreport for setup wizard
Bug:
6720467
Change-Id: Ib9b0b8a09e4e565b2531f3ec53723cd46186596f
Jean-Baptiste Queru [Thu, 9 Aug 2012 18:43:53 +0000 (11:43 -0700)]
am
332e8bab: Merge "Avoid dereferencing NULL pointer with memcmp in the test code."
* commit '
332e8babe350433b320efc9484f15a5dbdd8c68f':
Avoid dereferencing NULL pointer with memcmp in the test code.
Jean-Baptiste Queru [Thu, 9 Aug 2012 18:24:26 +0000 (11:24 -0700)]
Merge "Avoid dereferencing NULL pointer with memcmp in the test code."
Jeff Sharkey [Wed, 8 Aug 2012 20:50:16 +0000 (13:50 -0700)]
Merge "Add directory tree traversal benchmark." into jb-mr1-dev
Jeff Sharkey [Sat, 4 Aug 2012 00:57:55 +0000 (17:57 -0700)]
Add directory tree traversal benchmark.
Generates a directory tree with requested depth, also writing files
at each leaf to add width. Then it times traversal of entire tree,
which can reveal impact of VFS caching inside kernel.
Also specify mode_t when creating files.
Bug:
6925012
Change-Id: I65370d6fd0b9777e959be3a0867f27ce22ee4644
Keun young Park [Wed, 8 Aug 2012 00:25:52 +0000 (17:25 -0700)]
allow java build if supported
- send_bug requires platform API support which is
enabled in PDK fusion build with platform.zip from platform-java build
Change-Id: I3285f595eb2a310a34770d40fa0b7c606669f1bf
Nick Kralevich [Thu, 19 Jul 2012 08:13:16 +0000 (01:13 -0700)]
am
983ce573: Merge "Fix SELinux labeling for system.img"
* commit '
983ce5738cee0bf78b87d6274fe1387129768302':
Fix SELinux labeling for system.img
Nick Kralevich [Wed, 18 Jul 2012 20:48:10 +0000 (13:48 -0700)]
Merge "Fix SELinux labeling for system.img"
Colin Cross [Wed, 18 Jul 2012 06:39:43 +0000 (23:39 -0700)]
am
fc3e87f7: Merge "system/extras/ext4_utils: move libsparse to system/core"
* commit '
fc3e87f70ba3c896ea5a85df3648623f207f88cc':
system/extras/ext4_utils: move libsparse to system/core
Colin Cross [Wed, 18 Jul 2012 06:39:43 +0000 (23:39 -0700)]
am
cab03682: Merge changes I32c33626,I93bc9cf9,I1f66f6c3
* commit '
cab036827411791e8f197a0194f95faad6f12cec':
make_ext4fs: allow sparse gzip files
libsparse: make API sane
Refactor sparse file support into libsparse
Colin Cross [Wed, 18 Jul 2012 01:36:43 +0000 (18:36 -0700)]
Merge "system/extras/ext4_utils: move libsparse to system/core"
Colin Cross [Wed, 18 Jul 2012 01:32:25 +0000 (18:32 -0700)]
Merge changes I32c33626,I93bc9cf9,I1f66f6c3
* changes:
make_ext4fs: allow sparse gzip files
libsparse: make API sane
Refactor sparse file support into libsparse
Colin Cross [Sun, 20 May 2012 20:37:10 +0000 (13:37 -0700)]
system/extras/ext4_utils: move libsparse to system/core
Delete libsparse from ext4_utils, move it to system/core/libsparse in
preparation for linking tools in system/core against it.
Change-Id: I3545c2e0ad7122f99bbc998ab0e85ca1e65d5add
Colin Cross [Fri, 18 May 2012 21:50:02 +0000 (14:50 -0700)]
make_ext4fs: allow sparse gzip files
libsparse can handle sparse gzipped files, allow -s and -z together.
Change-Id: I32c336269375135af6be5d00a55604f8bf7619a3
Colin Cross [Wed, 25 Apr 2012 00:48:43 +0000 (17:48 -0700)]
libsparse: make API sane
Replaces the libsparse API with a sane one based on an opaque
pointer.
Change-Id: I93bc9cf9a6b912a993ef554dbe6ffe2f0f723383
Colin Cross [Tue, 24 Apr 2012 06:20:48 +0000 (23:20 -0700)]
Refactor sparse file support into libsparse
Minimal refactoring of output_file.c into libsparse in preparation
for completely separating libsparse from ext4_utils.
Moves output_file.c, backed_block.c, and parts of ext4_utils.c
into libsparse. The only changes to the remanining files in
ext4_utils are using the new sparse.h header, and moving the
wipe call out of output_file.c and into make_ext4fs.c.
Change-Id: I1f66f6c3e05230a350023c5b4ea4422f16a73c4b
rpcraig [Wed, 11 Jul 2012 12:08:17 +0000 (08:08 -0400)]
Fix SELinux labeling for system.img
The system partition isn't getting labeled during the build.
This patch corrects that.
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
Change-Id: I2695c60232935da272ac194fb9ece016c84b4593
Ken Sumrall [Thu, 28 Jun 2012 00:04:23 +0000 (17:04 -0700)]
am
d2b6666e: am
32243fad: Fix a few bugs in rand_emmc_perf
* commit '
d2b6666effb387c9052cd63378c6d5ddd1c0d1c7':
Fix a few bugs in rand_emmc_perf
Ken Sumrall [Thu, 28 Jun 2012 00:01:45 +0000 (17:01 -0700)]
am
32243fad: Fix a few bugs in rand_emmc_perf
* commit '
32243fadeab8cf244861e3df89744b78ba3eff92':
Fix a few bugs in rand_emmc_perf
Ken Sumrall [Wed, 27 Jun 2012 23:01:40 +0000 (16:01 -0700)]
Fix a few bugs in rand_emmc_perf
Fix the code to properly read urandom to init the random number generator.
Fix to properly read the arguments if any options are given.
Fix to enable it to be built against glibc.
Change-Id: I9127a71232e39afa3054fe9f1612def9ae13d9d3
Ken Sumrall [Mon, 18 Jun 2012 14:34:07 +0000 (07:34 -0700)]
am
952a2aaa: am
2633ce5c: Add some tools for testing ext4 performance and resiliency.
* commit '
952a2aaa3780074390d5a13f11f0ef7ac264724a':
Add some tools for testing ext4 performance and resiliency.
Ken Sumrall [Mon, 18 Jun 2012 14:31:53 +0000 (07:31 -0700)]
am
2633ce5c: Add some tools for testing ext4 performance and resiliency.
* commit '
2633ce5ca5024d5565c9068c29ec39a8c3ed10e9':
Add some tools for testing ext4 performance and resiliency.
Ken Sumrall [Wed, 30 May 2012 23:44:40 +0000 (16:44 -0700)]
Add some tools for testing ext4 performance and resiliency.
rand_emmc_perf is a simple test to test random read/write performance
of emmc chips. android_emmc_perf_tests is a script that runs on
the host that uses rand_emmc_perf to test the emmc performance on
a device.
corrupt_gdt_free_blocks is used to corrupt a filesystem so the kernel
trips over it at runtime and panics, thus testing kernel's ability to
mark the filesystem as needing to be fixed.
set_ext4_err_bit sets the error bit in the superblock so e2fsck will
trigger a full check next boot.
corrupt_gdt_free_blocks and set_ext4_err_bit are only built for
userdebug and eng builds. rand_emmc_perf is marked optional, and
not included in any build by default.
Change-Id: I808174025d891f358ac54008371cb590e3c19f2f
Jamie Gennis [Tue, 12 Jun 2012 21:52:38 +0000 (14:52 -0700)]
am
a3a75d95: am
b9314021: atrace: enable running on user builds
* commit '
a3a75d956e502f924dc29f4f29c7d46f0f8e4e56':
atrace: enable running on user builds
Jamie Gennis [Tue, 12 Jun 2012 19:41:23 +0000 (12:41 -0700)]
am
b9314021: atrace: enable running on user builds
* commit '
b9314021ee1ccaa62eb115e8e0188f482a950f3b':
atrace: enable running on user builds
Jamie Gennis [Thu, 7 Jun 2012 23:27:03 +0000 (16:27 -0700)]
atrace: enable running on user builds
This change allows atrace to be run on a user build, where it is not run as
root. Some command line options still require root, and atrace will refuse to
run if those options are specified when run as non-root.
Bug:
6513400
Change-Id: I29984cb8a7c3ad80ba5fa6b031ed8ff81acabacf
Kenny Root [Thu, 31 May 2012 20:46:34 +0000 (13:46 -0700)]
am
400e9bc8: am
47aa1049: Merge "Fixes to make_ext4fs when compiled with HAVE_SELINUX."
* commit '
400e9bc8d3c449da234e70abe319bc2670c94298':
Fixes to make_ext4fs when compiled with HAVE_SELINUX.
Kenny Root [Thu, 31 May 2012 20:43:49 +0000 (13:43 -0700)]
am
47aa1049: Merge "Fixes to make_ext4fs when compiled with HAVE_SELINUX."
* commit '
47aa1049e80927420b59723806fab579997a7430':
Fixes to make_ext4fs when compiled with HAVE_SELINUX.
Kenny Root [Thu, 31 May 2012 20:07:52 +0000 (13:07 -0700)]
Merge "Fixes to make_ext4fs when compiled with HAVE_SELINUX."
Matt Finifter [Thu, 31 May 2012 17:47:47 +0000 (10:47 -0700)]
Fixes to make_ext4fs when compiled with HAVE_SELINUX.
Fix a segfault in contents.c.
Change-Id: I77c39b2cda5f3aa572b5ed8a4f2e5da78341eed6
Matt Finifter [Thu, 31 May 2012 17:47:47 +0000 (10:47 -0700)]
Fixes to make_ext4fs when compiled with HAVE_SELINUX.
Set HAVE_SELINUX flag for host compilation of make_ext4fs.
Fix a segfault in contents.c.
Change-Id: I77c39b2cda5f3aa572b5ed8a4f2e5da78341eed6
Jeff Brown [Wed, 23 May 2012 04:30:54 +0000 (21:30 -0700)]
am
83fdbb05: Add disk I/O tracing.
* commit '
83fdbb05c39b030ef1e5b3a7db79c617114c20f4':
Add disk I/O tracing.
Jeff Brown [Wed, 23 May 2012 01:58:46 +0000 (18:58 -0700)]
Add disk I/O tracing.
Bug:
6488845
Change-Id: I93acb726f35b114fb1ea7297da4456826f805b7b
JP Abgrall [Tue, 15 May 2012 02:33:19 +0000 (19:33 -0700)]
am
80cb1550: Ignore SIGPIPE is some of the tools used via dumpstate
* commit '
80cb15504324667c9934ff350afff48881613393':
Ignore SIGPIPE is some of the tools used via dumpstate
JP Abgrall [Fri, 11 May 2012 21:09:59 +0000 (14:09 -0700)]
Ignore SIGPIPE is some of the tools used via dumpstate
adb bugreport > b & sleep 5; kill $?
will show that a bunch of tools will SIGPIPE when trying to output data
which is normal.
We don't have a way on linux (bsd yes), to set NOSIGPIPE on the file desc
passed down via fork/exec.
Bug:
6447319
Change-Id: I1634a00a155fd8a3fd827aa4a77e94518534336c
Jamie Gennis [Wed, 9 May 2012 08:48:07 +0000 (01:48 -0700)]
am
585c219b: atrace: add support for tracing CPU idle events
* commit '
585c219b9b7c2e89b8db6707cacdaf29c362e7ba':
atrace: add support for tracing CPU idle events
Jamie Gennis [Tue, 8 May 2012 00:58:44 +0000 (17:58 -0700)]
atrace: add support for tracing CPU idle events
This change adds the -i command line flag to atrace to enable tracing CPU idle
kernel events.
Change-Id: I4a2c8619224c0f50c7fd7c61c7b24fa2211f656c
Colin Cross [Mon, 7 May 2012 06:19:33 +0000 (23:19 -0700)]
am
16052ec5: Merge "ext4_utils: Fix long symbolic links"
* commit '
16052ec56a0836db7de51d6ea4173c6b53f0a9b9':
ext4_utils: Fix long symbolic links
Colin Cross [Sun, 6 May 2012 23:36:50 +0000 (16:36 -0700)]
Merge "ext4_utils: Fix long symbolic links"
Jamie Gennis [Sun, 29 Apr 2012 02:06:49 +0000 (19:06 -0700)]
atrace: add support for zlib compression
This change adds the -z command line flag to atrace to enable support for
compressing the trace with zlib as it's printed to stdout.
Change-Id: I45301c63a4d1d388152244fec3c9e05e554598e8
Jamie Gennis [Tue, 10 Apr 2012 22:18:39 +0000 (15:18 -0700)]
Merge "atrace: make cpu freq governor tracing optional"
Jamie Gennis [Tue, 10 Apr 2012 00:33:45 +0000 (17:33 -0700)]
atrace: make cpu freq governor tracing optional
This change allows atrace to run on kernels that do not have CPU frequency
interactive governor tracing enabled in the kernel.
Change-Id: Ibfde751da7b6cc9a55794355093a37feb28f5e52
Kenny Root [Sun, 8 Apr 2012 18:23:01 +0000 (11:23 -0700)]
Fix SELinux building
A bad merge and some new features caused SELinux not to build on
top-of-tree master. Some changes the Makefile restore its ability to
build.
Change-Id: Id60b89538beff33f1d8b436b5b7854d3eaa00069
Eric Rowe [Thu, 5 Apr 2012 01:31:20 +0000 (18:31 -0700)]
Merge "First checkin of cpustats"
Eric Rowe [Mon, 26 Mar 2012 23:55:30 +0000 (16:55 -0700)]
First checkin of cpustats
This utility is similar to top but with two major differences. 1) It
removes the overhead of gathering process/thread stats. 2) It measures
the time spent in each frequency for each sample duration.
Bug:
6147843
Change-Id: Ie9073470f8cd1778fe902ea6383bef2311e91cf1
Nick Kralevich [Mon, 2 Apr 2012 20:29:35 +0000 (13:29 -0700)]
su: do uid check earlier.
Change-Id: Ied4894019d2b0021e7f727569ff85650d209e5da
Kenny Root [Sat, 31 Mar 2012 03:38:32 +0000 (20:38 -0700)]
resolved conflicts for merge of
8f9b41d9 to master
Change-Id: I9af02b9bba1176174540c849f905dece8ade54d8
Kenny Root [Fri, 30 Mar 2012 22:18:08 +0000 (15:18 -0700)]
Merge changes I4f6755fe,Ief9c44ee
* changes:
Extend make_ext4fs() interface to allow callers to pass selabel_handle.
Extend make_ext4fs to support setting SELinux security contexts in ext4 images.
Stephen Smalley [Thu, 9 Feb 2012 19:19:24 +0000 (14:19 -0500)]
Extend make_ext4fs() interface to allow callers to pass selabel_handle.
Extend make_ext4fs() to allow callers to pass an selabel_handle for
labeling files in the ext4 image. Previously, this was only done
via the _internal() function. This extends the library interface
so that it can be used by the recovery and updater code for labeling
files from OTA and update packages.
Change-Id: I4f6755fe7c65b69587276d17ef5b971ebec0161f
Stephen Smalley [Fri, 13 Jan 2012 14:00:56 +0000 (09:00 -0500)]
Extend make_ext4fs to support setting SELinux security contexts in ext4 images.
Extend make_ext4fs with support for looking up the right security context from
the file_contexts configuration and setting it in the generated image. This is
similar to the existing support for looking up the UID/GID/mode via
android_filesystem_config.h and setting it, but via configuration rather than
defined in a header.
Change-Id: Ief9c44eeaaca4a44100a384b063f40b185469be3
Kenny Root [Thu, 29 Mar 2012 21:43:22 +0000 (14:43 -0700)]
make_ext4fs: Allow custom filesystem configs
Before we used the "fs_config" function from
android_filesystem_config.h, but we want to use make_ext4fs with ASEC
containers which will not always be mounted in the same place.
Bug:
6258335
Change-Id: Icf62e3c46425f01434bf92a9823f8d542b0fa5b1
Colin Cross [Mon, 26 Mar 2012 22:25:59 +0000 (15:25 -0700)]
bugmailer: prevent building on pdk builds
bugmailer is in java, so it won't build on pdk builds. It should
probably be moved out of system/extras.
Change-Id: I9423b565cff2078290390fab22d6622a06959b05
Johan Rudholm [Mon, 6 Feb 2012 14:17:04 +0000 (15:17 +0100)]
ext4_utils: Fix long symbolic links
When the target of a symbolic link is over 60 characters, make_ext4fs
fails to create the link.
Instead of allocating n bytes, n blocks of 4096 bytes was reserved,
and the allocated data was never attached to the inode.
Change-Id: I63a2e76166a2afc30734265324d5c5265cfa59ff
Signed-off-by: Christian Bejram <christian.bejram@stericsson.com>
Amith Yamasani [Thu, 22 Mar 2012 22:12:05 +0000 (15:12 -0700)]
Merge "Pass extra parameter for user id."
Mike Lockwood [Wed, 21 Mar 2012 22:40:53 +0000 (15:40 -0700)]
Merge remote-tracking branch 'goog/ics-aah-exp'
Amith Yamasani [Tue, 20 Mar 2012 20:25:09 +0000 (13:25 -0700)]
Pass extra parameter for user id.
Change-Id: I2c2ed833946e18aeabbd7e0a7cb3e515a0d95d4e
Nick Kralevich [Wed, 14 Mar 2012 22:38:10 +0000 (15:38 -0700)]
Merge "perm_checker: fix permissions."
Nick Kralevich [Wed, 14 Mar 2012 22:34:32 +0000 (15:34 -0700)]
perm_checker: fix permissions.
/data/local permissions have changed. Adjust the config file.
Tighten up requirements for /data/local/tmp
Change-Id: I06ef9a97d6c7c0b360c53b82637a19207db4a28c
Dianne Hackborn [Wed, 14 Mar 2012 17:41:22 +0000 (10:41 -0700)]
Update to follow IActivityManager change.
Change-Id: I5ea3fcaffdaaae6bfeb0edd878fc952952012396
Siva Velusamy [Tue, 13 Mar 2012 01:40:32 +0000 (18:40 -0700)]
Merge "Fix # of arguments to startActivity"
Siva Velusamy [Tue, 13 Mar 2012 01:39:57 +0000 (18:39 -0700)]
Fix # of arguments to startActivity
Change-Id: I376864150349862e9dcb3b964aa316559c904a4a
Jamie Gennis [Tue, 6 Mar 2012 03:10:37 +0000 (19:10 -0800)]
atrace: add some more command line options
This change adds two command line optiosn:
-b for setting the trace buffer size
-f for enabling tracing of the CPU frequency
-l for enabling tracing of the CPU load
Change-Id: Id99851a4c4eba5cfed218f29081e072bbe492133
Jamie Gennis [Sun, 26 Feb 2012 23:50:35 +0000 (15:50 -0800)]
atrace: include the binary in debug builds
This change makes the atrace module tag 'debug' so that the binary is
included in all debug builds.
Change-Id: I1fdb87be0461daf686e52ded04b37b9a122edea3
Jamie Gennis [Thu, 23 Feb 2012 22:16:05 +0000 (14:16 -0800)]
Add the atrace utility.
This change adds a new system binary to help with capturing and dumping
kernel traces.
Change-Id: If2fc074480f822588a4c171312dc4c04fd305356
Anatol Pomazau [Wed, 11 Jan 2012 23:12:27 +0000 (15:12 -0800)]
Pass file descriptor instead of file name
Passing a file descriptor to make_ext4fs_internal() is more flexible.
We can use tmpfile() to create a temporary file.
tmpfile() is better than other solutions because it unlinks the file
right after creating it, so closing fd effectively removes temp file.
Thus we don't have to worry about large temp files accidently left
on the filesystem in case of the program crash.
Change-Id: Iba3758a0e13a898920d30d7fa5da696c22daa2b7
Scott Anderson [Fri, 17 Feb 2012 16:56:05 +0000 (08:56 -0800)]
Merge "img2simg: Drop using endian.h"
Scott Anderson [Thu, 16 Feb 2012 23:50:07 +0000 (15:50 -0800)]
img2simg: Drop using endian.h
All our hosts are currently little-endian, so drop using endian.h
in favor of being able to build and run on all hosts.
Change-Id: Iea86cf9387940448c9c6d356c7e16acc871d5467
Signed-off-by: Scott Anderson <saa@android.com>
Scott Anderson [Wed, 15 Feb 2012 23:44:39 +0000 (15:44 -0800)]
ext4_utils: simg2img: Add LOCAL_MODULE_TAGS in Android.mk
1) simg2img was being installed on the device. For the
BUILD_EXECUTABLE add an "optional" tag (instead of the implied
default of "user") so this does not happen.
2) In preparation of removing simg2img from user_tags.mk, add a
"debug" tag to the BUILD_HOST_EXECUTABLE so it will be put in the
host bin subdirectory for eng and userdebug builds.
Change-Id: Ib8407e366b8154772e3b78cabb09655851ce77de
Signed-off-by: Scott Anderson <saa@android.com>
Raphael Moll [Sat, 4 Feb 2012 07:02:33 +0000 (23:02 -0800)]
Adapt ext4_utils for windows.
This is not a full port of ext4_utils for windows.
Instead it merely enables use to use the library
for the 'create an empty fs image' functionality
as used by 'fastboot format'.
Change-Id: Ia1ffacd64e4233c4fbb369c4ac5927ccd72ac526
Scott Anderson [Thu, 16 Feb 2012 16:55:48 +0000 (08:55 -0800)]
Merge "Broke the build. Revert "ext4_utils: Fix LOCAL_MODULE_TAGS on img2simg and simg2img""
Scott Anderson [Thu, 16 Feb 2012 16:55:37 +0000 (08:55 -0800)]
Broke the build.
Revert "ext4_utils: Fix LOCAL_MODULE_TAGS on img2simg and simg2img"
This reverts commit
eec2bb9fda7772d8927603a29ca0880b8b10a8ed
Scott Anderson [Thu, 16 Feb 2012 16:39:43 +0000 (08:39 -0800)]
Merge "ext4_utils: Fix LOCAL_MODULE_TAGS on img2simg and simg2img"
Scott Anderson [Wed, 15 Feb 2012 23:44:39 +0000 (15:44 -0800)]
ext4_utils: Fix LOCAL_MODULE_TAGS on img2simg and simg2img
There were a few problems with the LOCAL_MODULE_TAGS here:
1) simg2img was being installed on the device. Add an "optional"
tag for the BUILD_EXECUTABLE from the implied default of user so
this does not happen.
2) In preparation of removing simg2img from user_tags.mk, add a
"debug" tag to the BUILD_HOST_EXECUTABLE so it will be put in the
host bin subdirectory for eng and userdebug builds.
3) img2simg was not being put into the host bin subdirectory by
default. By changing the TAG from optional to debug, it is now
put there for eng and userdebug builds.
Change-Id: I3182781e78ffde2208644660d33b7eb068147561
Signed-off-by: Scott Anderson <saa@android.com>
Scott Anderson [Thu, 9 Feb 2012 01:36:28 +0000 (17:36 -0800)]
Add simg_dump.py python script to dump sparse image information
Change-Id: I97c1aec040b46c36bde82f7726a6d35b28ac6733
Signed-off-by: Scott Anderson <saa@android.com>
Scott Anderson [Wed, 15 Feb 2012 00:39:53 +0000 (16:39 -0800)]
Merge "Add img2simg tool that splits a large image into <n> sparse files"
Irfan Sheriff [Tue, 14 Feb 2012 23:38:24 +0000 (15:38 -0800)]
Merge "Fix supplicant start"
Scott Anderson [Tue, 7 Feb 2012 18:29:20 +0000 (10:29 -0800)]
Add img2simg tool that splits a large image into <n> sparse files
img2simg can take a large binary and chop it into multiple sparse
images. Each sparse image that is output has two chunks: a Don't
Care chunk to offset to where the data should be placed, and a
Raw chunk that actually contains the data to be placed there.
So, for example, if you have a 12 GB random file that you want to
place into userdata for testing e-MMC, you can run img2simg on it
to chop it into multiple sparse files and then "fastboot flash
userdata" on each of the sparse files.
Usage: img2simg [OPTIONS] <raw_image_file>
The <raw_image_file> will be split into as many sparse
files as needed. Each sparse file will contain a single
DONT CARE chunk to offset to the correct block and then
a single RAW chunk containing a portion of the data from
the raw image file. The sparse files will be named by
appending a number to the name of the raw image file.
OPTIONS (Defaults are enclosed by square brackets):
-s SUFFIX Format appended number with SUFFIX [%03d]
-B SIZE Use a block size of SIZE [4K]
-C SIZE Use a chunk size of SIZE [64M]
SIZE is a decimal integer that may optionally be
followed by a suffix that specifies a multiplier for
the integer:
c 1 byte (the default when omitted)
w 2 bytes
b 512 bytes
kB 1000 bytes
K 1024 bytes
MB 1000*1000 bytes
M 1024*1024 bytes
GB 1000*1000*1000 bytes
G 1024*1024*1024 bytes
Change-Id: I5593be1c195e04d83c99454e996763b841951dd7
Signed-off-by: Scott Anderson <saa@android.com>
Scott Anderson [Wed, 8 Feb 2012 20:47:24 +0000 (12:47 -0800)]
Merge "Revert "Add img2simg tool that splits a large image into <n> sparse files""
Scott Anderson [Wed, 8 Feb 2012 20:00:49 +0000 (12:00 -0800)]
Revert "Add img2simg tool that splits a large image into <n> sparse files"
This reverts commit
dba7d246a20d14663c2e90b2fa9051894e3c7e1b
Broke the build:
system/extras/ext4_utils/img2simg.c:23:20: error: endian.h: No such file or directory
system/extras/ext4_utils/img2simg.c: In function ‘main’:
system/extras/ext4_utils/img2simg.c:262: warning: implicit declaration of function ‘htole32’
system/extras/ext4_utils/img2simg.c:263: warning: implicit declaration of function ‘htole16’
make: * [out/host/darwin-x86/obj/EXECUTABLES/img2simg_intermediates/img2simg.o] Error 1
Anatol Pomazau [Wed, 8 Feb 2012 17:23:58 +0000 (09:23 -0800)]
Merge "munmap() should be called with the same length as mmap()"
Scott Anderson [Tue, 7 Feb 2012 18:29:20 +0000 (10:29 -0800)]
Add img2simg tool that splits a large image into <n> sparse files
img2simg can take a large binary and chop it into multiple sparse
images. Each sparse image that is output has two chunks: a Don't
Care chunk to offset to where the data should be placed, and a
Raw chunk that actually contains the data to be placed there.
So, for example, if you have a 12 GB random file that you want to
place into userdata for testing e-MMC, you can run img2simg on it
to chop it into multiple sparse files and then "fastboot flash
userdata" on each of the sparse files.
Usage: img2simg [OPTIONS] <raw_image_file>
The <raw_image_file> will be split into as many sparse
files as needed. Each sparse file will contain a single
DONT CARE chunk to offset to the correct block and then
a single RAW chunk containing a portion of the data from
the raw image file. The sparse files will be named by
appending a number to the name of the raw image file.
OPTIONS (Defaults are enclosed by square brackets):
-s SUFFIX Format appended number with SUFFIX [%03d]
-B SIZE Use a block size of SIZE [4K]
-C SIZE Use a chunk size of SIZE [64M]
SIZE is a decimal integer that may optionally be
followed by a suffix that specifies a multiplier for
the integer:
c 1 byte (the default when omitted)
w 2 bytes
b 512 bytes
kB 1000 bytes
K 1024 bytes
MB 1000*1000 bytes
M 1024*1024 bytes
GB 1000*1000*1000 bytes
G 1024*1024*1024 bytes
Change-Id: I6d3ee9deef21dcbc6bc95e2c5b822154705b4e35
Signed-off-by: Scott Anderson <saa@android.com>
Anatol Pomazau [Wed, 8 Feb 2012 00:12:44 +0000 (16:12 -0800)]
munmap() should be called with the same length as mmap()
Change-Id: Ia4fc57d5111fac78f6647af279dd68808f3d6856
Anatol Pomazau [Tue, 7 Feb 2012 17:49:57 +0000 (09:49 -0800)]
Fix indentation
Change-Id: I3c823ace4f0ab6952852b99de366cd33592df675
Anatol Pomazau [Tue, 7 Feb 2012 01:42:27 +0000 (17:42 -0800)]
Remove trailing whitespaces
Change-Id: Ia0537cefe4dc121d5d8db7479154853200790605
Anatol Pomazau [Tue, 7 Feb 2012 01:13:51 +0000 (17:13 -0800)]
Replace 8-spaces indentation with tab
8-space indentation looks completely alien here.
One should use either 4-spaces indentation or tab symbol.
Tab is more popular in system projects so use it here as well.
Change-Id: Ibfdb4b2a49996453731fc1e8bbefa158bde49e28
Anatol Pomazau [Sat, 4 Feb 2012 02:20:07 +0000 (18:20 -0800)]
Revert "Pass file descriptor instead of file name"
This reverts commit
89ddaab97e9214cf331baffee2de4595ad14dc79
Anatol Pomazau [Wed, 11 Jan 2012 23:12:27 +0000 (15:12 -0800)]
Pass file descriptor instead of file name
Passing a file descriptor to make_ext4fs_internal() is more flexible.
We can use tmpfile() to create a temporary file.
tmpfile() is better than other solutions because it unlinks the file
right after creating it, so closing fd effectively removes temp file.
Thus we don't have to worry about large temp files accidently left
on the filesystem in case of the program crash.
Change-Id: I44146704572c314e1d6cfca7ce918efa7fb92a7a
Anatol Pomazau [Fri, 3 Feb 2012 18:57:40 +0000 (10:57 -0800)]
Revert "Pass file descriptor instead of file name"
This reverts commit
93eb1dc9e68d2e9dea94f56d8bce478c1a52b354
Anatol Pomazau [Wed, 11 Jan 2012 23:12:27 +0000 (15:12 -0800)]
Pass file descriptor instead of file name
Passing a file descriptor to make_ext4fs_internal() is more flexible.
We can use tmpfile() to create a temporary file.
tmpfile() is better than other solutions because it unlinks the file
right after creating it, so closing fd effectively removes temp file.
Thus we don't have to worry about large temp files accidently left
on the filesystem in case of the program crash.
Change-Id: I44109e98854c314e1d6cfca7ce918efa7fb92a7a
Anatol Pomazau [Wed, 11 Jan 2012 23:12:27 +0000 (15:12 -0800)]
Pass file descriptor instead of file name
Passing a file descriptor to make_ext4fs_internal() is more flexible.
We can use tmpfile() to create a temporary file.
tmpfile() is better than other solutions because it unlinks the file
right after creating it, so closing fd effectively removes temp file.
Thus we don't have to worry about large temp files accidently left
on the filesystem in case of the program crash.
Change-Id: I44109e98854c314e1d6cfca7ce918efa7fb92a7a
Mark Gonzales [Fri, 27 May 2011 22:05:49 +0000 (15:05 -0700)]
Avoid dereferencing NULL pointer with memcmp in the test code.
Signed-Off-By: Bhanu Chetlapalli <bhanu@mips.com>
Selim Gurun [Wed, 25 Jan 2012 17:30:27 +0000 (09:30 -0800)]
Merge "Fix various issues in procrank."