Justin Yun
4e429dd370
Merge "Change search order for vendor processes in vndk_lite." am: 47e8300412 am: c8631a3e1f
...
am: 16826ca953
Change-Id: If404f2af92bb352186df50b35c5b29bd9bd32666
2019-02-12 19:50:13 -08:00
Justin Yun
16826ca953
Merge "Change search order for vendor processes in vndk_lite." am: 47e8300412
...
am: c8631a3e1f
Change-Id: I57b5ee2210ac5ea98c6df6106a925180da860e9f
2019-02-12 19:26:42 -08:00
Justin Yun
c8631a3e1f
Merge "Change search order for vendor processes in vndk_lite."
...
am: 47e8300412
Change-Id: Idae3845ee8cfa1f2c9bb00ab85c273af0f7a67b3
2019-02-12 19:15:07 -08:00
Treehugger Robot
47e8300412
Merge "Change search order for vendor processes in vndk_lite."
2019-02-13 01:57:08 +00:00
Justin Yun
023ff46e18
Change search order for vendor processes in vndk_lite.
...
Originally, vndk_lite does not include system/lib/vndk-* directory but
searching the required files in system/lib instead. However, in GSI,
they are using the vndk libs which has symbols than core variants.
To avoid this problem, allow the vendor processes in vndk_lite devices
to search system/lib prior to vndk libs.
Bug: 124063441
Test: Check boot for vndk_lite devices.
Change-Id: I89a72e9d43d6fb05f4b6d87bbd4500f8febfe970
2019-02-13 01:56:28 +00:00
Dongwon Kang
88e1ac5abe
Merge "Exclude libvndksupport from APEXes." am: 0b4f2532a7 am: 1fd25add88
...
am: 6588014f98
Change-Id: Ia619ae950238d18f404b30ece8480ee8d96b7a19
2019-02-12 17:13:29 -08:00
Dongwon Kang
6588014f98
Merge "Exclude libvndksupport from APEXes." am: 0b4f2532a7
...
am: 1fd25add88
Change-Id: I04124c9aa38de67572c26f914fe7f240704c03af
2019-02-12 17:08:35 -08:00
Dongwon Kang
1fd25add88
Merge "Exclude libvndksupport from APEXes."
...
am: 0b4f2532a7
Change-Id: I61e449d41c1829d1e0ed996eadeee6096461480d
2019-02-12 17:02:30 -08:00
Dongwon Kang
0b4f2532a7
Merge "Exclude libvndksupport from APEXes."
2019-02-13 00:40:53 +00:00
Tom Cherry
e20a69f996
Merge "Refactor fs_mgr_update_verity_state()" am: 5272f9b017 am: 99331422e0
...
am: 5f2cdb7ac8
Change-Id: I4db7b0041df6eac775ddea4523435cf2a818e714
2019-02-12 09:38:11 -08:00
Tom Cherry
5f2cdb7ac8
Merge "Refactor fs_mgr_update_verity_state()" am: 5272f9b017
...
am: 99331422e0
Change-Id: I690b9394f64137a7353fbba4cfca456760553e21
2019-02-12 09:33:26 -08:00
Tom Cherry
99331422e0
Merge "Refactor fs_mgr_update_verity_state()"
...
am: 5272f9b017
Change-Id: I23151b9a2c7bf28e4f62dfdbf5049d0100241cf1
2019-02-12 09:30:02 -08:00
Tom Cherry
5272f9b017
Merge "Refactor fs_mgr_update_verity_state()"
2019-02-12 17:22:09 +00:00
Steven Laver
275e9586a2
Merge "Allow properties to be derived from partition-specific properties during init" am: 944e6f1d17 am: 919a931f1e
...
am: 0ea78a5028
Change-Id: If0ecaaf4883f1a8a4e7a0b9602602e6fbcc9b863
2019-02-12 09:01:19 -08:00
Steven Laver
0ea78a5028
Merge "Allow properties to be derived from partition-specific properties during init" am: 944e6f1d17
...
am: 919a931f1e
Change-Id: Iebd8f7159fa029cfa443877b866d5fb7725aeb5c
2019-02-12 08:56:54 -08:00
Steven Laver
919a931f1e
Merge "Allow properties to be derived from partition-specific properties during init"
...
am: 944e6f1d17
Change-Id: I20fc0657ecb8d2dc383e1349bb01580d806138b7
2019-02-12 08:52:35 -08:00
Steven Laver
944e6f1d17
Merge "Allow properties to be derived from partition-specific properties during init"
2019-02-12 16:44:57 +00:00
Junyu Lai
70a1f5adea
Merge "Refactor OWNERS files for Android Core Networking" am: 1d7966bd46 am: 151677dc51
...
am: 639875b68f
Change-Id: Iaf3752fab481e38cddbcc8febcb31631df874306
2019-02-12 08:44:16 -08:00
Junyu Lai
639875b68f
Merge "Refactor OWNERS files for Android Core Networking" am: 1d7966bd46
...
am: 151677dc51
Change-Id: Ie3d009a984a961e28b067d96f214ec4da90a5bb5
2019-02-12 08:39:09 -08:00
Junyu Lai
151677dc51
Merge "Refactor OWNERS files for Android Core Networking"
...
am: 1d7966bd46
Change-Id: I6b29d05038e53895b8cd60fa08af2eaf388ec342
2019-02-12 08:35:00 -08:00
Junyu Lai
1d7966bd46
Merge "Refactor OWNERS files for Android Core Networking"
2019-02-12 16:20:27 +00:00
junyulai
1e9c3a50fb
Refactor OWNERS files for Android Core Networking
...
Bug: 120829091
Test: build/make/tools/checkowners.py -c -v path/OWNERS
Change-Id: Ia172b5e907a28441d288b84cd74ceea24c58cbcf
2019-02-12 13:25:13 +08:00
Jiyong Park
9d851839ca
Merge "apexd is started much earlier to create loopback devices" am: 34f3660e2c am: bc08d9d207
...
am: e5633c18a4
Change-Id: I97743dea1fa022844b7dcf5f33a42bc240e81708
2019-02-11 19:53:43 -08:00
Elliott Hughes
cc15540198
Merge "Clean up libcutils/libutils tests." am: 57150963a3 am: f984d7a403
...
am: 661ce4047d
Change-Id: Ib27d503602b52bcb6ff6c54a56ef678dcc7000d8
2019-02-11 19:52:35 -08:00
Jiyong Park
e5633c18a4
Merge "apexd is started much earlier to create loopback devices" am: 34f3660e2c
...
am: bc08d9d207
Change-Id: I8fccf1002a7f962bb9868cc4104b858e60cb99b1
2019-02-11 18:38:36 -08:00
Elliott Hughes
661ce4047d
Merge "Clean up libcutils/libutils tests." am: 57150963a3
...
am: f984d7a403
Change-Id: I9870edb8119ba3850b8f9863de439f3fa1fabaa8
2019-02-11 18:37:45 -08:00
Mark Salyzyn
b5bfaa93aa
Merge "bootstat: local GetProperty use libbase" am: 0554bccb7a am: ef2d4afd18
...
am: 162c92c4db
Change-Id: I9cb8a79e8a9736631b96bf67aa075826d18f3595
2019-02-11 18:11:09 -08:00
Jiyong Park
bc08d9d207
Merge "apexd is started much earlier to create loopback devices"
...
am: 34f3660e2c
Change-Id: I3132ba5196465e69a0bc38923487c9bf0ec6b3fb
2019-02-11 18:08:02 -08:00
Elliott Hughes
f984d7a403
Merge "Clean up libcutils/libutils tests."
...
am: 57150963a3
Change-Id: Ie4113224b9ac63caeed6ed8fa3ea9eb7125fa2a6
2019-02-11 18:07:05 -08:00
Mark Salyzyn
162c92c4db
Merge "bootstat: local GetProperty use libbase" am: 0554bccb7a
...
am: ef2d4afd18
Change-Id: Idae684bdee9d7cb1cb5e3276cfd499887f442d6d
2019-02-11 17:59:05 -08:00
Treehugger Robot
34f3660e2c
Merge "apexd is started much earlier to create loopback devices"
2019-02-12 01:55:03 +00:00
Treehugger Robot
57150963a3
Merge "Clean up libcutils/libutils tests."
2019-02-12 01:53:53 +00:00
Tom Cherry
30d24a5f74
Merge "Remove logic to fake /system in overlayfs" am: d2ae1c91ed am: 5d3c8c5bf9
...
am: 9b777f9268
Change-Id: I81d288a1047defedb0d0714bea2703b56e7c7dfc
2019-02-11 17:52:54 -08:00
Mark Salyzyn
ef2d4afd18
Merge "bootstat: local GetProperty use libbase"
...
am: 0554bccb7a
Change-Id: I209b0418696bc242d75a2f2301310b2f60a4553a
2019-02-11 17:51:51 -08:00
Treehugger Robot
0554bccb7a
Merge "bootstat: local GetProperty use libbase"
2019-02-12 01:42:51 +00:00
Tom Cherry
9b777f9268
Merge "Remove logic to fake /system in overlayfs" am: d2ae1c91ed
...
am: 5d3c8c5bf9
Change-Id: I416e0cc81aa5ef54bb55a15002c91a422942a44b
2019-02-11 17:35:07 -08:00
Tom Cherry
5d3c8c5bf9
Merge "Remove logic to fake /system in overlayfs"
...
am: d2ae1c91ed
Change-Id: I2878c258682defa379cf4a9bc68fad17e0f2c63f
2019-02-11 17:22:29 -08:00
Tom Cherry
d2ae1c91ed
Merge "Remove logic to fake /system in overlayfs"
2019-02-12 01:04:21 +00:00
Mark Salyzyn
88d308d786
bootstat: local GetProperty use libbase
...
libbase GetProperty collects the properties properly, which also
allow for content greater than 128 bytes in length.
Replace internal GetProperty and SetProperty helpers with libbase
version.
Test: unit tests
Bug: 121161069
Bug: 124114707
Change-Id: Ic0829955705ebaa19d747bb3f6942f4b9786316a
2019-02-11 13:16:59 -08:00
Elliott Hughes
01705e4f1d
Clean up libcutils/libutils tests.
...
Move tests in the same directory as the corresponding code, so it's
easier to see what is/isn't tested.
Fix naming of libcutils_tests (plural) to match the singular that's more
common (even though the plural makes more sense to me).
Add these two to system/core/'s TEST_MAPPING.
Remove obsolete AndroidTest.xml.
Fix a flaky (timing-dependent) libcutils test.
Test: ran tests
Change-Id: I7e0a31ff45c8a152562bf66fc97161594249366e
2019-02-11 13:15:56 -08:00
Tom Cherry
cf80b6d6e5
Refactor fs_mgr_update_verity_state()
...
fs_mgr_update_verity_state() has two callers with generally different
intentions. One caller loops through all entries in the default fstab
to set partition.<mount_point>.verified properties. The other caller
is only interested in whether or a specific mount point has verity
enabled.
Given this, we refactor fs_mgr_update_verity_state() to
fs_mgr_get_verity_mount_point() which takes a single FstabEntry and
returns the mount point used for the dm-verity device or an empty
option if verity is not enabled on that mount point.
Test: adb-remount-test.sh test on blueline
Change-Id: Ic7dd8390509e95b2931b21e544c919a544138864
2019-02-11 12:50:22 -08:00
Dongwon Kang
9dff515bdb
Exclude libvndksupport from APEXes.
...
Test: build, boot, and checked mount paths.
Bug: 123948402
Change-Id: I687dde4f3d1a7971f68c7c536de5002dcdaecfa4
2019-02-11 11:14:11 -08:00
Tom Cherry
b712753446
Merge "liblog: remove visibility macros" am: ea57928f00 am: 4f05886f51
...
am: 9436c0dc9f
Change-Id: Ie9c7a487a7c5b9a6399a10d2da474810e5c93bcf
2019-02-11 11:12:01 -08:00
Tom Cherry
9436c0dc9f
Merge "liblog: remove visibility macros" am: ea57928f00
...
am: 4f05886f51
Change-Id: I760f29b7e54e5863968528a04416ad8dbf644204
2019-02-11 11:03:32 -08:00
Tom Cherry
4f05886f51
Merge "liblog: remove visibility macros"
...
am: ea57928f00
Change-Id: I5edc052fc08d4d56ff5dd2657b1d25e7736a3830
2019-02-11 10:57:51 -08:00
Tom Cherry
ea57928f00
Merge "liblog: remove visibility macros"
2019-02-11 18:43:13 +00:00
Erick Reyes
5ea38039f0
Merge "meminfo: make dmabuf_dump dependency on debugfs optional" am: 38c143e8c0 am: b49ddbc5c1
...
am: 00b5fd5c88
Change-Id: If97ada7f05b0b841759f2d4994dfc503cf3d4130
2019-02-10 08:24:19 -08:00
Erick Reyes
4cbea6cbd2
Merge "libmeminfo: make libdmabufinfo and dmabuf_dump vendor available" am: 2d31b4b023 am: 9321874f2e
...
am: dde98330cb
Change-Id: Ib34e58121f6cf17d577594fa23782c5e95496ee8
2019-02-10 08:23:27 -08:00
Erick Reyes
00b5fd5c88
Merge "meminfo: make dmabuf_dump dependency on debugfs optional" am: 38c143e8c0
...
am: b49ddbc5c1
Change-Id: Ib749ce175ca479fa748ab30486c906eb93fb31b1
2019-02-10 08:19:03 -08:00
Erick Reyes
dde98330cb
Merge "libmeminfo: make libdmabufinfo and dmabuf_dump vendor available" am: 2d31b4b023
...
am: 9321874f2e
Change-Id: Ifa04e0bcba6e9a79c96ef079f083e410e98bca84
2019-02-10 08:18:20 -08:00