OSDN Git Service
Jin Qian [Mon, 24 Apr 2017 18:51:19 +0000 (18:51 +0000)]
Merge "libblkid: fix buffer overflow scanning partition name" am:
0474c47c22
am:
ff35b76641
Change-Id: I16fc2fe2ad37cec0fb7c20376d6bc285c0020eff
Jin Qian [Mon, 24 Apr 2017 18:41:46 +0000 (18:41 +0000)]
Merge "libblkid: fix buffer overflow scanning partition name"
am:
0474c47c22
Change-Id: I6cb23da1861c8358fe5ff2b3e2334e4bf4218664
Treehugger Robot [Mon, 24 Apr 2017 17:51:34 +0000 (17:51 +0000)]
Merge "libblkid: fix buffer overflow scanning partition name"
Jin Qian [Mon, 17 Apr 2017 23:13:20 +0000 (16:13 -0700)]
libblkid: fix buffer overflow scanning partition name
If "line" is carefully crafted, sscanf will write 1 byte over ptname.
Bug:
36103037
Change-Id: Ia19e032d7c65edc27373ebccc0a5569f0fa31161
Ben Fennema [Tue, 14 Mar 2017 21:15:47 +0000 (21:15 +0000)]
Merge "e2fsdroid: don't print empty files in block_list.c:end_new_file" am:
43ff4cf0d8
am:
dd62d63cd1
Change-Id: I44a9335693be5300560c6f02f71893633e11d8b3
Ben Fennema [Tue, 14 Mar 2017 21:10:17 +0000 (21:10 +0000)]
Merge "e2fsdroid: don't print empty files in block_list.c:end_new_file"
am:
43ff4cf0d8
Change-Id: Id89e488be9554baf51aa4144dcd911b7fff4d32f
Ben Fennema [Tue, 14 Mar 2017 21:04:51 +0000 (21:04 +0000)]
Merge "e2fsdroid: don't print empty files in block_list.c:end_new_file"
Ben Fennema [Thu, 9 Mar 2017 06:44:17 +0000 (22:44 -0800)]
e2fsdroid: don't print empty files in block_list.c:end_new_file
Change-Id: I4b38841c9c36a8faaa9f65bc7b61c7abdddab094
Signed-off-by: Ben Fennema <fennema@google.com>
liminghao [Thu, 2 Mar 2017 17:48:24 +0000 (17:48 +0000)]
Merge "blkid: add support to recognize exfat to blkid." am:
070a4b0d99
am:
bd16b7be12
Change-Id: I4f352e2deb6dc927a5dcf914e4ab8fe716dd91a4
liminghao [Thu, 2 Mar 2017 17:46:55 +0000 (17:46 +0000)]
Merge "blkid: add support to recognize exfat to blkid."
am:
070a4b0d99
Change-Id: I20a4a1f00af496ffc878a43e9dba60d24548ab09
Treehugger Robot [Thu, 2 Mar 2017 17:42:37 +0000 (17:42 +0000)]
Merge "blkid: add support to recognize exfat to blkid."
liminghao [Wed, 1 Mar 2017 09:54:42 +0000 (17:54 +0800)]
blkid: add support to recognize exfat to blkid.
we can now identify exfat filesystem.
Change-Id: I870e59a14b6bcd8b45562cdd02c2502d60a9eeff
Signed-off-by: liminghao <liminghao@xiaomi.com>
Theodore Ts'o [Tue, 28 Feb 2017 01:21:49 +0000 (01:21 +0000)]
Merge "e2fsck: exit with exit status 0 if no errors were fixed" am:
82f3d0584c
am:
ba0844f8c7
Change-Id: I4f4faf0007fa8a59e447013d0d2c2323f5713d0d
Theodore Ts'o [Tue, 28 Feb 2017 01:19:50 +0000 (01:19 +0000)]
Merge "e2fsck: exit with exit status 0 if no errors were fixed"
am:
82f3d0584c
Change-Id: I2d5c70430675a0338fc219fc8f69cdbdac335e82
Treehugger Robot [Tue, 28 Feb 2017 01:16:00 +0000 (01:16 +0000)]
Merge "e2fsck: exit with exit status 0 if no errors were fixed"
Theodore Ts'o [Fri, 17 Feb 2017 03:02:35 +0000 (22:02 -0500)]
e2fsck: exit with exit status 0 if no errors were fixed
Previously, e2fsck would exit with a status code of 1 even though the
only changes that it made to the file system were various
optimziations and not fixing file system corruption. Since the man
page states that an exit status of 1 means "file system errors
corrupted", fix e2fsck to return an exit status of 0.
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Christopher Ferris [Mon, 27 Feb 2017 20:23:42 +0000 (20:23 +0000)]
Merge "Disable macro redefined warnings." am:
0a9866d60b
am:
9bbfd91413
Change-Id: I99cf61b4953f53f349518b64ad1c84d3e3de7037
Christopher Ferris [Mon, 27 Feb 2017 20:16:59 +0000 (20:16 +0000)]
Merge "Disable macro redefined warnings."
am:
0a9866d60b
Change-Id: Ieca574c841b5d73b991cd119878dcbf1f73781eb
Christopher Ferris [Mon, 27 Feb 2017 20:09:54 +0000 (20:09 +0000)]
Merge "Disable macro redefined warnings."
Christopher Ferris [Thu, 23 Feb 2017 23:36:54 +0000 (15:36 -0800)]
Disable macro redefined warnings.
The new kernel headers do:
#define __bitwise __bitwise__
However, the code redefines __bitwise without undef'ing it first.
This is a temporary fix, b/
35721782 filed to fix this.
Change-Id: I2c6a64146966f1737835f012d24ccc844570d02b
Test: Builds without warningers/errors.
Alex Deymo [Thu, 26 Jan 2017 02:40:39 +0000 (02:40 +0000)]
Merge "Add "libc" to soong static_executable targets." am:
98f63cd9de am:
ea7db4e63a
am:
668ec9e6b6
Change-Id: I29edac9d49075bae0cfa8d335d8694e0d9751c0d
Alex Deymo [Thu, 26 Jan 2017 02:38:10 +0000 (02:38 +0000)]
Merge "Add "libc" to soong static_executable targets." am:
98f63cd9de
am:
ea7db4e63a
Change-Id: Ia3107fb2fd6300980f0e451a98caaddb5087811e
Alex Deymo [Thu, 26 Jan 2017 02:35:39 +0000 (02:35 +0000)]
Merge "Add "libc" to soong static_executable targets."
am:
98f63cd9de
Change-Id: I7455d4552d82cc80d87edc5383ca34bce77be2f9
Alex Deymo [Thu, 26 Jan 2017 02:30:25 +0000 (02:30 +0000)]
Merge "Add "libc" to soong static_executable targets."
Alex Deymo [Thu, 26 Jan 2017 01:47:50 +0000 (17:47 -0800)]
Add "libc" to soong static_executable targets.
When building a static exectuable for "arm", the libgcc is automatically
included by the build system *after* libc, but libgcc has some symbol
dependencies on "libc", like for example the "raise" symbol.
libgcc, libatomic and libcompiler_rt-extras are passed in a group
(enclosed by --start-group and --end-group) so they all are included
regardless of the order inside that group. Nevertheless libc only
appears outside this group and before them, so the undefined references
from libgcc are not resolved.
This patch adds "libc" as a explicit static_libs dependency to
static_executable targets forcing it to be included in the group.
Bug:
34220783
Test: mmma external/e2fsprogs
Change-Id: Ia18db10da0f18494600d7e0c870291902d71b287
Alex Deymo [Wed, 25 Jan 2017 23:59:10 +0000 (23:59 +0000)]
Merge "Convert e2fsprogs targets to soong." am:
6091a50d7a am:
19f945ac14
am:
006bf071cd
Change-Id: I2d18a61cf9b2b0439f98350668fe309d94809dce
Alex Deymo [Wed, 25 Jan 2017 23:56:06 +0000 (23:56 +0000)]
Merge "Convert e2fsprogs targets to soong." am:
6091a50d7a
am:
19f945ac14
Change-Id: Ic9e7214abd359c24f33e273295584d174c701d0a
Alex Deymo [Wed, 25 Jan 2017 23:53:09 +0000 (23:53 +0000)]
Merge "Convert e2fsprogs targets to soong."
am:
6091a50d7a
Change-Id: Iacf1c8b33da19ed46009f60416cf65af18736296
Alex Deymo [Wed, 25 Jan 2017 23:48:42 +0000 (23:48 +0000)]
Merge "Convert e2fsprogs targets to soong."
Alex Deymo [Thu, 12 Jan 2017 17:48:04 +0000 (09:48 -0800)]
Convert e2fsprogs targets to soong.
This patch also removes all the "-host" and "_static" suffix from all
the libraries adding "unique_host_soname: true". This prevents
confusions with the host installed libraries.
A new "libext2_misc" library is introduced to export some files from
the misc/ directory to other binaries in this project.
Bug:
34220783
Test: mmma external/e2fsprogs
Change-Id: Ia1b689991346b11f8cb38f7c6ee356e666e01d6d
Nick Kralevich [Thu, 19 Jan 2017 03:44:08 +0000 (03:44 +0000)]
Merge "HACK: android: exit(1) if selabel_lookup fails" am:
412c46afdf am:
6c826a6fc9
am:
d775c7038b
Change-Id: I3d1bc996c98cc328d439adc741a1623b7fa8841b
Nick Kralevich [Thu, 19 Jan 2017 03:42:07 +0000 (03:42 +0000)]
Merge "HACK: android: exit(1) if selabel_lookup fails" am:
412c46afdf
am:
6c826a6fc9
Change-Id: I4abfb2ae25b498ede40399d6a5226b90f8f28687
Nick Kralevich [Thu, 19 Jan 2017 03:40:08 +0000 (03:40 +0000)]
Merge "HACK: android: exit(1) if selabel_lookup fails"
am:
412c46afdf
Change-Id: Id888c5744571575ba62f3ee6c54222d88a86c639
Treehugger Robot [Thu, 19 Jan 2017 03:36:37 +0000 (03:36 +0000)]
Merge "HACK: android: exit(1) if selabel_lookup fails"
Nick Kralevich [Wed, 18 Jan 2017 23:17:42 +0000 (15:17 -0800)]
HACK: android: exit(1) if selabel_lookup fails
If selabel_lookup fails, the current implementation of set_selinux_xattr
returns -1, but the command line tool e2fsdroid reports success.
There's a bunch of things wrong:
1) -1 does not appear to be a legal errcode_t value. The appropriate
return value appears to be DIRENT_ABORT.
2) A return value of DIRENT_ABORT is ignored by the upper layers of the
code.
3) Attempting to fix the upper layers of the code to not ignore
DIRENT_ABORT results in complaints about not being able to create
/lost+found.
Call stack:
- main
- android_configure_fs
- __android_configure_fs
- ext2fs_dir_iterate2
- ext2fs_block_iterate3
- ext2fs_process_dir_block
- walk_dir
- ext2fs_dir_iterate2
- ext2fs_block_iterate3
- ext2fs_process_dir_block
- walk_dir
- ext2fs_dir_iterate2
- ext2fs_block_iterate3
- ext2fs_process_dir_block
- androidify_inode
- set_selinux_xattr
I'm honestly not sure how to fix this, so just throw an exit(1) in
there, to make sure the program dies a horrible death if
selabel_lookup() fails. This is much better than the alternative of
e2fsdroid returning success with an improperly labeled file.
Bug:
34358308
Test: Artifically modify selabel_lookup() to return a failure, and
verify Android doesn't compile.
Test: Verify Android compiles under normal circumstances.
Change-Id: I60e04bc6559a66d3f3202f2c28e2519856385ded
Alex Deymo [Thu, 12 Jan 2017 21:37:40 +0000 (21:37 +0000)]
Merge "Remove "_host" and "_static" suffix from libsparse." am:
22aabbe13b am:
7d95329bf0
am:
2b89372afa
Change-Id: I73fef47b73440c2292f0dac47e98b57ff347875b
Alex Deymo [Thu, 12 Jan 2017 21:32:41 +0000 (21:32 +0000)]
Merge "Remove "_host" and "_static" suffix from libsparse." am:
22aabbe13b
am:
7d95329bf0
Change-Id: Ieb969d6353c3ac9f33e65d220f7cb1c67ca3791b
Alex Deymo [Thu, 12 Jan 2017 21:27:41 +0000 (21:27 +0000)]
Merge "Remove "_host" and "_static" suffix from libsparse."
am:
22aabbe13b
Change-Id: I1bcdcfcc66b7db716cb5071e5f1ed3519b6b935b
Alex Deymo [Thu, 12 Jan 2017 21:23:09 +0000 (21:23 +0000)]
Merge "Remove "_host" and "_static" suffix from libsparse."
Alex Deymo [Wed, 11 Jan 2017 22:40:43 +0000 (14:40 -0800)]
Remove "_host" and "_static" suffix from libsparse.
Bug:
34220783
Change-Id: I218ab40f423bf0bddebc3b2e1526bd9e3549eed6
Jin Qian [Sun, 8 Jan 2017 07:22:43 +0000 (07:22 +0000)]
Merge "libext2fs: fix sparse param parsing on mac build" am:
b6da61cd92 am:
5412034d84
am:
c1debb2e9a
Change-Id: Iaf9d2e63a7197049dd7a565bb649e45eac41de93
Jin Qian [Sun, 8 Jan 2017 07:18:14 +0000 (07:18 +0000)]
Merge "libext2fs: fix sparse param parsing on mac build" am:
b6da61cd92
am:
5412034d84
Change-Id: Icc7b4d6f8e2819f811a69abe91f44ce2bb20e054
Jin Qian [Sun, 8 Jan 2017 07:13:44 +0000 (07:13 +0000)]
Merge "libext2fs: fix sparse param parsing on mac build"
am:
b6da61cd92
Change-Id: Ice8c98f8fd072b157ec91310078d11120cc5c4ca
Treehugger Robot [Sun, 8 Jan 2017 07:10:49 +0000 (07:10 +0000)]
Merge "libext2fs: fix sparse param parsing on mac build"
Jin Qian [Sat, 7 Jan 2017 00:30:34 +0000 (16:30 -0800)]
libext2fs: fix sparse param parsing on mac build
Flag m is not supported on macos sscanf. Fall back to manually
allocate the string.
Use strict format to skip ":" between params.
Change-Id: Ic4f3747708423d0504ea40fb5cb116068f4a7ab8
Jin Qian [Tue, 3 Jan 2017 20:51:39 +0000 (20:51 +0000)]
Merge changes from topic 'e2fsdroid' am:
da08ba0d8a am:
80339f777f
am:
0607ed1ebe
Change-Id: I02c39b403d65b266464166a9383b88c690e4253f
Jin Qian [Tue, 3 Jan 2017 20:51:36 +0000 (20:51 +0000)]
e2fsdroid: report error from ext2fs am:
948b9fecf8 am:
9ae7a1821e
am:
ec8a1df915
Change-Id: I9de2920f4464ddb500db70d7ed00e6740c6a7fe3
Jin Qian [Tue, 3 Jan 2017 20:51:33 +0000 (20:51 +0000)]
e2fsdroid: set timestamp based on source files am:
d882f1e231 am:
67447e52c6
am:
c66c7aa414
Change-Id: I5ecc3e7fbbcf981f121210985cc90673a787366d
Jin Qian [Tue, 3 Jan 2017 20:51:29 +0000 (20:51 +0000)]
e2fsdroid: use absolute path for product_out am:
bc02ac42b2 am:
b7a39c5443
am:
b22693a64f
Change-Id: Ia046e04ed9fce21efcc68611aad0d9d5e3888c20
Jin Qian [Tue, 3 Jan 2017 20:51:26 +0000 (20:51 +0000)]
libext2fs: merge contiguous data blocks when writing to sparse file am:
6ef6efab23 am:
4059037c17
am:
a6dc5be0ea
Change-Id: I5c9ab5d7fa00ed2fc1cc135f48a47f93dfe2d19f
Jin Qian [Tue, 3 Jan 2017 20:51:23 +0000 (20:51 +0000)]
e2fsdroid: remove extra "/" when mountpoint is "/" am:
7fe49140ef am:
a0ca66bb4d
am:
c71f3b11a1
Change-Id: Id302fde4eb450b64dcbd3ca102253613dfd5ca17
Jin Qian [Tue, 3 Jan 2017 20:44:04 +0000 (20:44 +0000)]
Merge changes from topic 'e2fsdroid' am:
da08ba0d8a
am:
80339f777f
Change-Id: Ic1c4965089d18636bb2603c65f6d1cad8a316900
Jin Qian [Tue, 3 Jan 2017 20:44:03 +0000 (20:44 +0000)]
e2fsdroid: report error from ext2fs am:
948b9fecf8
am:
9ae7a1821e
Change-Id: I729e6b28d8481ca5dabbb879176211e70ca57bc5
Jin Qian [Tue, 3 Jan 2017 20:44:01 +0000 (20:44 +0000)]
e2fsdroid: set timestamp based on source files am:
d882f1e231
am:
67447e52c6
Change-Id: I79a664f5113bdd4818434081f9e399a730fbe6f1
Jin Qian [Tue, 3 Jan 2017 20:43:58 +0000 (20:43 +0000)]
e2fsdroid: use absolute path for product_out am:
bc02ac42b2
am:
b7a39c5443
Change-Id: I06917969f807e283409c516e25f8643844c9c8c9
Jin Qian [Tue, 3 Jan 2017 20:43:54 +0000 (20:43 +0000)]
libext2fs: merge contiguous data blocks when writing to sparse file am:
6ef6efab23
am:
4059037c17
Change-Id: Id545cb1245532699024aee376b9c80f1d253ef2e
Jin Qian [Tue, 3 Jan 2017 20:43:52 +0000 (20:43 +0000)]
e2fsdroid: remove extra "/" when mountpoint is "/" am:
7fe49140ef
am:
a0ca66bb4d
Change-Id: I81465ccb4c3c56e8429d2cb22c9b447d74f655db
Jin Qian [Tue, 3 Jan 2017 20:36:03 +0000 (20:36 +0000)]
Merge changes from topic 'e2fsdroid'
am:
da08ba0d8a
Change-Id: Id1c63aa261fa13df85422999ba00cadea7bf5eec
Jin Qian [Tue, 3 Jan 2017 20:36:02 +0000 (20:36 +0000)]
e2fsdroid: report error from ext2fs
am:
948b9fecf8
Change-Id: I3d8619f350faa23ca2e4b257a37252c0761adf92
Jin Qian [Tue, 3 Jan 2017 20:35:59 +0000 (20:35 +0000)]
e2fsdroid: set timestamp based on source files
am:
d882f1e231
Change-Id: I5fe8c55f89d597fb056a25097fe3fbbfcf8133c1
Jin Qian [Tue, 3 Jan 2017 20:35:57 +0000 (20:35 +0000)]
e2fsdroid: use absolute path for product_out
am:
bc02ac42b2
Change-Id: I81da9836e33c56d440896896ffe5519ca12ff63c
Jin Qian [Tue, 3 Jan 2017 20:35:54 +0000 (20:35 +0000)]
libext2fs: merge contiguous data blocks when writing to sparse file
am:
6ef6efab23
Change-Id: I656014574f8f3fe1441ea73bb9fa59dbeb03a522
Jin Qian [Tue, 3 Jan 2017 20:35:52 +0000 (20:35 +0000)]
e2fsdroid: remove extra "/" when mountpoint is "/"
am:
7fe49140ef
Change-Id: Ic79e0f5cb35e6611a9d4d11cfdf839aec8093033
Treehugger Robot [Tue, 3 Jan 2017 20:29:26 +0000 (20:29 +0000)]
Merge changes from topic 'e2fsdroid'
* changes:
e2fsdroid: report error from ext2fs
e2fsdroid: set timestamp based on source files
e2fsdroid: use absolute path for product_out
libext2fs: merge contiguous data blocks when writing to sparse file
e2fsdroid: remove extra "/" when mountpoint is "/"
Jin Qian [Mon, 19 Dec 2016 21:23:47 +0000 (13:23 -0800)]
e2fsdroid: report error from ext2fs
Returns error back to caller (build system) instead of failing silently.
Change-Id: I8bad9eed6fe639014126c98c6bf02e539f086a98
Jin Qian [Mon, 19 Dec 2016 21:19:58 +0000 (13:19 -0800)]
e2fsdroid: set timestamp based on source files
Timestamp was incorrectly set to -1 or left unset. Use lstat to read
timestamps from source files and set on target files.
Change-Id: I66b2c5281ae769a52bc4e1638895eb5285c18b7a
Jin Qian [Mon, 19 Dec 2016 19:02:15 +0000 (11:02 -0800)]
e2fsdroid: use absolute path for product_out
Android build runs e2fsdroid in a tmp directory. Use absolute path
to access files in product_out.
Change-Id: Ic238d93ff68f03bd82245bda127d269972f5ef63
Jin Qian [Mon, 19 Dec 2016 18:53:20 +0000 (10:53 -0800)]
libext2fs: merge contiguous data blocks when writing to sparse file
Sparse IO manager allocates one block at a time. This creates many
blocks in sparse file even though most of them are contiguous. As a
result, fastboot is extremely slow writing that many blocks. Merging
contiguous blocks reduces block count and flash time significantly.
Change-Id: I211312d24d7423c7f160ee501fe8b62ddf14a847
Jin Qian [Thu, 15 Dec 2016 20:15:28 +0000 (12:15 -0800)]
e2fsdroid: remove extra "/" when mountpoint is "/"
Extra "/" causes problem when matching entries in fs_config.
Change-Id: Ie1659b98db3d599cdd1a832d2dfb3036d399a6e3
Elliott Hughes [Thu, 8 Dec 2016 17:36:45 +0000 (17:36 +0000)]
Merge "_GNU_SOURCE must be defined before any #include." am:
983c39cf7d am:
63c8d4c2eb
am:
9f7363370e
Change-Id: I4a3dad2e0c350090383ddcf0d10bb14679929446
Elliott Hughes [Thu, 8 Dec 2016 17:28:02 +0000 (17:28 +0000)]
Merge "_GNU_SOURCE must be defined before any #include." am:
983c39cf7d
am:
63c8d4c2eb
Change-Id: Ifb48d09d96f66e5daea543eca1f1bba5a6bc4894
Elliott Hughes [Thu, 8 Dec 2016 17:24:02 +0000 (17:24 +0000)]
Merge "_GNU_SOURCE must be defined before any #include."
am:
983c39cf7d
Change-Id: I5badee4a611541b0026647cd326cf4501e251462
Treehugger Robot [Thu, 8 Dec 2016 17:15:16 +0000 (17:15 +0000)]
Merge "_GNU_SOURCE must be defined before any #include."
Adrien Schildknecht [Tue, 6 Dec 2016 21:09:39 +0000 (21:09 +0000)]
Merge changes from topic 'e2fs_build' am:
f34a7af0eb am:
be957e0e0f
am:
fa2d571910
Change-Id: I6969880bc02acaf716874d4e6c0f74fc03603839
Adrien Schildknecht [Tue, 6 Dec 2016 21:09:36 +0000 (21:09 +0000)]
Update generated files for Android am:
b298f7e8a3 am:
1bd197eaa8
am:
156910529c
Change-Id: I20152643c14182c78e621dccb9c99169b5b673e8
Adrien Schildknecht [Tue, 6 Dec 2016 21:09:34 +0000 (21:09 +0000)]
android: libext2fs and com_err for windows am:
1538eb4c58 am:
fe9f74066f
am:
43c5fa2f49
Change-Id: I8af19b5991c067ba4265ae3e4c8e6774eff234be
Adrien Schildknecht [Tue, 6 Dec 2016 21:02:38 +0000 (21:02 +0000)]
Merge changes from topic 'e2fs_build' am:
f34a7af0eb
am:
be957e0e0f
Change-Id: Id320ac1dae351c58a683b879d85aacf62f5e20a9
Adrien Schildknecht [Tue, 6 Dec 2016 21:02:36 +0000 (21:02 +0000)]
Update generated files for Android am:
b298f7e8a3
am:
1bd197eaa8
Change-Id: Ib5d9be6d3d95c456dd5576016717f620fa6f39c1
Adrien Schildknecht [Tue, 6 Dec 2016 21:02:34 +0000 (21:02 +0000)]
android: libext2fs and com_err for windows am:
1538eb4c58
am:
fe9f74066f
Change-Id: I74f64502d90994afd18163e7d6b5a4e5dd9077cc
Adrien Schildknecht [Tue, 6 Dec 2016 20:59:37 +0000 (20:59 +0000)]
Merge changes from topic 'e2fs_build'
am:
f34a7af0eb
Change-Id: I33657126afe0092195a80fc8de813bb80712b951
Adrien Schildknecht [Tue, 6 Dec 2016 20:59:36 +0000 (20:59 +0000)]
Update generated files for Android
am:
b298f7e8a3
Change-Id: Icfe6212adbd3f90ff9970dde136166374d0f1945
Adrien Schildknecht [Tue, 6 Dec 2016 20:59:34 +0000 (20:59 +0000)]
android: libext2fs and com_err for windows
am:
1538eb4c58
Change-Id: Icb4958aa1097d3c495d0534df2354185b1740c34
Treehugger Robot [Tue, 6 Dec 2016 20:56:53 +0000 (20:56 +0000)]
Merge changes from topic 'e2fs_build'
* changes:
Update generated files for Android
android: libext2fs and com_err for windows
Adrien Schildknecht [Fri, 2 Dec 2016 01:38:00 +0000 (17:38 -0800)]
Update generated files for Android
Test: cd external/e2fsprogs && mm
Change-Id: Iaa8ba84c55b7961947791c779d020cdb242a27fe
Adrien Schildknecht [Wed, 23 Nov 2016 18:21:42 +0000 (10:21 -0800)]
android: libext2fs and com_err for windows
Test: m libext2fs-host && m libext2_com_err-host
Change-Id: I92b6717b617a4f7f16182bf12af58cb22f20fa8f
Jin Qian [Tue, 6 Dec 2016 02:35:55 +0000 (02:35 +0000)]
Merge "Fix windows and mac build" am:
9276d7e941 am:
8ff0729e59
am:
ea593377b6
Change-Id: Iea939c9ba91bbe34557563c79c270b849040acdb
Jin Qian [Tue, 6 Dec 2016 02:31:57 +0000 (02:31 +0000)]
Merge "Fix windows and mac build" am:
9276d7e941
am:
8ff0729e59
Change-Id: I8ca8d09fec36ad405cfa697f222dd53888a38026
Jin Qian [Tue, 6 Dec 2016 02:28:27 +0000 (02:28 +0000)]
Merge "Fix windows and mac build"
am:
9276d7e941
Change-Id: Iaf167de42d4d907e59e01964bb9861d319515cb9
Jin Qian [Tue, 6 Dec 2016 02:19:07 +0000 (02:19 +0000)]
Merge "Fix windows and mac build"
Jin Qian [Tue, 6 Dec 2016 01:49:41 +0000 (17:49 -0800)]
Fix windows and mac build
malloc.h is not available on mac.
mntent.h and setmntent are not available on windows.
Test: cd external/e2fsprogs && mm
Change-Id: I3bc1b80156d3659f4d81975626a71f58d39ee61a
Elliott Hughes [Mon, 5 Dec 2016 23:17:13 +0000 (23:17 +0000)]
Merge "Fix "Can't use getmntent or getmntinfo to check for mounted filesystems!" warning." am:
cf227fe795 am:
e67369eb91
am:
95460e4842
Change-Id: I0ba45dc98c047b6811c23f55e278957f29f08103
Elliott Hughes [Mon, 5 Dec 2016 23:13:14 +0000 (23:13 +0000)]
Merge "Fix "Can't use getmntent or getmntinfo to check for mounted filesystems!" warning." am:
cf227fe795
am:
e67369eb91
Change-Id: I11ab52e83c3c30a2bfd86aa349aa76d5932ad5b5
Elliott Hughes [Mon, 5 Dec 2016 23:09:43 +0000 (23:09 +0000)]
Merge "Fix "Can't use getmntent or getmntinfo to check for mounted filesystems!" warning."
am:
cf227fe795
Change-Id: I1cfc84ca959a07c6f641404c1cd88762fd00cee8
Treehugger Robot [Mon, 5 Dec 2016 23:06:52 +0000 (23:06 +0000)]
Merge "Fix "Can't use getmntent or getmntinfo to check for mounted filesystems!" warning."
Elliott Hughes [Mon, 5 Dec 2016 21:33:29 +0000 (13:33 -0800)]
_GNU_SOURCE must be defined before any #include.
Fixes the "asprintf undeclared" warning in this code.
Bug: N/A
Test: builds
Change-Id: I42e1bfbdbc0391c5e5d7908204f9064ec858c84d
Elliott Hughes [Mon, 5 Dec 2016 21:29:49 +0000 (13:29 -0800)]
Fix "Can't use getmntent or getmntinfo to check for mounted filesystems!" warning.
We do have <mntent.h> and setmntent(3).
Also silence unused parameter warnings; C programmers don't care, so
upstream is unlikely to fix that.
Bug: N/A
Test: builds
Change-Id: I57db0cca68a617913e21c2ef7b6613cd1183d7c5
Jin Qian [Sat, 3 Dec 2016 04:15:04 +0000 (04:15 +0000)]
Manually merge commit '
398e284' into stage-aosp-master am:
e591ad15a0
am:
f39613a549
Change-Id: I85e3ea26f9406a8852a2160a9ddcd761c1ac4ac2
Jin Qian [Sat, 3 Dec 2016 04:12:56 +0000 (04:12 +0000)]
Manually merge commit '
398e284' into stage-aosp-master
am:
e591ad15a0
Change-Id: Ic77a720ab6e9c335d67887641a80562ac95b3f42
The Android Automerger [Sat, 3 Dec 2016 04:06:47 +0000 (04:06 +0000)]
Manually merge commit '
398e284' into stage-aosp-master
* commit '
398e284':
Revert "Update generated files for Android"
Revert "android: libext2fs and com_err for windows"
Update generated files for Android
android: libext2fs and com_err for windows
android: add the ext2simg tool
android: add rules to build the static host libraries
e2fsdroid: create incremental images
e2fsdroid: read and enforce android's permissions
e2fsdroid: add an option to generate a base_fs file
e2fsdroid: a tool to create android compatible image
misc: add callbacks to populate_fs
libext2fs: add context to get_alloc_block
libext2fs: android sparse io manager
BUG:
33304034
Jin Qian [Sat, 3 Dec 2016 01:56:45 +0000 (01:56 +0000)]
Merge "Revert "Update generated files for Android""
OSDN Git Service
