OSDN Git Service
Ben Cheng [Wed, 16 Jan 2013 00:21:34 +0000 (16:21 -0800)]
Add a static variant for micro_bench.
So that it will be easier to test target-dependent bionic implementations
across devices.
Change-Id: Ie74dc37d5632b1a270f0d2e9013d504a810640e2
JP Abgrall [Fri, 11 Jan 2013 01:04:42 +0000 (17:04 -0800)]
su: support fine grained setting of gid and groups
To allow some tests to quickly check if some group membership handling
are correctly done, the tests need to run as a proc belonging to multiple
groups.
su would normally only allow setting uid=gid=something.
This changes adds setting the gid separately from the uid and setting the
groups:
su [uid[,gid[,group1]...]] [cmd]]
E.g.
su
su shell ls /data
su 1000,shell,net_bw_acct,net_bw_stats id
will return
uid=1000(system) gid=2000(shell) groups=3006(net_bw_stats),3007(net_bw_acct)
Change-Id: I713454bf14c3bc3ece93aec3729bda102542d1b1
Colin Cross [Fri, 28 Dec 2012 17:47:49 +0000 (09:47 -0800)]
am
7fb52e56: am
8c5e84dd: Merge "ext4_utils: fix windows build by avoiding asprintf"
* commit '
7fb52e56a67d42291fd3b9e72d18e581ff4ab080':
ext4_utils: fix windows build by avoiding asprintf
Colin Cross [Fri, 28 Dec 2012 17:46:59 +0000 (09:46 -0800)]
am
60a6ff79: am
c3b25b1b: Merge "ext4_utils: fix segfault on error opening output file"
* commit '
60a6ff79478f273b4f7eafbba6fc74eab0563f03':
ext4_utils: fix segfault on error opening output file
Colin Cross [Fri, 28 Dec 2012 17:46:59 +0000 (09:46 -0800)]
am
7dc17025: am
1d1a9011: Merge "ext4_utils: canonicalize slashes in paths"
* commit '
7dc1702586a5a4b20255b49b81e09cf926f8cd3b':
ext4_utils: canonicalize slashes in paths
Colin Cross [Fri, 21 Dec 2012 22:44:24 +0000 (14:44 -0800)]
am
8c5e84dd: Merge "ext4_utils: fix windows build by avoiding asprintf"
* commit '
8c5e84dd6b934d3efa8a16a1e4bddd5720172d05':
ext4_utils: fix windows build by avoiding asprintf
Colin Cross [Fri, 21 Dec 2012 21:40:58 +0000 (13:40 -0800)]
Merge "ext4_utils: fix windows build by avoiding asprintf"
Colin Cross [Fri, 21 Dec 2012 19:17:58 +0000 (11:17 -0800)]
ext4_utils: fix windows build by avoiding asprintf
asprintf is not available on windows. Since it is only being used outside
operations.
Change-Id: I79c3a3934f6de7a3cd3f17db5ae7731e9a68387c
Colin Cross [Fri, 21 Dec 2012 18:11:37 +0000 (10:11 -0800)]
am
c3b25b1b: Merge "ext4_utils: fix segfault on error opening output file"
* commit '
c3b25b1b83e7042ce2e223b689efdee0d72f6ad1':
ext4_utils: fix segfault on error opening output file
Colin Cross [Fri, 21 Dec 2012 18:11:36 +0000 (10:11 -0800)]
am
1d1a9011: Merge "ext4_utils: canonicalize slashes in paths"
* commit '
1d1a9011f03b5bebbda14768dd3672f1371ff7fb':
ext4_utils: canonicalize slashes in paths
Colin Cross [Thu, 20 Dec 2012 22:41:23 +0000 (14:41 -0800)]
Merge "ext4_utils: fix segfault on error opening output file"
Colin Cross [Thu, 20 Dec 2012 22:41:13 +0000 (14:41 -0800)]
Merge "ext4_utils: canonicalize slashes in paths"
Colin Cross [Thu, 20 Dec 2012 20:24:52 +0000 (12:24 -0800)]
ext4_utils: fix segfault on error opening output file
error_errno uses longjmp, but the jump target has not been set up
in make_ext4fs_main.c. Use perror instead.
Change-Id: Ic86eeb8af2315d1847d0a6d667e0b4e25eb9bdda
Colin Cross [Thu, 20 Dec 2012 09:00:33 +0000 (01:00 -0800)]
ext4_utils: canonicalize slashes in paths
Simplify handling of slashes between directories in paths by
forcing them to have leading and trailing slashes as appropriate
when passed in to make_ext4fs, and then keeping all directory
paths with a trailing slash.
As a side effect, using "/" as the mountpoint is now supported.
Change-Id: I73fe709c26003a20b0bdf6504db16cc9e39edf9b
Colin Cross [Wed, 19 Dec 2012 07:09:53 +0000 (23:09 -0800)]
am
c9c4c77f: resolved conflicts for merge of
917e120f to jb-mr1-dev-plus-aosp
* commit '
c9c4c77f368938af19270da5ce24d0b8a94ece77':
make_ext4fs: fix sepolicy lookup for lost+found
Colin Cross [Wed, 19 Dec 2012 06:50:50 +0000 (22:50 -0800)]
resolved conflicts for merge of
917e120f to jb-mr1-dev-plus-aosp
Change-Id: I5f3176d4f4859e7cf70899173f28944fc3a678b4
Colin Cross [Wed, 19 Dec 2012 00:16:38 +0000 (16:16 -0800)]
am
828b2ca0: resolved conflicts for merge of
f69ebaba to jb-mr1-dev-plus-aosp
* commit '
828b2ca0ae745ee0c061eaed581897dac8a6fe9c':
make_ext4fs: insert lost+found directory into filled filesystems
Colin Cross [Wed, 19 Dec 2012 00:11:23 +0000 (16:11 -0800)]
resolved conflicts for merge of
f69ebaba to jb-mr1-dev-plus-aosp
Change-Id: Ia1c7025ab3d14f2d47e07acf58e161624d94c07c
Colin Cross [Tue, 18 Dec 2012 23:27:26 +0000 (15:27 -0800)]
am
c04808a5: make_ext4fs: fix sepolicy lookup for lost+found
* commit '
c04808a532b0421fded05eecf5d843c45b7eb407':
make_ext4fs: fix sepolicy lookup for lost+found
Colin Cross [Tue, 18 Dec 2012 23:27:25 +0000 (15:27 -0800)]
am
0f92e16a: make_ext4fs: insert lost+found directory into filled filesystems
* commit '
0f92e16a064c285f5c667df7090b07d28e5e098a':
make_ext4fs: insert lost+found directory into filled filesystems
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 [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
The Android Open Source Project [Thu, 29 Nov 2012 23:12:37 +0000 (15:12 -0800)]
am
066c268b: (-s ours) am
da068042: Reconcile with jb-mr1-release - do not merge
* commit '
066c268bb596d7188091278e92638575765e6e98':
make_ext4fs: fix dentry padding when dentry size is 4088 or 4092
Colin Cross [Thu, 29 Nov 2012 23:12:37 +0000 (15:12 -0800)]
am
a3091bec: am
1275cfc5: am
430b67d3: make_ext4fs: fix dentry padding when dentry size is 4088 or 4092
* commit '
a3091bec956d102a4afa42be3a35a151d3065676':
make_ext4fs: fix dentry padding when dentry size is 4088 or 4092
Chad Jones [Thu, 29 Nov 2012 22:55:59 +0000 (14:55 -0800)]
atrace moved to cmds/atrace in platform/frameworks/native
The Android Open Source Project [Thu, 29 Nov 2012 22:28:20 +0000 (14:28 -0800)]
am
da068042: Reconcile with jb-mr1-release - do not merge
* commit '
da068042443cf968773bd9c7f2ca8e2ae8e59a05':
make_ext4fs: fix dentry padding when dentry size is 4088 or 4092
Colin Cross [Thu, 29 Nov 2012 22:28:00 +0000 (14:28 -0800)]
am
1275cfc5: am
430b67d3: make_ext4fs: fix dentry padding when dentry size is 4088 or 4092
* commit '
1275cfc50b86618f925856e9727956c7d5a02584':
make_ext4fs: fix dentry padding when dentry size is 4088 or 4092
Colin Cross [Thu, 29 Nov 2012 20:48:51 +0000 (12:48 -0800)]
am
d040d300: am
cb95c864: make_ext4fs: fix dentry padding when dentry size is 4088 or 4092
* commit '
d040d300cbac8d6dd609531f88fcc2667ebee367':
make_ext4fs: fix dentry padding when dentry size is 4088 or 4092
Colin Cross [Thu, 29 Nov 2012 20:45:34 +0000 (12:45 -0800)]
am
cb95c864: make_ext4fs: fix dentry padding when dentry size is 4088 or 4092
* commit '
cb95c864fe069eecb88807cbbb456baf9ee2c44d':
make_ext4fs: fix dentry padding when dentry size is 4088 or 4092
The Android Open Source Project [Thu, 29 Nov 2012 19:54:58 +0000 (11:54 -0800)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I6144d785b6b161bf3f84f94b5ae8a612eaf8ffca
Colin Cross [Thu, 29 Nov 2012 18:58:20 +0000 (10:58 -0800)]
am
430b67d3: make_ext4fs: fix dentry padding when dentry size is 4088 or 4092
* commit '
430b67d37c9f0a39bd06c128da96e37866d2ac36':
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
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
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
Colin Cross [Tue, 27 Nov 2012 00:54:24 +0000 (16:54 -0800)]
am
0078f358: Merge "make_ext4fs: fix sepolicy lookup for lost+found"
* commit '
0078f358ee79245e87fa8f5fc32ce30887f08357':
make_ext4fs: fix sepolicy lookup for lost+found
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:46:18 +0000 (15:46 -0800)]
am
aeb0b9fe: Merge "make_ext4fs: insert lost+found directory into filled filesystems"
* commit '
aeb0b9fe4a2b4ee62076ac5d608218f685e60837':
make_ext4fs: insert lost+found directory into filled filesystems
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:29:51 +0000 (13:29 -0800)]
am
3861978e: Merge "make_ext4fs: fix dentry padding when dentry size is 4088 or 4092"
* commit '
3861978ea090352f80bc4b50cb1c2d0fa6dc08da':
make_ext4fs: fix dentry padding when dentry size is 4088 or 4092
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 [Tue, 20 Nov 2012 15:12:12 +0000 (07:12 -0800)]
am
1eda334e: Merge "Make SIZE a mandatory parameter."
* commit '
1eda334e947485b6b406a087167b9fb311933d32':
Make SIZE a mandatory parameter.
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
Glenn Kasten [Thu, 15 Nov 2012 00:24:27 +0000 (16:24 -0800)]
Fix build
Change-Id: Ibb398f36a7569af3480e24145da4317bf5b86998
Erik Gilling [Wed, 14 Nov 2012 23:11:21 +0000 (15:11 -0800)]
add asynchronous tracing
Change-Id: I5b8660cd4d2af2ad7c6b2548c9572d3527882d6d
Irfan Sheriff [Thu, 8 Nov 2012 14:22:06 +0000 (06:22 -0800)]
am
1df980dd: am
c3dc8929: Use updated stop supplicant API
* commit '
1df980dd3c6a7130540724e9f3f6121d677e4408':
Use updated stop supplicant API
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:34:12 +0000 (12:34 -0800)]
am
8be5ea33: (-s ours) am
07c8a6d2: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
8be5ea335c6aacb2af1f3c77b19db9509f26e601':
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:28:08 +0000 (09:28 -0700)]
am
ed9208c3: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
ed9208c36ae0d0d93f93412e76eb0ce7d41eed7b':
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 20:22:18 +0000 (13:22 -0700)]
am
9d547387: am
3f91534e: atrace: add sync trace support
* commit '
9d54738752df617af3bf281bc1969136fb08943d':
atrace: add sync trace support
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 20:02:01 +0000 (13:02 -0700)]
am
af41b37f: am
7176b213: Merge "Add automatic file_contexts handle to make_ext4fs."
* commit '
af41b37f0088417f98261c24647f195ecd4999fc':
Add automatic file_contexts handle to make_ext4fs.
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:10:28 +0000 (10:10 -0700)]
am
4ff85ad2: am
50d42703: Merge "Remove HAVE_SELINUX guards"
* commit '
4ff85ad26acab3f4bbab6195c5e092999164f7d8':
Remove HAVE_SELINUX guards
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 01:02:18 +0000 (18:02 -0700)]
am
e24264a6: am
f310f6c5: Merge "Remove HAVE_SELINUX guards"
* commit '
e24264a618c6325445cc64c5f7c4000df6d358fa':
Remove HAVE_SELINUX guards
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:43:18 +0000 (07:43 -0700)]
am
f5672fec: (-s ours) Reconcile with jb-mr1-factory-release - do not merge
* commit '
f5672feccfc4b3be0ddecc092b949710dec47bba':
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:37:18 +0000 (07:37 -0700)]
am
e666ccd6: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
e666ccd6ab00d689819b537e51ab9b965f8a433a':
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:41:43 +0000 (08:41 -0700)]
am
796367ef: am
a09aa3ea: Add -n and -S options for \'nohup\', offline traces
* commit '
796367ef31a7a1409f7ce5756f8142100d31053a':
Add -n and -S options for 'nohup', offline traces
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:31:03 +0000 (14:31 -0700)]
am
461f556e: am
b67683f6: Merge "make_ext4fs: add const qualifier to mountpoint"
* commit '
461f556eb424eb25e692e60b571f4d32dfa4202c':
make_ext4fs: add const qualifier to mountpoint
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:35:46 +0000 (07:35 -0700)]
am
9acbd28e: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
9acbd28e7c22df3f5f59974bf199f08622941248':
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:36:31 +0000 (10:36 -0700)]
am
0c434b58: am
24505a58: atrace: make clock & bus bw tracing optional
* commit '
0c434b58efa2dbe21ce9b8d20e6bc0328147080b':
atrace: make clock & bus bw tracing optional
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:20:58 +0000 (08:20 -0700)]
am
3d646745: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
3d646745f76f1f39c295d0da9d17419c237ae186':
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:16:41 +0000 (16:16 -0700)]
am
a1e1799a: am
a404a7e9: atrace: add clock rate and bus utilization
* commit '
a1e1799a082283f960dafa376ae83880b3b5bf2e':
atrace: add clock rate and bus utilization
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:24:50 +0000 (09:24 -0700)]
am
a2b8a756: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
a2b8a756dba78e9c6e86717da0610e2826587ead':
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
OSDN Git Service
