Commit graph

43366 commits

Author SHA1 Message Date
David Anderson
f2d0524fbe Merge "fastboot: Add vbmeta_mainline to the partition list." am: d800caf345
am: 0f863e101a

Change-Id: Ie8b559cfc7f80511e3974380539ecf7566765ae5
2018-09-18 14:22:46 -07:00
Tom Cherry
5c8e0dcd13 Merge "init: move selinux and seccomp set up to 2nd stage init." am: f273b21232
am: 5cb188a595

Change-Id: Id346d29e33d8f30964f99bdfa51750a40df23d2b
2018-09-18 14:21:35 -07:00
David Anderson
0f863e101a Merge "fastboot: Add vbmeta_mainline to the partition list."
am: d800caf345

Change-Id: Ia62e125dfdccaaff258f3a6aa01ec3fbdc24902b
2018-09-18 14:10:19 -07:00
Tom Cherry
5cb188a595 Merge "init: move selinux and seccomp set up to 2nd stage init."
am: f273b21232

Change-Id: Ibc35321ddcbd6327f45bbed8ebf2b82100ba8bb0
2018-09-18 14:05:19 -07:00
Treehugger Robot
d800caf345 Merge "fastboot: Add vbmeta_mainline to the partition list." 2018-09-18 21:03:15 +00:00
Tom Cherry
f273b21232 Merge "init: move selinux and seccomp set up to 2nd stage init." 2018-09-18 20:48:38 +00:00
Tom Cherry
d9e53dacf5 init: move selinux and seccomp set up to 2nd stage init.
If there is no valid pre-compiled SEPolicy policy, init may call
secilc, which exists on the system partition.  1st stage init won't
always live on this partition, so we need to move this SELinux setup
to 2nd stage init, which always lives on the system partition, to
ensure that both secilc and its caller are updated together.

Bug: 114059212
Test: hikey boots, sailfish boots
Change-Id: Iaf7b4af4a5c2ace16755ec2e54510ab95c53f041
2018-09-18 11:24:56 -07:00
Chih-Hung Hsieh
6b18f29be9 Merge "Fix clang-tidy performance warnings in system/core." am: 146fd24c4b
am: 8ec85ebdf0

Change-Id: I2593f77fe8347283378b80f237480a71311add6a
2018-09-18 11:03:59 -07:00
Chih-Hung Hsieh
8ec85ebdf0 Merge "Fix clang-tidy performance warnings in system/core."
am: 146fd24c4b

Change-Id: I8e681799aaacfb647e61c4c3b5204ac28c4f47c3
2018-09-18 10:49:25 -07:00
Treehugger Robot
146fd24c4b Merge "Fix clang-tidy performance warnings in system/core." 2018-09-18 17:32:20 +00:00
Steven Moreland
5f42799a7e Merge "Add libbinder_ndk to public.libraries.*" am: a285a8416c
am: 2d6895ef0f

Change-Id: I25b227d81f819a5a99c22ebda993dfe6f6187627
2018-09-18 08:48:27 -07:00
Steven Moreland
2d6895ef0f Merge "Add libbinder_ndk to public.libraries.*"
am: a285a8416c

Change-Id: If495545707d56cb21bf0d5959d4501dfb81d36b7
2018-09-18 08:34:34 -07:00
Steven Moreland
a285a8416c Merge "Add libbinder_ndk to public.libraries.*" 2018-09-18 15:19:44 +00:00
Josh Gao
cfb22d3e76 Merge "tombstoned: don't generate tombstones for native backtraces." am: 11c7f43b90
am: 88413d74ef

Change-Id: I4528da468d1c8f28d4ca9b07c9201fdf9e258add
2018-09-17 17:45:49 -07:00
Josh Gao
88413d74ef Merge "tombstoned: don't generate tombstones for native backtraces."
am: 11c7f43b90

Change-Id: Ieb6592be38fbe291e7828e038b6c2d7d05297c6e
2018-09-17 17:39:20 -07:00
David Anderson
1109c92bea fastboot: Add vbmeta_mainline to the partition list.
Bug: 115939310
Test: fastboot flash vbmeta_mainline works
      fastboot flashall includes vbmeta_mainline

Change-Id: I081660cd8437ac66cab750b270f5019230050285
2018-09-17 17:34:22 -07:00
Josh Gao
11c7f43b90 Merge "tombstoned: don't generate tombstones for native backtraces." 2018-09-17 23:57:06 +00:00
Xin Li
60af7220a7 Merge "Don't attempt to create 'mkdir' and '-p' directories." am: e329879dbf
am: 095b6e89db

Change-Id: I168e0364798ffb7cc96034227aebd92193cb4626
2018-09-17 16:28:19 -07:00
Xin Li
095b6e89db Merge "Don't attempt to create 'mkdir' and '-p' directories."
am: e329879dbf

Change-Id: Id8d6943e83835e3ab180b689c210f0cf16f91689
2018-09-17 16:22:10 -07:00
Treehugger Robot
e329879dbf Merge "Don't attempt to create 'mkdir' and '-p' directories." 2018-09-17 23:11:28 +00:00
Chih-Hung Hsieh
42bf30651b Fix clang-tidy performance warnings in system/core.
* Use more efficient overloaded string methods.

Bug: 30411878
Test: build with WITH_TIDY=1
Change-Id: I449347565f83fae14ea337d0b3173beb5a56e0ca
2018-09-17 15:18:57 -07:00
Xin Li
17216455ad Don't attempt to create 'mkdir' and '-p' directories.
Test: build
Bug: 115920063
Change-Id: I65c60bfe0ca758a4213f10754bc872ea9885ca19
2018-09-17 14:20:16 -07:00
Steven Moreland
dd8eee871b Add libbinder_ndk to public.libraries.*
Bug: 111445392
Test: atest android.binder.cts.NdkBinderTest
Change-Id: I8ccb1f74654dcb925cd3ac20042cbffd2f594bb9
Merged-In: I8ccb1f74654dcb925cd3ac20042cbffd2f594bb9
2018-09-17 20:05:27 +00:00
Chih-hung Hsieh
229d380b14 Merge "Suppress implicit-fallthrough warnings." am: 16fef65f9e
am: 3784224654

Change-Id: I42f2e5fcbc5308b3bb2b688bfeda11a496158d4f
2018-09-17 11:47:34 -07:00
Chih-hung Hsieh
3784224654 Merge "Suppress implicit-fallthrough warnings."
am: 16fef65f9e

Change-Id: I71bdcd891f5d41fb90a9e7726aecbf2decdeed2c
2018-09-17 11:29:34 -07:00
Chih-hung Hsieh
16fef65f9e Merge "Suppress implicit-fallthrough warnings." 2018-09-17 17:36:09 +00:00
Chih-Hung Hsieh
502f4864d6 Suppress implicit-fallthrough warnings.
Add FALLTHROUGH_INTENDED for clang compiler.

Bug: 112564944
Test: build with global -Wimplicit-fallthrough.
Change-Id: I40f8bbf94e207c9dd90921e9b762ba51abab5777
2018-09-17 16:50:11 +00:00
Josh Gao
077e5b7dbf Merge "adbd: fix remount on non-system-as-root devices." am: c2501fda60
am: 31d40d0235

Change-Id: I81de8d605b96d2e7ad55d452e85d63cd185e2224
2018-09-14 17:41:01 -07:00
Peter Collingbourne
29dddac927 Merge "libadbd_services: Link libselinux dynamically instead of statically." am: 9cd2a8c2b5
am: 31e1c3f189

Change-Id: I7cdd09eb7c3461cef08753f8f6bf49e1b19a91e5
2018-09-14 17:31:02 -07:00
Josh Gao
31d40d0235 Merge "adbd: fix remount on non-system-as-root devices."
am: c2501fda60

Change-Id: Idc56e32bc71aa82e0a80cbb1ac537b06e89c7129
2018-09-14 17:20:56 -07:00
Peter Collingbourne
31e1c3f189 Merge "libadbd_services: Link libselinux dynamically instead of statically."
am: 9cd2a8c2b5

Change-Id: I7e65656edf84b4fbc01af69b03f67bea88636493
2018-09-14 17:14:29 -07:00
Treehugger Robot
c2501fda60 Merge "adbd: fix remount on non-system-as-root devices." 2018-09-14 23:24:44 +00:00
Peter Collingbourne
9cd2a8c2b5 Merge "libadbd_services: Link libselinux dynamically instead of statically." 2018-09-14 22:45:55 +00:00
Tom Cherry
45a7ccf915 Merge "Add OWNERS for libprocessgroup" am: 8485d59790
am: 8976f4f0d5

Change-Id: Id20b68ae44f5f80d91c3e8ab45cf01ea7be45226
2018-09-14 14:34:18 -07:00
Josh Gao
96d445d846 adbd: fix remount on non-system-as-root devices.
The system image is now a root image, even on devices that don't use
system-as-root. Fix remount to always remount /, to account for this.

Bug: http://b/115751838
Test: `adb remount; adb shell mount | grep " / "`
Change-Id: I2d89a795bd0bc53af33fe69c9d049bbb64d26f3b
2018-09-14 14:32:27 -07:00
Tom Cherry
8976f4f0d5 Merge "Add OWNERS for libprocessgroup"
am: 8485d59790

Change-Id: If7ec55bfe714b14746833abc605638c2931f871d
2018-09-14 14:28:08 -07:00
Treehugger Robot
8485d59790 Merge "Add OWNERS for libprocessgroup" 2018-09-14 21:08:32 +00:00
Josh Gao
2b22ae132f tombstoned: don't generate tombstones for native backtraces.
Previously, if an intercept ends before we ask for a file descriptor
when doing a backtrace, we'll create a tombstone file instead.

Bug: http://b/114139908
Bug: http://b/115349586
Test: debuggerd_test32
Change-Id: I23c7bb8ae5a982a4374a862d0a4f17bee03eb1d9
2018-09-14 14:06:47 -07:00
Tom Cherry
0ed7988c2b Merge "Fixed the can not kill some process using libprocessgroup" am: 0799f44497
am: 1b1b0a3700

Change-Id: Ide3e01ea4eefcc0482d45ba32b04bdbbb3ddbbfd
2018-09-14 11:35:44 -07:00
Tom Cherry
1b1b0a3700 Merge "Fixed the can not kill some process using libprocessgroup"
am: 0799f44497

Change-Id: I629a33f9c950811ae82a0a83a98292934f0eebde
2018-09-14 11:29:20 -07:00
Tom Cherry
b1cb37b077 Add OWNERS for libprocessgroup
Test: n/a
Change-Id: I7c069e439cf1d9d26fd5274647567fb1c5575a72
2018-09-14 11:13:22 -07:00
Tom Cherry
0799f44497 Merge "Fixed the can not kill some process using libprocessgroup" 2018-09-14 18:11:17 +00:00
Yifan Hong
1c09a4d12b Merge "storaged: change log level for health HAL calls" am: 6d899718ef
am: 83df2a732c

Change-Id: Ib034a3efffa4e577c914b07ff78f8b539ddd589a
2018-09-14 08:52:28 -07:00
Yifan Hong
83df2a732c Merge "storaged: change log level for health HAL calls"
am: 6d899718ef

Change-Id: Ia705474e6c106078e0a3aaa6f7fd8681077a54aa
2018-09-14 08:45:45 -07:00
Treehugger Robot
6d899718ef Merge "storaged: change log level for health HAL calls" 2018-09-14 15:37:00 +00:00
Tom Cherry
60c9e1f2d8 Merge "init: allow using the recovery image for 1st stage init" am: 11b4cde8be
am: a883bd37df

Change-Id: Ic92846a815bdd367712128bfb6a61a57feed21aa
2018-09-13 17:51:32 -07:00
Tom Cherry
a883bd37df Merge "init: allow using the recovery image for 1st stage init"
am: 11b4cde8be

Change-Id: Idd58c44fab278d678d3550918c130b9b0192c75f
2018-09-13 17:32:07 -07:00
Tom Cherry
11b4cde8be Merge "init: allow using the recovery image for 1st stage init" 2018-09-13 23:46:14 +00:00
Tom Cherry
bbb1d1a698 init: allow using the recovery image for 1st stage init
For A/B devices, the recovery image is typically provided as a ramdisk
paired with boot.img.  Instead of repartitioning these devices to have
a separate recovery partition and have the new 1st stage ramdisk
paired with the boot.img, this allows setting
androidboot.force_normal_boot=1 on the kernel command line to have init
in recovery boot directly to a normal boot.

This requires /system_recovery_mount to be added in the DT fstab for
the system partition.

Bug: 114062208
Test: hikey boots
Change-Id: I1e331b5cca91152d20ca92549779ab41aa9cd431
2018-09-13 23:45:58 +00:00
Peter Collingbourne
fc0373706d libadbd_services: Link libselinux dynamically instead of statically. 2018-09-13 14:34:04 -07:00