TreeHugger Robot
46f753a320
Merge "Update comments on native_handle_create."
2019-03-07 09:20:33 +00:00
Kiyoung Kim
ada6112cc2
Merge "Add product apk support from libnativeloader"
2019-03-07 05:46:27 +00:00
Jiyong Park
780d3236b8
Merge "Make /apex on ramdisk" am: 96dc80f97a am: 93f1ce510e
...
am: 9069b5cd9c
2019-03-06 21:19:44 -08:00
Jiyong Park
9069b5cd9c
Merge "Make /apex on ramdisk" am: 96dc80f97a
...
am: 93f1ce510e
2019-03-06 21:15:13 -08:00
Jiyong Park
93f1ce510e
Merge "Make /apex on ramdisk"
...
am: 96dc80f97a
2019-03-06 21:11:07 -08:00
Treehugger Robot
96dc80f97a
Merge "Make /apex on ramdisk"
2019-03-07 05:03:05 +00:00
Kiyoung Kim
cd8b96cb7c
Add product apk support from libnativeloader
...
Currently libnativeloader appends vendor lib path if apk is from vendor
partition. Similar to this, as part of mainline core, we should add
product lib path if apk if from product partition.
Bug: 124705551
Test: m -j && tested from crosshatch with product apps (such as Wallpaper)
Change-Id: I8690167ca8098015c8ae4bbb4f028404c5e94dc0
2019-03-07 12:01:23 +09:00
Josh Gao
2d918cde58
Merge "adbd: cleanups in remount/verity." am: 98efc485de am: d659bb49be
...
am: b7dc01a570
2019-03-06 18:46:04 -08:00
Josh Gao
b7dc01a570
Merge "adbd: cleanups in remount/verity." am: 98efc485de
...
am: d659bb49be
2019-03-06 18:41:35 -08:00
Josh Gao
d659bb49be
Merge "adbd: cleanups in remount/verity."
...
am: 98efc485de
2019-03-06 18:37:26 -08:00
Josh Gao
98efc485de
Merge "adbd: cleanups in remount/verity."
2019-03-07 02:32:42 +00:00
Jiyong Park
e5dc674a95
Make /apex on ramdisk
...
Bug: 127576519
Bug: 127653919
Test: build hikey, check ramdisk has /apex directory
Change-Id: I4e844caa032c0717bd36d323675852ce3681fb01
2019-03-07 11:17:44 +09:00
Sudheer Shanka
95a5a0518c
Merge "Allow callers to pass a flag to not link obb dirs of multiple users." am: 0c8b8af74a am: 5a8d603d9d
...
am: 5abe405b9e
2019-03-06 17:29:17 -08:00
Sudheer Shanka
5abe405b9e
Merge "Allow callers to pass a flag to not link obb dirs of multiple users." am: 0c8b8af74a
...
am: 5a8d603d9d
2019-03-06 17:02:15 -08:00
Sudheer Shanka
5a8d603d9d
Merge "Allow callers to pass a flag to not link obb dirs of multiple users."
...
am: 0c8b8af74a
2019-03-06 16:46:51 -08:00
Sudheer Shanka
0c8b8af74a
Merge "Allow callers to pass a flag to not link obb dirs of multiple users."
2019-03-07 00:34:59 +00:00
Tao Bao
bd95736a22
Merge "mkbootimg: extract to 'second' if size not 0" am: a3d394e9bb am: 9130f5c950
...
am: 189e4a7c26
2019-03-06 16:33:53 -08:00
Mark Salyzyn
666a39e491
Merge changes I3506c8e7,I198c0e8c,I8a5d4e36 am: 6bd04c1570 am: 492ae86814
...
am: 0530d529a9
2019-03-06 16:13:22 -08:00
Tao Bao
189e4a7c26
Merge "mkbootimg: extract to 'second' if size not 0" am: a3d394e9bb
...
am: 9130f5c950
2019-03-06 15:33:43 -08:00
Mark Salyzyn
0530d529a9
Merge changes I3506c8e7,I198c0e8c,I8a5d4e36 am: 6bd04c1570
...
am: 492ae86814
2019-03-06 15:29:57 -08:00
Tao Bao
9130f5c950
Merge "mkbootimg: extract to 'second' if size not 0"
...
am: a3d394e9bb
2019-03-06 14:53:04 -08:00
Tao Bao
a3d394e9bb
Merge "mkbootimg: extract to 'second' if size not 0"
2019-03-06 22:43:33 +00:00
Mark Salyzyn
492ae86814
Merge changes I3506c8e7,I198c0e8c,I8a5d4e36
...
am: 6bd04c1570
2019-03-06 14:40:21 -08:00
Treehugger Robot
6bd04c1570
Merge changes I3506c8e7,I198c0e8c,I8a5d4e36
...
* changes:
fs_mgr: remount: automatically disable verity
fs_mgr: remount: pull root device from fstab
fs_mgr: test: track device active slot throughout
2019-03-06 21:53:52 +00:00
Josh Gao
3ed90b75da
adbd: cleanups in remount/verity.
...
1. Don't clear O_CLOEXEC on an fd we're duping to stdin/out/err: dup2
does that for us if oldfd != newfd, and we know the fd can't be
stdin/out/err.
2. Use unique_fd.
3. Remove gotos by breaking the remount logic into its own function.
Test: mma
Change-Id: If9929e7f20de445322fd498e1379a2d4e572cb52
2019-03-06 13:03:30 -08:00
Jiyong Park
c2776173cb
Merge "Access apex sysprops via the generated API" am: 51deeb569f am: 7c8576d435
...
am: 504ba80ad7
2019-03-06 10:40:21 -08:00
Jiyong Park
504ba80ad7
Merge "Access apex sysprops via the generated API" am: 51deeb569f
...
am: 7c8576d435
2019-03-06 10:10:11 -08:00
Jiyong Park
7c8576d435
Merge "Access apex sysprops via the generated API"
...
am: 51deeb569f
2019-03-06 09:51:44 -08:00
Treehugger Robot
51deeb569f
Merge "Access apex sysprops via the generated API"
2019-03-06 17:38:46 +00:00
Florian Mayer
9d3b79374d
Merge "Fix copy / move behaviour of Maps object." am: 30c898f1ca am: 7e345a00a1
...
am: 449355f920
2019-03-06 08:55:00 -08:00
Florian Mayer
449355f920
Merge "Fix copy / move behaviour of Maps object." am: 30c898f1ca
...
am: 7e345a00a1
2019-03-06 08:50:41 -08:00
Florian Mayer
7e345a00a1
Merge "Fix copy / move behaviour of Maps object."
...
am: 30c898f1ca
2019-03-06 08:46:39 -08:00
Florian Mayer
30c898f1ca
Merge "Fix copy / move behaviour of Maps object."
2019-03-06 16:31:10 +00:00
Mark Salyzyn
6a26b4b74d
fs_mgr: remount: automatically disable verity
...
Disable verity even if -R flag is not supplied.
Test: adb-remount-test.sh
Bug: 127494168
Change-Id: I3506c8e7d5525ca1d0685004c1fb7e26448fa648
2019-03-06 08:25:36 -08:00
Mark Salyzyn
3babd8488b
fs_mgr: remount: pull root device from fstab
...
For devices that do not support overlayfs that are system as root,
need to pull /dev/root device from / mount point in fstab.
Test: adb-remount-test.sh
Bug: 126256072
Change-Id: I198c0e8c60770508737318afde95db2966294ff5
2019-03-06 08:25:36 -08:00
Mark Salyzyn
448fc9783c
fs_mgr: test: track device active slot throughout
...
Report any discrepancy in the active slot.
Fix a problem with problematic error propagation for adb_cat()
Test: adb-remount-test.sh
Bug: 126256072
Change-Id: I8a5d4e364945c5e60d252333886987b8dca0cfb3
2019-03-06 08:25:36 -08:00
Yuvraj Saxena
ff5e99a6cd
mkbootimg: extract to 'second' if size not 0
...
Change-Id: I5f6804be6372371d51d5757f6a5700c07ed5e57f
2019-03-06 14:23:02 +00:00
Martijn Coenen
538e0b98c4
Update comments on native_handle_create.
...
To indicate limits.
Test: builds
Change-Id: Id5129a7f6a8f413911544dedeb02bb4e7a2f6e10
2019-03-06 14:22:10 +01:00
David Anderson
96296d5053
Merge "Use distinct GateKeeper userids when running a GSI." am: 5a465412b1 am: e4c58c492c
...
am: 8d6eff4fb5
2019-03-05 20:22:15 -08:00
Matthew Maurer
d44bd6ab5c
Merge "Clang-format before updating storage proxy" am: 2d85880b49 am: 71e96ea355
...
am: 7c9ef814b1
2019-03-05 19:39:51 -08:00
David Anderson
f0173d96d2
Merge "Support FiemapWriters that extend across multiple files." am: 925c78b7e8 am: 461c245b2e
...
am: a7a8e3c3cf
2019-03-05 19:37:25 -08:00
David Anderson
8d6eff4fb5
Merge "Use distinct GateKeeper userids when running a GSI." am: 5a465412b1
...
am: e4c58c492c
2019-03-05 19:37:22 -08:00
David Anderson
dd00737e15
Merge "Add more filesystem support to libfiemap_writer." am: 79a43cf135 am: 90c7e99998
...
am: 35bf6c9a82
2019-03-05 19:26:24 -08:00
David Anderson
e4c58c492c
Merge "Use distinct GateKeeper userids when running a GSI."
...
am: 5a465412b1
2019-03-05 19:22:10 -08:00
David Anderson
5a465412b1
Merge "Use distinct GateKeeper userids when running a GSI."
2019-03-06 02:40:03 +00:00
Matthew Maurer
7c9ef814b1
Merge "Clang-format before updating storage proxy" am: 2d85880b49
...
am: 71e96ea355
2019-03-05 18:20:27 -08:00
David Anderson
a7a8e3c3cf
Merge "Support FiemapWriters that extend across multiple files." am: 925c78b7e8
...
am: 461c245b2e
2019-03-05 18:18:19 -08:00
David Anderson
35bf6c9a82
Merge "Add more filesystem support to libfiemap_writer." am: 79a43cf135
...
am: 90c7e99998
2019-03-05 18:09:49 -08:00
Matthew Maurer
71e96ea355
Merge "Clang-format before updating storage proxy"
...
am: 2d85880b49
2019-03-05 17:25:11 -08:00
Treehugger Robot
2d85880b49
Merge "Clang-format before updating storage proxy"
2019-03-06 00:53:25 +00:00
