Commit graph

58950 commits

Author SHA1 Message Date
Automerger Merge Worker
ff651c06b8 Merge "liblog: fix header guards ordering" am: cd61376986 am: 8493f16832
Change-Id: Ia07ce585835d447a9ad468d58457ce635f85a957
2020-03-13 16:27:42 +00:00
Automerger Merge Worker
8493f16832 Merge "liblog: fix header guards ordering" am: cd61376986
Change-Id: I060d05016fe048c7f643f30f62f476ac190dd846
2020-03-13 16:03:13 +00:00
Tom Cherry
cd61376986 Merge "liblog: fix header guards ordering" 2020-03-13 15:48:19 +00:00
Automerger Merge Worker
1939280381 Merge "adb: support wait-for- with multiple states." am: 4fe694a9c1 am: a13edaac4e
Change-Id: Ia1b1aaf24eb18adf9d3905d6e43ec40367af366a
2020-03-13 15:43:21 +00:00
Automerger Merge Worker
a13edaac4e Merge "adb: support wait-for- with multiple states." am: 4fe694a9c1
Change-Id: Icd22ce47af70439a3ab3d28006e8a777585937ed
2020-03-13 15:30:59 +00:00
Elliott Hughes
4fe694a9c1 Merge "adb: support wait-for- with multiple states." 2020-03-13 15:19:34 +00:00
Automerger Merge Worker
b45c98f856 [automerger skipped] Merge "Make libselinux a stub library" into rvc-dev am: a94047be70 -s ours
am skip reason: Change-Id If418cbe3abdeacb759d59052e6dca4c2067678dd with SHA-1 3ffdad0cb5 is in history

Change-Id: If52caf2e5cc308faef47086fbd749e731eeb1caa
2020-03-13 05:39:31 +00:00
Jiyong Park
a94047be70 Merge "Make libselinux a stub library" into rvc-dev 2020-03-13 05:16:49 +00:00
Jiyong Park
8ce4a3067c Make libselinux a stub library
libselinux is currently being copied to APEXes. This is risky because
the library is not designed to be portable; part of it is tied to the
specific version of the Android that it was developed for.

This change fixes the problem by declaring that the library supports
a stub with the list of C APIs that are included in the stub. Then there
is only one copy of libselinux in /system/lib and other APEXes use the
copy by dynamically linking to it.

Also, adbd no longer statically links to it, because doing so brings
libselinux in it.

Bug: 151053366
Test: m com.android.adbd. It doesn't include libselinux in it.
Test: m com.android.adbd-deps-info. then inspect
out/soong/com.android.adbd-deps-info.txt. The dependency to libselinux
is shown as '(external)'.

Exempt-From-Owner-Approval: cherry-pick from AOSP

Merged-In: If418cbe3abdeacb759d59052e6dca4c2067678dd
(cherry picked from commit 3ffdad0cb5)
Change-Id: If418cbe3abdeacb759d59052e6dca4c2067678dd
2020-03-13 05:16:28 +00:00
Automerger Merge Worker
54afebf074 [automerger skipped] Merge "Add OptimizeSourceCopyOperation" into rvc-dev am: 5bcf6498c3 -s ours
am skip reason: Change-Id I86ca23fd589ddbc84c81318283b5f4e71782a759 with SHA-1 dee5225b6c is in history

Change-Id: Ia75f3d73bff5d718433318f51618ae379bad5c93
2020-03-13 00:05:38 +00:00
Yifan Hong
5bcf6498c3 Merge "Add OptimizeSourceCopyOperation" into rvc-dev 2020-03-12 23:53:03 +00:00
Automerger Merge Worker
35cb5cc14a Merge "init.rc: disable kernel module autoloading" am: e7f014da9c am: 0cef47636d
Change-Id: Ia597709b939a6a1699e364c448430b646a1dcd5e
2020-03-12 21:49:39 +00:00
Automerger Merge Worker
0cef47636d Merge "init.rc: disable kernel module autoloading" am: e7f014da9c
Change-Id: I2b83cdd3d121a3633a26157a4087f9a56f195121
2020-03-12 21:39:22 +00:00
Eric Biggers
e7f014da9c Merge "init.rc: disable kernel module autoloading" 2020-03-12 21:19:38 +00:00
Automerger Merge Worker
5300de0e3b Merge "Add OptimizeSourceCopyOperation" am: 6ae132fd10 am: a5876cd674
Change-Id: I1aff0f2bfce2db0de4e452f7faad3452eac89e24
2020-03-12 21:19:18 +00:00
Automerger Merge Worker
a5876cd674 Merge "Add OptimizeSourceCopyOperation" am: 6ae132fd10
Change-Id: Ib571e6e82731ad7cf9a4c8cedf3329470ed12853
2020-03-12 21:04:40 +00:00
Yifan Hong
6ae132fd10 Merge "Add OptimizeSourceCopyOperation" 2020-03-12 20:44:24 +00:00
Automerger Merge Worker
f1317fcc3a [automerger skipped] Merge "Remove mips pixelflinger." am: 86f83cf41e am: e7524d43a5 -s ours
am skip reason: Change-Id I7e743da2b6f142884b3c41fd60550a381df51d54 with SHA-1 2ba869b770 is in history

Change-Id: I80bb05568f92afe6553e28764f326e3b418b3163
2020-03-12 19:15:46 +00:00
Automerger Merge Worker
e7524d43a5 Merge "Remove mips pixelflinger." am: 86f83cf41e
Change-Id: Ie848b0f6edff90f1f393e255efe93c78c9636a0d
2020-03-12 18:58:21 +00:00
Elliott Hughes
86f83cf41e Merge "Remove mips pixelflinger." 2020-03-12 18:43:12 +00:00
Yifan Hong
d8a38e7c23 Add OptimizeSourceCopyOperation
... so that an operation can be skipped partially. For example, if
an operation contains blocks:
    563412 -> 123456
... then optimized operation is:
    5612 -> 1256

Test: update_engine_unittests
Test: apply incremental OTA
Bug: 148623880

In an experiment, this reduces CoW size of an incremental update
package by 200MB (out of 700MB).

Change-Id: I86ca23fd589ddbc84c81318283b5f4e71782a759
Merged-In: I86ca23fd589ddbc84c81318283b5f4e71782a759
2020-03-12 10:00:12 -07:00
Tom Cherry
227ac56454 liblog: fix header guards ordering
__ANDROID_API__ isn't defined on host, so this check will fail due to
-Wundef.  The || is short circuited through, so we can check for host
first and only have the right side of the || evaluated for device
builds.

Bug: 150898477
Bug: 151255209
Test: build
Change-Id: I2e0bc055ac0c7ba8262875801cdaed9cc30d2cef
2020-03-12 09:37:05 -07:00
Automerger Merge Worker
8e89ceea35 [automerger skipped] Merge "don't include liblog to APEXes" into rvc-dev am: c2a354be68 -s ours
am skip reason: Change-Id I5aab863cb12b8767b6979255c247000a59355b0e with SHA-1 95b6f45b0e is in history

Change-Id: Ic47ec107843393cef9aebb15f3a2b85715de3f62
2020-03-12 04:28:44 +00:00
Jiyong Park
c2a354be68 Merge "don't include liblog to APEXes" into rvc-dev 2020-03-12 04:10:15 +00:00
Automerger Merge Worker
1b1fd6f0db Merge "libfs_mgr_binder: Cleanup GetGsiService()" am: 133df17ea1 am: 30f22b376f
Change-Id: I903c979eb97778b0314b13a19c04af9d272a1251
2020-03-12 04:09:13 +00:00
Automerger Merge Worker
30f22b376f Merge "libfs_mgr_binder: Cleanup GetGsiService()" am: 133df17ea1
Change-Id: Ibb4c01a854c8c762e93188be7ff7d66d7894e1e9
2020-03-12 03:56:21 +00:00
Treehugger Robot
133df17ea1 Merge "libfs_mgr_binder: Cleanup GetGsiService()" 2020-03-12 03:37:52 +00:00
Automerger Merge Worker
18ee520e93 Merge "Make libselinux a stub library" am: b407502c98 am: 9281e97450
Change-Id: Ica4f4de8425f84eb6efb1321df1f5f78e3393464
2020-03-12 03:31:03 +00:00
Automerger Merge Worker
9281e97450 Merge "Make libselinux a stub library" am: b407502c98
Change-Id: I7145d1c9cfc35b40bdeb4dfa402cc953e4cd1985
2020-03-12 03:09:59 +00:00
Treehugger Robot
b407502c98 Merge "Make libselinux a stub library" 2020-03-12 02:57:14 +00:00
Automerger Merge Worker
8b56249119 Merge "adbd: make libadbd_services cc_library again." into rvc-dev am: 575d8c2c9e
Change-Id: Ib71d2210d244aa7c05fab931a5db1fe086979752
2020-03-12 02:21:16 +00:00
TreeHugger Robot
575d8c2c9e Merge "adbd: make libadbd_services cc_library again." into rvc-dev 2020-03-12 02:06:09 +00:00
Automerger Merge Worker
5dc6290c24 Merge "adb: Avoid a couple std::string constructions" am: 2442e64416 am: c2d303231d
Change-Id: I768760f4439b5403025bb3a91a8acedcf6fd4d47
2020-03-12 00:41:33 +00:00
Automerger Merge Worker
c2d303231d Merge "adb: Avoid a couple std::string constructions" am: 2442e64416
Change-Id: I6e89af8ee9133c03978f3fa543c0b777a5080402
2020-03-12 00:25:53 +00:00
Jiyong Park
3ffdad0cb5 Make libselinux a stub library
libselinux is currently being copied to APEXes. This is risky because
the library is not designed to be portable; part of it is tied to the
specific version of the Android that it was developed for.

This change fixes the problem by declaring that the library supports
a stub with the list of C APIs that are included in the stub. Then there
is only one copy of libselinux in /system/lib and other APEXes use the
copy by dynamically linking to it.

Also, adbd no longer statically links to it, because doing so brings
libselinux in it.

Bug: 151053366
Test: m com.android.adbd. It doesn't include libselinux in it.
Test: m com.android.adbd-deps-info. then inspect
out/soong/com.android.adbd-deps-info.txt. The dependency to libselinux
is shown as '(external)'.

Change-Id: If418cbe3abdeacb759d59052e6dca4c2067678dd
2020-03-12 00:02:18 +00:00
Automerger Merge Worker
50e25c5ca5 [automerger skipped] Merge "Revert "Stop & Resume property service when switching to bootstrap namespace"" into rvc-dev am: 293786f941 -s ours
am skip reason: Change-Id I2e11b782fcd2b7baded133a841fdcf519f702b84 with SHA-1 459ca0be74 is in history

Change-Id: I9fa67a5331b9c1bafb9715d4bd39492be60636ae
2020-03-11 23:35:29 +00:00
Treehugger Robot
2442e64416 Merge "adb: Avoid a couple std::string constructions" 2020-03-11 23:29:40 +00:00
Tom Cherry
293786f941 Merge "Revert "Stop & Resume property service when switching to bootstrap namespace"" into rvc-dev 2020-03-11 23:25:52 +00:00
Josh Gao
d1ee5085f3 adbd: make libadbd_services cc_library again.
For currently unknown reasons, sideloading is broken with
libadbd_services as a cc_library_static.

Partial revert of commit a9b62d5452.

Bug: http://b/151056300
Test: xunchang@ tested manually
Change-Id: Iaffad9c476ba0adcffc5db512ba4a7ee0fb5cb22
(cherry picked from commit 7f8a37c8c7)
2020-03-11 23:18:41 +00:00
Automerger Merge Worker
757974ee45 [automerger skipped] Merge "fs_mgr_get_mounted_entry_for_userdata: handle logical partitions" am: 34ae0c58d2 am: 203a724070 -s ours
am skip reason: Change-Id I1bb3e64ae92d56de905b4f7f1997b7499b101b0f with SHA-1 f495fe798b is in history

Change-Id: I229aeaa482a15419f522c2460f0f87708a23de7f
2020-03-11 22:03:40 +00:00
Automerger Merge Worker
203a724070 Merge "fs_mgr_get_mounted_entry_for_userdata: handle logical partitions" am: 34ae0c58d2
Change-Id: I37ddf7e2da1291bc9f042f675bb19e480ec1020a
2020-03-11 21:53:28 +00:00
Nikita Ioffe
34ae0c58d2 Merge "fs_mgr_get_mounted_entry_for_userdata: handle logical partitions" 2020-03-11 21:29:31 +00:00
Automerger Merge Worker
d6a7cc73ce Merge "run ext4 tools in first_stage_ramdisk" am: 8aeada63f2 am: 441f9aa043
Change-Id: I9e167632225f59006a1b0d46641da9417fbbcc66
2020-03-11 20:40:36 +00:00
Automerger Merge Worker
441f9aa043 Merge "run ext4 tools in first_stage_ramdisk" am: 8aeada63f2
Change-Id: Ice6ac1eeab966e4162fa3efbfcc47d757b1b3817
2020-03-11 20:29:16 +00:00
Automerger Merge Worker
1bfce05829 Merge "run ext4 tools in first_stage_ramdisk" into rvc-dev am: 26471f7470
Change-Id: I67edb8c26d62cc1b8a259e1a897c0f28e6a89ad3
2020-03-11 20:12:18 +00:00
Automerger Merge Worker
5eb1d36d87 Merge "fs_mgr_get_mounted_entry_for_userdata: handle logical partitions" into rvc-dev am: ccb0608a32
Change-Id: I3db58f6e096b934c7d5e9b05959e40a29451c46e
2020-03-11 20:08:57 +00:00
Jaegeuk Kim
26471f7470 Merge "run ext4 tools in first_stage_ramdisk" into rvc-dev 2020-03-11 20:05:22 +00:00
Treehugger Robot
8aeada63f2 Merge "run ext4 tools in first_stage_ramdisk" 2020-03-11 20:04:50 +00:00
Nikita Ioffe
17824f0590 fs_mgr_get_mounted_entry_for_userdata: handle logical partitions
In case of GSI on DSU, /data is mounted on the following stack:
userdata -> userdata_gsi -> actual block device, and fstab returned from
ReadDefaultFstab() function will say that /data should be
mounted onto userdata_gsi. This configuration wasn't supported.

To support it, fs_mgr_get_mounted_entry_for_userdata now unwinds the
dm-device stack /data is mounted onto, and for each entry in fstab
resolves corresponding block device (in case of logical partitions by
asking DeviceMapper to resolve name -> path, and for other cases by
reading a symlink), and then checking whenever resolved block device
belongs to the unwinded stack.

Test: on both normal boot & DSU
Test: atest CtsUserspaceRebootHostSideTestCases
Test: atest CtsFsMgrTestCases
Bug: 148612148
Change-Id: I1bb3e64ae92d56de905b4f7f1997b7499b101b0f
Merged-In: I1bb3e64ae92d56de905b4f7f1997b7499b101b0f
(cherry picked from commit f495fe798b)
2020-03-11 19:21:37 +00:00
Nikita Ioffe
ccb0608a32 Merge "fs_mgr_get_mounted_entry_for_userdata: handle logical partitions" into rvc-dev 2020-03-11 19:17:30 +00:00