OSDN Git Service
Colin Cross [Tue, 27 Nov 2012 00:40:47 +0000 (16:40 -0800)]
Merge "make_ext4fs: fix sepolicy lookup for lost+found"
Colin Cross [Tue, 27 Nov 2012 00:32:16 +0000 (16:32 -0800)]
make_ext4fs: fix sepolicy lookup for lost+found
selabel_lookup needs the full path including mountpoint.
Change-Id: Idc0641683a4e4528d94e54be1897315bf5fcdb0d
Colin Cross [Mon, 26 Nov 2012 23:28:55 +0000 (15:28 -0800)]
Merge "make_ext4fs: insert lost+found directory into filled filesystems"
Colin Cross [Wed, 21 Nov 2012 03:41:42 +0000 (19:41 -0800)]
make_ext4fs: insert lost+found directory into filled filesystems
Insert a lost+found directory if necessary when creating a filesystem
based on a directory structure. This will make the resulting image
clean when tested with e2fsck, allowing e2fsck to be run on all images
as a validity test.
Change-Id: I81d0b6b4a802713270d3469e5a3bc555b680ec7e
Colin Cross [Mon, 26 Nov 2012 21:01:12 +0000 (13:01 -0800)]
Merge "make_ext4fs: fix dentry padding when dentry size is 4088 or 4092"
Colin Cross [Tue, 20 Nov 2012 22:07:39 +0000 (14:07 -0800)]
make_ext4fs: fix dentry padding when dentry size is 4088 or 4092
When the total dentry size is N * 4096 - 4 or N * 4096 - 8, there is
not enough room in the block to insert an extra padding dentry.
Instead, switch to always padding the previous dentry out to the end
of the block, which matches what the kernel does when creating new
directory entries.
Also fix dentry_size to return the size of all the dentries
without the padding, the len + 8 padding is incorrect, and the
DIV_ROUND_UP will round up to the correct number of blocks.
Change-Id: If11f90e4ee172c135a0eae2a50b8be213e2dd0dc
Ying Wang [Mon, 19 Nov 2012 23:43:46 +0000 (15:43 -0800)]
Merge "Make SIZE a mandatory parameter."
Ying Wang [Mon, 19 Nov 2012 18:42:55 +0000 (10:42 -0800)]
Make SIZE a mandatory parameter.
Commit
b4eca4b24af9c80ebb2a7fa2ba539a48096b7576 introduced a new
optional parameter FILE_CONTEXTS.
But the script can accept only 1 optional parameter as the last one.
Otherwise FILE_CONTEXTS may be taken as SIZE.
Change-Id: I1a701e191769f3936cfe6557ea3a20e1691dc859
Irfan Sheriff [Thu, 8 Nov 2012 14:14:30 +0000 (06:14 -0800)]
am
c3dc8929: Use updated stop supplicant API
* commit '
c3dc8929286e3f3b46d4d014c5b7aeecb416f4e0':
Use updated stop supplicant API
Irfan Sheriff [Mon, 5 Nov 2012 15:44:10 +0000 (07:44 -0800)]
Use updated stop supplicant API
Bug:
7227463
Change-Id: Ifecb256fed68c2046b77a5ce7a8c9f25c8e3fe62
The Android Open Source Project [Tue, 6 Nov 2012 20:30:11 +0000 (12:30 -0800)]
am
07c8a6d2: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
07c8a6d238ddf855d5d6b4421d2527c580a374b6':
The Android Open Source Project [Tue, 6 Nov 2012 20:19:21 +0000 (12:19 -0800)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I2a69ed763c7b5f29c060d52b41897abd27bc740d
The Android Open Source Project [Wed, 31 Oct 2012 16:19:01 +0000 (09:19 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I687546ca2bdfc152e141cda550975329f2bec732
The Android Automerger [Fri, 19 Oct 2012 22:46:35 +0000 (15:46 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Erik Gilling [Fri, 19 Oct 2012 19:18:45 +0000 (12:18 -0700)]
am
3f91534e: atrace: add sync trace support
* commit '
3f91534edf98d2a385c8fa29839cdd15a69f21d3':
atrace: add sync trace support
Kenny Root [Wed, 17 Oct 2012 19:58:58 +0000 (12:58 -0700)]
am
7176b213: Merge "Add automatic file_contexts handle to make_ext4fs."
* commit '
7176b213480e87bc303073ccc553fdc824198355':
Add automatic file_contexts handle to make_ext4fs.
Erik Gilling [Wed, 17 Oct 2012 19:16:01 +0000 (12:16 -0700)]
atrace: add sync trace support
Change-Id: I2cd2f1a1e51f6e3d1ebbde4d5442be68a218b33d
Kenny Root [Wed, 17 Oct 2012 19:12:50 +0000 (12:12 -0700)]
Merge "Add automatic file_contexts handle to make_ext4fs."
rpcraig [Fri, 21 Sep 2012 15:46:20 +0000 (11:46 -0400)]
Add automatic file_contexts handle to make_ext4fs.
Normal make_ext4 use requires a -S option to
pass a correct file_contexts path for labeling.
This becomes impractical under certain conditions
when used on a target device. For instance, with
the creation of ext4 containers for asec images.
This patch will create a proper sehandle only
if the -S option is not used and only when
run on a target device.
Change-Id: I9bdc8659aae7037ccebbf4464500b79b4b2f56af
Kenny Root [Wed, 17 Oct 2012 17:08:04 +0000 (10:08 -0700)]
am
50d42703: Merge "Remove HAVE_SELINUX guards"
* commit '
50d42703936b87ffdd5b9ec135d7e0e4af8aa31f':
Remove HAVE_SELINUX guards
Kenny Root [Wed, 17 Oct 2012 16:35:50 +0000 (09:35 -0700)]
Merge "Remove HAVE_SELINUX guards"
Kenny Root [Wed, 17 Oct 2012 06:41:24 +0000 (23:41 -0700)]
Remove HAVE_SELINUX guards
Change-Id: I4808ec7455acf0f60b2ceab6ce447fd5d7eb7100
Kenny Root [Wed, 17 Oct 2012 00:53:00 +0000 (17:53 -0700)]
am
f310f6c5: Merge "Remove HAVE_SELINUX guards"
* commit '
f310f6c5725f9f9985ee30e744a2b65fed9d572e':
Remove HAVE_SELINUX guards
Kenny Root [Tue, 16 Oct 2012 23:33:47 +0000 (16:33 -0700)]
Merge "Remove HAVE_SELINUX guards"
Kenny Root [Wed, 10 Oct 2012 18:13:13 +0000 (11:13 -0700)]
Remove HAVE_SELINUX guards
Change-Id: Ieda8d8c331e9fccc7dcda228852d408ffc94e98c
The Android Open Source Project [Mon, 15 Oct 2012 14:40:50 +0000 (07:40 -0700)]
Reconcile with jb-mr1-factory-release - do not merge
Change-Id: I5edb3257bf8f06c3274051af0c4da369d8643ca0
The Android Automerger [Fri, 12 Oct 2012 17:27:38 +0000 (10:27 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
The Android Open Source Project [Fri, 12 Oct 2012 14:32:31 +0000 (07:32 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ia0c83f8eaad8974240651bfa206f0212eb72983d
The Android Automerger [Thu, 11 Oct 2012 23:27:11 +0000 (16:27 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Glenn Kasten [Thu, 11 Oct 2012 15:39:57 +0000 (08:39 -0700)]
am
a09aa3ea: Add -n and -S options for \'nohup\', offline traces
* commit '
a09aa3eaad6ed5432ee13c764c67e67f7f43cac9':
Add -n and -S options for 'nohup', offline traces
Kenny Root [Wed, 10 Oct 2012 21:28:35 +0000 (14:28 -0700)]
am
b67683f6: Merge "make_ext4fs: add const qualifier to mountpoint"
* commit '
b67683f6c0c75536c991cac797b0c1dbcf9168e0':
make_ext4fs: add const qualifier to mountpoint
Kenny Root [Wed, 10 Oct 2012 19:21:20 +0000 (12:21 -0700)]
Merge "make_ext4fs: add const qualifier to mountpoint"
Kenny Root [Wed, 10 Oct 2012 18:16:05 +0000 (11:16 -0700)]
make_ext4fs: add const qualifier to mountpoint
Silence compiler warning and enforce some const correctness by adding
the const qualifier to the mountpoint argument in make_ext4fs_internal
Change-Id: I0ce3c04fc36423e43b89e8e8d24735858a55e537
The Android Open Source Project [Tue, 9 Oct 2012 14:31:08 +0000 (07:31 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I598988c7b0ec650064de569c6120b27c724c478e
Glenn Kasten [Tue, 5 Jun 2012 23:42:22 +0000 (16:42 -0700)]
Add -n and -S options for 'nohup', offline traces
Change-Id: Ieef12b36b8519ff689ab5a81447b1b9bf4806171
The Android Automerger [Sun, 7 Oct 2012 23:05:40 +0000 (16:05 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jamie Gennis [Sun, 7 Oct 2012 17:34:57 +0000 (10:34 -0700)]
am
24505a58: atrace: make clock & bus bw tracing optional
* commit '
24505a5826d7c5cf89f3da85058befd671a73444':
atrace: make clock & bus bw tracing optional
Jamie Gennis [Fri, 5 Oct 2012 23:04:12 +0000 (16:04 -0700)]
atrace: make clock & bus bw tracing optional
This change makes enabling clock tracing and bus bandwidth tracing depend on
whether the device's kernel supports these features. If it's not supported it
will be skipped.
Change-Id: I51d57299693635b0ecebb75de5dccd5b62d47be3
The Android Open Source Project [Fri, 5 Oct 2012 15:18:42 +0000 (08:18 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I6ad917dd332cd6677d124b08197e1686e66e0fca
The Android Automerger [Fri, 5 Oct 2012 14:00:34 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Erik Gilling [Thu, 4 Oct 2012 23:15:26 +0000 (16:15 -0700)]
am
a404a7e9: atrace: add clock rate and bus utilization
* commit '
a404a7e9bb05f4c1b0c9312d10a4c96c6cbdfcc9':
atrace: add clock rate and bus utilization
Erik Gilling [Fri, 21 Sep 2012 00:55:10 +0000 (17:55 -0700)]
atrace: add clock rate and bus utilization
Change-Id: I4e1764b51225436fc2b3d61454ee822f511a1a7d
The Android Open Source Project [Tue, 2 Oct 2012 16:21:03 +0000 (09:21 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Iea091cf0ec873075e14c7a17ed185e9cbde68d1c
The Android Automerger [Sun, 30 Sep 2012 14:00:30 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Dianne Hackborn [Fri, 28 Sep 2012 22:56:53 +0000 (15:56 -0700)]
am
fa98203c: More Issue #
7211769: Crash dialog from background user has non-working "report"
* commit '
fa98203c441d00d374349ce35c0c7ba2f38cc53a':
More Issue #
7211769: Crash dialog from background user has non-working "report"
Dianne Hackborn [Fri, 28 Sep 2012 22:40:29 +0000 (15:40 -0700)]
More Issue #
7211769: Crash dialog from background user has non-working "report"
Bug report needs to be launched for the current user.
Change-Id: I2b8f812ede43fc36c76deab544bacf88dba8fefd
The Android Open Source Project [Thu, 20 Sep 2012 17:37:31 +0000 (10:37 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ic61db28563308c2da38d7b2c2c12e0486914ea17
Jeff Sharkey [Wed, 12 Sep 2012 20:15:50 +0000 (13:15 -0700)]
Build bugreport paths for emulated storage.
Bug:
7152673
Change-Id: Iae7b298721d2b6690ce9b57245400702fb5d0c4c
Jeff Sharkey [Wed, 12 Sep 2012 17:58:00 +0000 (10:58 -0700)]
Always read bugreports from EXTERNAL_STORAGE.
Bug:
7152673
Change-Id: Ibff4503ef21816bfe936eeba89183d1647c85043
Jeff Sharkey [Wed, 12 Sep 2012 20:31:14 +0000 (13:31 -0700)]
am
b568de03: Build bugreport paths for emulated storage.
* commit '
b568de03db20f124a458d914eed33cee4630bb81':
Build bugreport paths for emulated storage.
Jeff Sharkey [Wed, 12 Sep 2012 20:15:50 +0000 (13:15 -0700)]
Build bugreport paths for emulated storage.
Bug:
7152673
Change-Id: Iae7b298721d2b6690ce9b57245400702fb5d0c4c
Jeff Sharkey [Wed, 12 Sep 2012 18:01:28 +0000 (11:01 -0700)]
am
cf4e11b4: Always read bugreports from EXTERNAL_STORAGE.
* commit '
cf4e11b4f8ba78de68a06b0ad463397d488df522':
Always read bugreports from EXTERNAL_STORAGE.
Jeff Sharkey [Wed, 12 Sep 2012 17:58:00 +0000 (10:58 -0700)]
Always read bugreports from EXTERNAL_STORAGE.
Bug:
7152673
Change-Id: Ibff4503ef21816bfe936eeba89183d1647c85043
The Android Open Source Project [Thu, 6 Sep 2012 14:55:21 +0000 (07:55 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ibb666e518d3d41ce85b3276a702a28d191cdba92
The Android Automerger [Wed, 5 Sep 2012 13:34:51 +0000 (06:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Guang Zhu [Tue, 4 Sep 2012 21:10:52 +0000 (14:10 -0700)]
am
818b58c3: Guard against NPE in SendBug
* commit '
818b58c3cc3d9f99d65bc9e4e7ff5b80021079ec':
Guard against NPE in SendBug
Guang Zhu [Tue, 4 Sep 2012 20:49:46 +0000 (13:49 -0700)]
Guard against NPE in SendBug
Add some null checks in case that SendBug is invoked while system
server is in fact not running, e.g. during a runtime restart. So
that we don't hit NPE in SendBug, looking suspiciously like the
cause rather than a consequence of the real issue.
Bug:
7097125
Change-Id: I82676ab936fe19a781c32f949e6e429eb4045d63
The Android Open Source Project [Sat, 25 Aug 2012 14:18:16 +0000 (07:18 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ic5f4d5010eedb666a8881982067b136cdc220fa7
Guang Zhu [Thu, 23 Aug 2012 23:09:04 +0000 (16:09 -0700)]
Don't use intent chooser
Since it forces user to make selection, not offering an option to
remember the choice. Remove the new task flag, also adds an
explicit default category
Change-Id: I3834a8fa27782d14989e510c0756d36aaeeb2bab
Guang Zhu [Thu, 23 Aug 2012 23:13:05 +0000 (16:13 -0700)]
am
46899d1b: Don\'t use intent chooser
* commit '
46899d1b5d606e9349a40079b60034e3cf6eaafb':
Don't use intent chooser
Guang Zhu [Thu, 23 Aug 2012 23:09:04 +0000 (16:09 -0700)]
Don't use intent chooser
Since it forces user to make selection, not offering an option to
remember the choice. Remove the new task flag, also adds an
explicit default category
Change-Id: I3834a8fa27782d14989e510c0756d36aaeeb2bab
The Android Automerger [Thu, 23 Aug 2012 13:34:31 +0000 (06:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Ken Sumrall [Wed, 22 Aug 2012 23:58:17 +0000 (16:58 -0700)]
am
62716d52: Merge "Update emmc perf test tool" into jb-mr1-dev
* commit '
62716d5212c9f993a85654641b534f008e487bd9':
Update emmc perf test tool
Ken Sumrall [Wed, 22 Aug 2012 23:56:50 +0000 (16:56 -0700)]
Merge "Update emmc perf test tool" into jb-mr1-dev
Ken Sumrall [Wed, 22 Aug 2012 23:53:03 +0000 (16:53 -0700)]
Update emmc perf test tool
Drop caches before read tests.
Fix random read tests to read area big enough to prevent
the block cache from filling with the data being read.
Test with the read-ahead set to 4K, and at the default value.
Change-Id: Ifffa07fe4c89b6e103ce4fd71d0fa9881fed0dc7
The Android Open Source Project [Wed, 22 Aug 2012 22:36:47 +0000 (15:36 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I1bfc1867c44e5793876b1bd237b134cc8357e25a
The Android Automerger [Wed, 22 Aug 2012 13:34:37 +0000 (06:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Guang Zhu [Wed, 22 Aug 2012 03:26:29 +0000 (20:26 -0700)]
am
c8698cb9: Explicitly use an intent chooser for sending bugreport
* commit '
c8698cb92ef83e96b3c7776be9b47d174095bc15':
Explicitly use an intent chooser for sending bugreport
The Android Open Source Project [Tue, 21 Aug 2012 23:07:43 +0000 (16:07 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I8313a3f0bfe67f7d4c044d95edd9dcdc5672a37a
The Android Automerger [Mon, 20 Aug 2012 13:36:06 +0000 (06:36 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Guang Zhu [Sat, 18 Aug 2012 01:14:55 +0000 (18:14 -0700)]
Explicitly use an intent chooser for sending bugreport
This enables:
1. an explicit title for intent chooser, so that the user is
aware that chosen action is for sending out bugreport
2. the original intent has new task flag that causes
ResolveActivity to finish() when stop()ped. This means that
if intent is fired when screen is off (common scenario now
because bugreport takes a long time), the chooser will not be
shown
Bug:
6864596
Change-Id: I6cce2d1390c8ac24b15d26e9ba80a845222a1c18
The Android Automerger [Fri, 17 Aug 2012 21:55:49 +0000 (14:55 -0700)]
Revert "sendbug improvements on email address handling"
This reverts commit
9ebc639a313d143ade1293cb5932b446d5e623d5.
Joe Onorato [Fri, 17 Aug 2012 07:19:08 +0000 (00:19 -0700)]
am
781c3404: am
7793c09e: Merge changes I4e94b8b9,Iae48d489
* commit '
781c3404311c081a4f41f15628851aeede0172d6':
Support for multiple modules with the same name is going away.
Support for multiple modules with the same name is going away.
Joe Onorato [Fri, 17 Aug 2012 07:16:44 +0000 (00:16 -0700)]
am
7793c09e: Merge changes I4e94b8b9,Iae48d489
* commit '
7793c09ec42bf1a01a5f45f0e723f9a36fcfd9d7':
Support for multiple modules with the same name is going away.
Support for multiple modules with the same name is going away.
Joe Onorato [Fri, 17 Aug 2012 06:38:01 +0000 (23:38 -0700)]
Merge changes I4e94b8b9,Iae48d489
* changes:
Support for multiple modules with the same name is going away.
Support for multiple modules with the same name is going away.
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
Joe Onorato [Tue, 24 Jul 2012 02:15:37 +0000 (19:15 -0700)]
Support for multiple modules with the same name is going away.
Change-Id: I4e94b8b9cc7c88e07e8a09abc26a3e7d495ac5be
Joe Onorato [Sat, 21 Jul 2012 23:31:23 +0000 (16:31 -0700)]
Support for multiple modules with the same name is going away.
Change-Id: Iae48d4890aa7266ca7b57b3b9a8712d2d33d4909
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