Commit graph

47397 commits

Author SHA1 Message Date
Srinivas Paladugu
6fabbecd97 Merge "Allow write access to system_server on zram sysfs" 2019-01-18 23:00:32 +00:00
Matthew Maurer
e8b561d83c Merge "trusty: Avoid unnecessary use of static libtrusty" am: 52ca777e57 am: 327f502af7
am: 3a6a501def

Change-Id: Ie5ff66395b19f9fb05f91aa12c113029408a4f7e
2019-01-18 14:24:48 -08:00
Matthew Maurer
3a6a501def Merge "trusty: Avoid unnecessary use of static libtrusty" am: 52ca777e57
am: 327f502af7

Change-Id: I3b9fd3a60c6c1d0c1f770e1f203b25ad23e511cc
2019-01-18 14:17:36 -08:00
Matthew Maurer
327f502af7 Merge "trusty: Avoid unnecessary use of static libtrusty"
am: 52ca777e57

Change-Id: I41d66c359efaccf16ec1c86028ec5081f2b53553
2019-01-18 14:10:46 -08:00
Treehugger Robot
52ca777e57 Merge "trusty: Avoid unnecessary use of static libtrusty" 2019-01-18 21:54:39 +00:00
Yabin Cui
a751dc19df Merge "Add simpleperf in system shell utilities." am: 48ad6aea22 am: f2be528947
am: a67abb1be6

Change-Id: Ib351ae54eb4a8244ff3fcc22fd666cccdda6855b
2019-01-18 13:01:48 -08:00
Yabin Cui
a67abb1be6 Merge "Add simpleperf in system shell utilities." am: 48ad6aea22
am: f2be528947

Change-Id: I8c7a90b00328621356aabdb807f6257fc0cb7f27
2019-01-18 12:57:45 -08:00
Yabin Cui
f2be528947 Merge "Add simpleperf in system shell utilities."
am: 48ad6aea22

Change-Id: I4b0a6a46a823661055642cdc823a00ef6604cd2f
2019-01-18 12:52:27 -08:00
Tao Bao
eb1ec435ff Merge "init: Remove the obsolete restorecon for /sbin files." am: 60fc999722 am: 34a080bf6b
am: 7fc71186c8

Change-Id: I9d332a8d7e975a3452678c198df96c544853caad
2019-01-18 12:51:06 -08:00
Yabin Cui
48ad6aea22 Merge "Add simpleperf in system shell utilities." 2019-01-18 20:43:53 +00:00
Tao Bao
7fc71186c8 Merge "init: Remove the obsolete restorecon for /sbin files." am: 60fc999722
am: 34a080bf6b

Change-Id: Ic5dac0a0104a030d8c6d9560fb178328360e1cc8
2019-01-18 12:21:39 -08:00
Tao Bao
34a080bf6b Merge "init: Remove the obsolete restorecon for /sbin files."
am: 60fc999722

Change-Id: Ic5ddeb85f554ac4a34165454300fa8c5ade9a609
2019-01-18 11:57:36 -08:00
Treehugger Robot
60fc999722 Merge "init: Remove the obsolete restorecon for /sbin files." 2019-01-18 19:35:26 +00:00
Mark Salyzyn
02a1186d69 Merge "adb_remount_test allow to run on eng builds." am: 99ff4dd35d am: 5fb43a8787
am: eea99b5ef4

Change-Id: I76429cb817d24d8beab2c1d866bbddc2a202c885
2019-01-18 10:28:19 -08:00
Mark Salyzyn
eea99b5ef4 Merge "adb_remount_test allow to run on eng builds." am: 99ff4dd35d
am: 5fb43a8787

Change-Id: Iba994622994d6eac47133b99511fcacf21bfd517
2019-01-18 10:23:05 -08:00
Mark Salyzyn
5fb43a8787 Merge "adb_remount_test allow to run on eng builds."
am: 99ff4dd35d

Change-Id: Id4057f13145573cbf59ead2b59110eb7184adc28
2019-01-18 10:18:23 -08:00
Treehugger Robot
99ff4dd35d Merge "adb_remount_test allow to run on eng builds." 2019-01-18 18:03:56 +00:00
Branden Archer
358ffbe610 [automerger skipped] Run BoringSSL self test during startup am: 66d9e9231e -s ours
am: d35e0b55ec -s ours
am skip reason: change_id I07a5dc73a314502c87de566bb26f4d73499d2675 with SHA1 d052118702 is in history

Change-Id: I7c5f57a3d07590ad98c0dbed992da1005a7c3ceb
2019-01-18 08:41:48 -08:00
Branden Archer
d35e0b55ec [automerger skipped] Run BoringSSL self test during startup
am: 66d9e9231e -s ours
am skip reason: change_id I07a5dc73a314502c87de566bb26f4d73499d2675 with SHA1 d052118702 is in history

Change-Id: If1354cdf11a654b78d6217ac9c23314e96dcef76
2019-01-18 08:38:33 -08:00
Jiyong Park
d7daac2c75 Merge changes from topic "revert_move_bionic_to_apex" am: e0c7a8bbdd am: 555b7ead70
am: e9f4339db8

Change-Id: Ic4054f6ea0845ff6576b0ada314e01e7b0eb7299
2019-01-18 02:41:06 -08:00
Jiyong Park
e9f4339db8 Merge changes from topic "revert_move_bionic_to_apex" am: e0c7a8bbdd
am: 555b7ead70

Change-Id: Ibdd191f5e6e4c7fc953bc39a050afa7b23c4335e
2019-01-18 02:36:57 -08:00
Jiyong Park
555b7ead70 Merge changes from topic "revert_move_bionic_to_apex"
am: e0c7a8bbdd

Change-Id: I7d6857980fd2bcfcaeb320971b6b593d11415dbb
2019-01-18 02:33:09 -08:00
Treehugger Robot
e0c7a8bbdd Merge changes from topic "revert_move_bionic_to_apex"
* changes:
  Revert "Identify post-apexd crashing processes"
  Revert "Bionic libs and the dynamic linker are bind mounted"
  Revert "Don't create separate mount namespaces for pre-apexd processes"
2019-01-18 10:21:46 +00:00
Sandeep Patil
d378b6ccc2 Merge "fiemap_writer: Add PinStatus check for fiemap writes." am: db787a0b05 am: 49fd889a8a
am: aec9eb017c

Change-Id: Ib9dd0fdda2d9f315c3f9d64cec9f03132c7587eb
2019-01-17 19:58:54 -08:00
Sandeep Patil
aec9eb017c Merge "fiemap_writer: Add PinStatus check for fiemap writes." am: db787a0b05
am: 49fd889a8a

Change-Id: I9fd33cbd6d2a3ca1af42da4556d02e381ef41d2c
2019-01-17 19:54:43 -08:00
Sandeep Patil
49fd889a8a Merge "fiemap_writer: Add PinStatus check for fiemap writes."
am: db787a0b05

Change-Id: Ia219be13c25f8e02c5ed07ef4eea1637de5afc14
2019-01-17 19:50:34 -08:00
Treehugger Robot
db787a0b05 Merge "fiemap_writer: Add PinStatus check for fiemap writes." 2019-01-18 03:40:28 +00:00
Jiyong Park
60b89aee4c Revert "Identify post-apexd crashing processes"
This reverts commit c661b660fe.
Reason: Breaks some 3p apps.

Bug: 122920047
Test: run the app, login.
Change-Id: Ie56ea5516887b885579764929e82e4fe684a7dcf
2019-01-18 12:30:54 +09:00
Jiyong Park
8b73dfc0a4 Revert "Bionic libs and the dynamic linker are bind mounted"
This reverts commit 2599088ff6.
Reason: Breaks some 3p apps.

Bug: 122920047
Test: run the app, login.
Change-Id: Idea332b1f91e9d2ac6ebd3879da7820c8ba2284f
2019-01-18 12:30:51 +09:00
Jiyong Park
80aec3f0f0 Revert "Don't create separate mount namespaces for pre-apexd processes"
This reverts commit 5ab1300481.

Reason: Breaks some 3p apps.

Bug: 122920047
Test: run the app, login.
Change-Id: Iec3347d7f35fbb6f32fd1192135a0cf87dc123a7
2019-01-18 12:30:39 +09:00
Cody Schuffelen
44b614ea7d Merge "Combine tcp_connect and socket_spec_connect." am: 539c4d427b am: 6d05846ab0
am: dfc2d87c7f

Change-Id: I2ec7b7b6f008cdca091160536e959ab5dc661024
2019-01-17 18:46:31 -08:00
Cody Schuffelen
dfc2d87c7f Merge "Combine tcp_connect and socket_spec_connect." am: 539c4d427b
am: 6d05846ab0

Change-Id: I6339087d16b4f579e00fe608c5562702b0375c92
2019-01-17 18:41:16 -08:00
Cody Schuffelen
6d05846ab0 Merge "Combine tcp_connect and socket_spec_connect."
am: 539c4d427b

Change-Id: I9a77cde0bdda07c2a90e54c76fb5bc9abb2601a8
2019-01-17 18:37:05 -08:00
Cody Schuffelen
539c4d427b Merge "Combine tcp_connect and socket_spec_connect." 2019-01-18 02:28:50 +00:00
Evgenii Stepanov
a2cdc6ae3c Merge "Re-enable asan on /init." am: 9c334367fd am: 17d5f8ad20
am: 18589dbbb0

Change-Id: I381f49e2d7fc829f357d38d134a30bfaa46ca911
2019-01-17 18:25:01 -08:00
Evgenii Stepanov
18589dbbb0 Merge "Re-enable asan on /init." am: 9c334367fd
am: 17d5f8ad20

Change-Id: I36232326fbd18d6d8e065f2fd133c3a7ad6cd8b9
2019-01-17 18:14:23 -08:00
Evgenii Stepanov
17d5f8ad20 Merge "Re-enable asan on /init."
am: 9c334367fd

Change-Id: I2fc6aee86292034ae32136f430d5de3ae5d9c448
2019-01-17 18:10:13 -08:00
Treehugger Robot
9c334367fd Merge "Re-enable asan on /init." 2019-01-18 01:56:43 +00:00
Tom Cherry
9644a837ae Merge "Statically link liblog to logd/logcat and their tests" am: 77d895b739 am: f81d1979ff
am: f096e2d931

Change-Id: I4a2a84a56fb772b9223165869e50849642ea29b3
2019-01-17 16:18:33 -08:00
Cody Schuffelen
af0e220fb1 Combine tcp_connect and socket_spec_connect.
This will make it easier to add new types of transports by combining the
logic the adb server and adb daemon use to connect to things.

Bug:121166534
Test: adb connect against a cuttlefish instance over the shm proxy.
Change-Id: Ic7fc848c60a85eef968c3735838c87cb7fdaf38b
2019-01-17 15:58:41 -08:00
Sandeep Patil
5ba1c068a2 fiemap_writer: Add PinStatus check for fiemap writes.
Note that the check needs the kernel built with latest f2fs.

Bug: 122138114
Test: fiemap_writer_test /dev/block/sda21 \
      --gtest_filter=VerifyBlockWritesF2fs.CheckWrites

Change-Id: I0afbc14241f74ed368438a64afbdb97e3376f1f6
Signed-off-by: Sandeep Patil <sspatil@google.com>
2019-01-17 15:57:40 -08:00
Jonglin Lee
123301b5bd Merge "init: dump less debug logs when unmount timeout" am: 1945fbef10 am: 31cd4f16b2
am: 80af251e39

Change-Id: I226294f33f09cc90b50a98febe21a5583adcb3e5
2019-01-17 15:39:15 -08:00
Tom Cherry
f096e2d931 Merge "Statically link liblog to logd/logcat and their tests" am: 77d895b739
am: f81d1979ff

Change-Id: Iaa45652fd1d1b2c16ba454c5df299967568f26ac
2019-01-17 15:38:11 -08:00
Yabin Cui
1eb462ba11 Add simpleperf in system shell utilities.
This is to ship simpleperf on user device.

Bug: 118835348
Test: build.
Change-Id: Ice37fc672d4d273fff67b3ffe49f2e83929fdc9f
2019-01-17 15:28:00 -08:00
Jonglin Lee
80af251e39 Merge "init: dump less debug logs when unmount timeout" am: 1945fbef10
am: 31cd4f16b2

Change-Id: Ibf8223ec0469305a97cd4a2caf4323c50b168e05
2019-01-17 15:16:13 -08:00
Tom Cherry
f81d1979ff Merge "Statically link liblog to logd/logcat and their tests"
am: 77d895b739

Change-Id: I68cdff95f0143b87d9d4453aa350ad1720637e58
2019-01-17 15:06:25 -08:00
Jonglin Lee
31cd4f16b2 Merge "init: dump less debug logs when unmount timeout"
am: 1945fbef10

Change-Id: I78380e8ed273612698da63391c0c7bb103bed806
2019-01-17 15:03:21 -08:00
Tao Bao
a68d8c9ea3 init: Remove the obsolete restorecon for /sbin files.
These files, including their building rules, have been removed in favor
of their dynamically linked versions; we no longer need to explicitly
restorecon the actual files either, for the same reason as in commit
05f96a2561. When doing normal boot, these
files come from system.img, which have been labeled at build time; when
booting recovery, they don't need dedicated labels to be functional.

Test: Build and boot crosshatch.
Test: Factory reset under recovery on taimen (mke2fs).
Test: Factory reset under recovery on crosshatch (make_f2fs).
Change-Id: Icbcd24aad8be1e7f4ba7d379acd5855d256ae106
2019-01-17 14:52:29 -08:00
Xin Li
326d649066 [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190105.001) into master" am: c541731521 -s ours am: 51d6a3cf71 -s ours
am: a36f0bc4c0 -s ours
am skip reason: subject contains skip directive

Change-Id: I071535acec92b75dbb30b7ee74e44eec38070d60
2019-01-17 14:30:09 -08:00
Tom Cherry
77d895b739 Merge "Statically link liblog to logd/logcat and their tests" 2019-01-17 22:27:43 +00:00