Tao Bao
6efc7a787b
Merge "Update the header path for ext4_utils." am: 5bc3ce85cf
am: 148b85b050
...
am: 2815ac5584
Change-Id: I966296de6eb4ff7518b9cfcd5853fe919765b826
2016-10-10 22:14:48 +00:00
Tao Bao
2815ac5584
Merge "Update the header path for ext4_utils." am: 5bc3ce85cf
...
am: 148b85b050
Change-Id: I5f862edbdbc3b9c0e09113a9acff26773ceebb87
2016-10-10 21:46:03 +00:00
Tao Bao
148b85b050
Merge "Update the header path for ext4_utils."
...
am: 5bc3ce85cf
Change-Id: I962e2c4b311ea93c12de8be26b7a228fae1b1b22
2016-10-10 21:14:46 +00:00
Tao Bao
5bc3ce85cf
Merge "Update the header path for ext4_utils."
2016-10-10 20:07:32 +00:00
Christopher Ferris
5e27cd514f
Merge "Small clean up of fuse code." am: 54c211db2e
am: f620b87efe
...
am: c2eaefdd15
Change-Id: I800d48fb1d74531681cdcd35fcd3ea674e7c3025
2016-10-10 19:42:33 +00:00
Christopher Ferris
c2eaefdd15
Merge "Small clean up of fuse code." am: 54c211db2e
...
am: f620b87efe
Change-Id: Ic2d731690121c5e047d1df2376ef5a8f83be14ea
2016-10-10 19:37:11 +00:00
Christopher Ferris
f620b87efe
Merge "Small clean up of fuse code."
...
am: 54c211db2e
Change-Id: I09fbb1879d506789956c30d4890e4f6908003fa0
2016-10-10 19:31:29 +00:00
Christopher Ferris
54c211db2e
Merge "Small clean up of fuse code."
2016-10-10 19:22:24 +00:00
Glenn Kasten
af97f66b59
Merge "Traverse /etc/init in a well-defined order" am: db7715c7dd
am: 31dcb81e63
...
am: 010624bd2c
Change-Id: Ie8c3467d5bb286bbdacb8479c62d2f52fef246df
2016-10-09 17:26:37 +00:00
Tao Bao
6d881d6db4
Update the header path for ext4_utils.
...
Test: `mmma system/core`
Change-Id: I6291d10d6c8d4972aeca55596baa83f555496193
2016-10-09 10:23:36 -07:00
Glenn Kasten
010624bd2c
Merge "Traverse /etc/init in a well-defined order" am: db7715c7dd
...
am: 31dcb81e63
Change-Id: Id4f68d9eddb9e990fef07a306564a1619e87978b
2016-10-09 17:21:38 +00:00
Glenn Kasten
31dcb81e63
Merge "Traverse /etc/init in a well-defined order"
...
am: db7715c7dd
Change-Id: I548824b089b2abd462c83b459bb457fa1bf11a82
2016-10-09 17:17:03 +00:00
Glenn Kasten
db7715c7dd
Merge "Traverse /etc/init in a well-defined order"
2016-10-09 17:11:03 +00:00
Tao Bao
2122bb56cd
Merge "mkbootfs: Fix the default st_mode for root directory." am: 3dee9f1f6f
am: 78b352624d
...
am: 7f8f35ccec
Change-Id: I368572a38b1e24224df04c80c110fdeca5e575ec
2016-10-08 20:34:06 +00:00
Tao Bao
7f8f35ccec
Merge "mkbootfs: Fix the default st_mode for root directory." am: 3dee9f1f6f
...
am: 78b352624d
Change-Id: I1765660b21e2de6e9b95b21c73d2cf037c855dcd
2016-10-08 20:29:31 +00:00
Tao Bao
78b352624d
Merge "mkbootfs: Fix the default st_mode for root directory."
...
am: 3dee9f1f6f
Change-Id: I7672f883954112e0c1826eae8c3024f93824eaad
2016-10-08 20:24:32 +00:00
Treehugger Robot
3dee9f1f6f
Merge "mkbootfs: Fix the default st_mode for root directory."
2016-10-08 20:16:57 +00:00
Yifan Hong
35146c467d
Merge "Add 0X as a valid hex prefix for parseint" am: 392a2c8f0f
am: 11373394fd
...
am: 92b1727472
Change-Id: I054cbb995db521669f474a6e484f71933f4d6e91
2016-10-08 10:51:39 +00:00
Yifan Hong
92b1727472
Merge "Add 0X as a valid hex prefix for parseint" am: 392a2c8f0f
...
am: 11373394fd
Change-Id: I3140b23ec23d4c8af3a25afa3e20a86bf0dd8beb
2016-10-08 10:47:07 +00:00
Yifan Hong
11373394fd
Merge "Add 0X as a valid hex prefix for parseint"
...
am: 392a2c8f0f
Change-Id: Ia9409c0424fab1966197ea5bb7a4532ed9a8c709
2016-10-08 10:42:37 +00:00
Treehugger Robot
392a2c8f0f
Merge "Add 0X as a valid hex prefix for parseint"
2016-10-08 10:36:02 +00:00
Dimitry Ivanov
8a4e8bba64
Merge "Revert "Revert "Revert "Revert "Remove liblog from libcutils as a whole static lib""""" am: afda14e61d
am: a46dfe2306
...
am: d1f924f663
Change-Id: I1303ec146eb71fb7111f31c5d87e4268a875e77a
2016-10-08 08:05:52 +00:00
Dimitry Ivanov
d1f924f663
Merge "Revert "Revert "Revert "Revert "Remove liblog from libcutils as a whole static lib""""" am: afda14e61d
...
am: a46dfe2306
Change-Id: I73ff45d49c6bd174923c747d16063f18bc1ea299
2016-10-08 08:00:52 +00:00
Dimitry Ivanov
a46dfe2306
Merge "Revert "Revert "Revert "Revert "Remove liblog from libcutils as a whole static lib"""""
...
am: afda14e61d
Change-Id: I5f9d475db5e5f843f59c1a9484f4ed6174e62650
2016-10-08 07:56:21 +00:00
Dimitry Ivanov
afda14e61d
Merge "Revert "Revert "Revert "Revert "Remove liblog from libcutils as a whole static lib"""""
2016-10-08 07:51:33 +00:00
Chia-I Wu
ebebf0198d
Merge "Add native_handle_clone" am: e8f6c7398b
am: 462e087e40
...
am: cb52dc258e
Change-Id: I011555d429120a26e61fbce5f7a125ce96fadb3f
2016-10-08 01:39:01 +00:00
Chia-I Wu
cb52dc258e
Merge "Add native_handle_clone" am: e8f6c7398b
...
am: 462e087e40
Change-Id: I745341bf4c76fc8c75f36e578cf1086808119426
2016-10-08 01:34:05 +00:00
Chia-I Wu
462e087e40
Merge "Add native_handle_clone"
...
am: e8f6c7398b
Change-Id: I788664dbcd2663f197292368bb89cd1b98e9489f
2016-10-08 01:30:01 +00:00
Chia-I Wu
e8f6c7398b
Merge "Add native_handle_clone"
2016-10-08 01:25:35 +00:00
Yifan Hong
89fbd6349f
Add 0X as a valid hex prefix for parseint
...
Bug: 31983995
Test: make android.hardware.tests.expression@1.0
Change-Id: I526d73f96c519f84dec93befa442b1d2fff7979b
2016-10-07 16:50:16 -07:00
Tao Bao
3b5fbd8331
mkbootfs: Fix the default st_mode for root directory.
...
CL in [1] fixed the wrong mode for the root directory from 0644 to 0755.
However it only handles the path by calling mkbootfs with canned
fs_config (i.e. with -f flag). When calling mkbootfs without -f flag, it
still treats the root directory as a file. This renders the generated
boot/recovery images w/ and w/o -f being different, and leads to the
incorrect checksums in /system/bin/install-recovery.sh.
[1] commit aa8f2f65a030f71506277e2a8d64d83a099e9feb.
Bug: 31988535
Test: `make dist` and verify the checksums in /system/bin/install-recovery.sh.
Change-Id: Ib50fadb23367da0b46944ae0579093da21412593
2016-10-07 16:14:27 -07:00
Glenn Kasten
2de796491a
Traverse /etc/init in a well-defined order
...
Bug: 31996208
Test: will need a CTS, not yet done
Change-Id: I5ecc7f0519d42a83065b7b97a31cdb5b33549cda
2016-10-07 13:56:37 -07:00
Josh Gao
f883e2f65c
Merge "adb: rationalize types." am: 8caf4e7443
am: e335bea277
...
am: 010818f313
Change-Id: I1edebee150c7b36cfa3ca58626eaebf5e9ce647f
2016-10-07 20:48:19 +00:00
Josh Gao
010818f313
Merge "adb: rationalize types." am: 8caf4e7443
...
am: e335bea277
Change-Id: I045ccbebbc1005a501768da3222a211e49821895
2016-10-07 20:44:43 +00:00
Josh Gao
e335bea277
Merge "adb: rationalize types."
...
am: 8caf4e7443
Change-Id: I2e363c31a22b57964688f170c6f96cd8764959e0
2016-10-07 20:41:16 +00:00
Treehugger Robot
8caf4e7443
Merge "adb: rationalize types."
2016-10-07 20:35:00 +00:00
Christopher Ferris
d6b0d37549
Small clean up of fuse code.
...
- Add TEMP_FAILURE_RETRY around all relevant system calls.
- Cleanup some of the read calls.
- Add error log messages when read/write calls do not actually read/write the
expected number of bytes.
- Add error messages for write failures in fuse_status/fuse_replay.
Test: Attached to the sdcard process and stepped through most of the modified
Test: code. Also, create/read/write/delete files in /storage/emulated/0
Test: directory.
Change-Id: I73e4c0db861960f4c0af1bf96b06cd61fa74be69
2016-10-07 12:16:00 -07:00
Dimitry Ivanov
625484ddfa
Revert "Revert "Revert "Revert "Remove liblog from libcutils as a whole static lib""""
...
This reverts commit 6a452917b3
.
Bug: http://b/31289077
Bug: http://b/27171986
Change-Id: Id020fa10c50847bf16a2fcbc7d5e72cf8766b711
2016-10-07 18:43:37 +00:00
Colin Cross
c0422d1b2a
Merge "libsparse: output_file.c, fix large data chunk issue" am: 62c9101646
am: faaeda8e12
...
am: 4179f2ec65
Change-Id: I8845a058ff2c6f1bc3592655a4805f1e77fd41eb
2016-10-07 17:28:01 +00:00
Colin Cross
4179f2ec65
Merge "libsparse: output_file.c, fix large data chunk issue" am: 62c9101646
...
am: faaeda8e12
Change-Id: I167d7d8083e8e15f89f21b5838fc5b4e97121b10
2016-10-07 17:24:00 +00:00
Colin Cross
faaeda8e12
Merge "libsparse: output_file.c, fix large data chunk issue"
...
am: 62c9101646
Change-Id: Ica50c8fd851ea2e9ff734253b102b3fa8362577f
2016-10-07 17:20:34 +00:00
Colin Cross
62c9101646
Merge "libsparse: output_file.c, fix large data chunk issue"
2016-10-07 17:17:10 +00:00
John Reck
5e106e0da8
Merge "Revert "Revert "Revert "Remove liblog from libcutils as a whole static lib"""" am: b02a355d10
am: 8e7fa9fb7e
...
am: 7e86b688cb
Change-Id: I90d8fc3b22fc59b04532fba6418b73ad8af998e3
2016-10-07 16:46:29 +00:00
John Reck
7e86b688cb
Merge "Revert "Revert "Revert "Remove liblog from libcutils as a whole static lib"""" am: b02a355d10
...
am: 8e7fa9fb7e
Change-Id: Ia5387836b2f07edff773dbe700e93552f3eed85b
2016-10-07 16:41:57 +00:00
John Reck
8e7fa9fb7e
Merge "Revert "Revert "Revert "Remove liblog from libcutils as a whole static lib""""
...
am: b02a355d10
Change-Id: I0d520bbf002a317784ff8bb2963676a98df36706
2016-10-07 16:38:02 +00:00
John Reck
b02a355d10
Merge "Revert "Revert "Revert "Remove liblog from libcutils as a whole static lib""""
2016-10-07 16:32:38 +00:00
John Reck
6a452917b3
Revert "Revert "Revert "Remove liblog from libcutils as a whole static lib"""
...
This reverts commit 595c1480d0
.
Revert reason: broke bullhead-eng build in master
Change-Id: Ie64fc31c3c971366ab9f2543b91b8f5d2040868b
2016-10-07 16:22:38 +00:00
Tianjie Xu
5f3f482c3e
Fix out of bound access in libziparchive am: 1ee4892e66
am: c24dd97654
am: 8788591224
am: 167562aa76
am: 398adf9b55
am: 680c3f1dc4
am: f0ce69815f
am: 6fb68bb196
am: 2af1a88fcb
am: ae8cebf5ae
...
am: c4b38b2b0c
Change-Id: I641e539ec82f995ca9a970f262cb99813e29b7a2
2016-10-07 00:41:09 +00:00
Tianjie Xu
c4b38b2b0c
Fix out of bound access in libziparchive am: 1ee4892e66
am: c24dd97654
am: 8788591224
am: 167562aa76
am: 398adf9b55
am: 680c3f1dc4
am: f0ce69815f
am: 6fb68bb196
am: 2af1a88fcb
...
am: ae8cebf5ae
Change-Id: I251374041170b92d52dd1aec5797763881f3118c
2016-10-07 00:37:32 +00:00
Tianjie Xu
faa2093cc2
Fix out of bound access in libziparchive am: 1ee4892e66
am: c24dd97654
am: 8788591224
am: 167562aa76
am: 398adf9b55
am: 680c3f1dc4
am: f0ce69815f
am: 6fb68bb196
...
am: 206150bf78
Change-Id: Iccc08b758095957222c2f76782bf317d059259eb
2016-10-07 00:33:31 +00:00