Commit graph

62801 commits

Author SHA1 Message Date
Tom Cherry
ec0ffbcff3 Merge "Use libcutils_headers for android_filesystem_config.h" am: 67e08784ed
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1430209

Change-Id: I361e212e084ea073c5eca6b3e1abc09a42004d8a
2020-09-21 15:51:52 +00:00
Tom Cherry
67e08784ed Merge "Use libcutils_headers for android_filesystem_config.h" 2020-09-21 15:29:41 +00:00
Jooyung Han
ed8016598a Merge "ueventd: scans /apex/*/firmware for firmwares" am: 62ccfa0c61
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1429856

Change-Id: I541c8c6ce99c3d47ede3e5524d0f4042f9ff52b9
2020-09-19 23:18:51 +00:00
Jooyung Han
62ccfa0c61 Merge "ueventd: scans /apex/*/firmware for firmwares" 2020-09-19 22:47:26 +00:00
Josh Gao
9a80494702 Merge "adbd: Fix check against valid payload size" am: 596f3b5384
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1428117

Change-Id: If2d4f89a99e1c5d877313b23ef9857e30c106abe
2020-09-19 05:46:00 +00:00
Peter Collingbourne
3d54f29163 Merge "Dump the per-thread TAGGED_ADDR_CTRL value if available." am: 43ebae3e5d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1427037

Change-Id: I5497bb0d4692db12e057927b551331466a456872
2020-09-19 05:35:45 +00:00
Bill Yi
de31e1689c Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 691a80ca09
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1431351

Change-Id: I74319a4fc56145bee7851a0916b3f6cd26479a02
2020-09-19 05:23:10 +00:00
Bill Yi
cf105b5e1a Merge mainline-release 6664920 to master - DO NOT MERGE am: 34ecedbcc8
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1431351

Change-Id: I6ebb700c17f11d427e3299f14b52bdbb44537693
2020-09-19 05:22:40 +00:00
Jooyung Han
21cad321db ueventd: scans /apex/*/firmware for firmwares
In addition to "firmware_directories", ueventd scans /apex/*/firmware/
directory as well to find firmware files.

Bug: 167942098
Test: loading firmware from vibrator apex successfully.
      (sunfish)
Change-Id: I90fc8f9ad843a08b1ca98a2be1b5d22c0c5954a3
2020-09-19 08:07:35 +09:00
Josh Gao
596f3b5384 Merge "adbd: Fix check against valid payload size" 2020-09-18 23:01:18 +00:00
Tom Cherry
a5edc0fbbc Use libcutils_headers for android_filesystem_config.h
android_filesystem_config.h is found since system/core/include is on
the include path for all projects and contains a symlink to the real
android_filesystem_config.h.  This is fragile and the below bug seeks
to remove this symlink and have users correctly depend on
libcutils_headers.

Bug: 165825252
Test: build
Change-Id: I1aad6a2e8fbe87635e97b0ac1be3414403353382
2020-09-18 22:48:42 +00:00
Peter Collingbourne
43ebae3e5d Merge "Dump the per-thread TAGGED_ADDR_CTRL value if available." 2020-09-18 22:00:53 +00:00
Mayank Rana
71a33cfa67 adbd: Fix check against valid payload size
block->payload and its size are not valid when it is used to check
against bytes_left due to std::move() performed on its just prior
to the check. Hence check will always fail to detect the case where
received data is more than expected. To detect this condition and
allow error handling with std::move(), remove extra payload variable
and directly use block->payload.

Bug: http://b/168917244
Change-Id: I992bbba9d9a9861a195834f69d62e69b90658210
2020-09-18 19:26:45 +00:00
Bill Yi
691a80ca09 Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" 2020-09-18 18:47:48 +00:00
Christopher Ferris
0a8f898eee Merge "Fix x86_64 check for signal handler." am: 36991d8e26
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1430216

Change-Id: I0ae001f62832c13e41b88c9ee2e708f8e9d479ae
2020-09-18 18:33:26 +00:00
Christopher Ferris
36991d8e26 Merge "Fix x86_64 check for signal handler." 2020-09-18 18:02:36 +00:00
Tom Cherry
76177d226e Merge "Add sdk_version: "minimum" to liblog_headers" am: 54ac487031
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1431348

Change-Id: Ib3a313d6730428dcb517ef999cbd6a380a6e1414
2020-09-18 16:19:00 +00:00
Tom Cherry
54ac487031 Merge "Add sdk_version: "minimum" to liblog_headers" 2020-09-18 15:28:25 +00:00
Bill Yi
34ecedbcc8 Merge mainline-release 6664920 to master - DO NOT MERGE
Merged-In: Ib2a6c8b5cc127d4aab61a454f47f3cce410d674e
Change-Id: Ief5996d70b59986c15a1b8056c678a6ef35a72d3
2020-09-17 21:57:28 -07:00
Tom Cherry
b80d98dcf7 Add sdk_version: "minimum" to liblog_headers
There are libraries built with the NDK but bundled with the platform
that were otherwise directly including the header path.  It's better
for them to include liblog_headers instead.

Test: build
Change-Id: Icca3684ba5b2539789d30de9df840da4ade0dc67
2020-09-17 14:32:48 -07:00
Treehugger Robot
bc241be0ba Merge "Remove sysutils symlink from system/core/include." am: 0407302aa8
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1407075

Change-Id: Ie3b5f38b878f221e207bc6d4193c0dc877a4040e
2020-09-17 21:30:52 +00:00
David Anderson
e23a006531 Merge changes from topic "vab-brotli" am: 975ea3217e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1427036

Change-Id: I029222044abdfc56028d3137c3f89b8b14241288
2020-09-17 21:26:23 +00:00
Christopher Ferris
a293170a2c Fix x86_64 check for signal handler.
The check for a signal handler was checking for the instruction after
the syscall. On cuttlefish 64 bit, the instruction was not a nop, so
the check failed, and the signal handler was not working. Only check
the instructions up to the syscall instead.

Bug: 168806886

Test: Ran on x86_64.
Change-Id: I605ed22248748f525939e55d734caa5b08c80bb2
2020-09-17 14:19:54 -07:00
Treehugger Robot
0407302aa8 Merge "Remove sysutils symlink from system/core/include." 2020-09-17 19:49:01 +00:00
David Anderson
975ea3217e Merge changes from topic "vab-brotli"
* changes:
  libsnapshot: Add an append mode to CowWriter.
  libsnapshot: Add support for brotli compression.
2020-09-17 19:32:23 +00:00
Yifan Hong
d63c395cd0 Merge changes from topic "revert-1413808-modules_partition-UXSIXCGPHZ" am: 4fd78ec4b3
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1427715

Change-Id: I07a50ffadd7cbd3a8097a4942dca4dbfd92c8e18
2020-09-16 23:23:13 +00:00
Yifan Hong
4fd78ec4b3 Merge changes from topic "revert-1413808-modules_partition-UXSIXCGPHZ"
* changes:
  Revert "rootdir: Add modules directory"
  Revert "fastboot: add modules partition"
2020-09-16 22:45:54 +00:00
Tom Cherry
a4194bd8aa Merge "Remove include/private/android_logger.h" am: 73b1ac878b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1428973

Change-Id: I18cf601a10aae903ceaba648d716427cfb3de14e
2020-09-16 22:30:01 +00:00
Tom Cherry
73b1ac878b Merge "Remove include/private/android_logger.h" 2020-09-16 22:07:02 +00:00
Tom Cherry
e95608bd90 Merge changes I150dc5fe,I72d327c2,I6c5a97dc am: 46ec1a561d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1429028

Change-Id: I19104661cc056d1e4d3944f6a4b4c16bc7b239cd
2020-09-16 21:08:34 +00:00
Tom Cherry
46ec1a561d Merge changes I150dc5fe,I72d327c2,I6c5a97dc
* changes:
  Remove include/private/android_filesystem_capability.h
  Remove include/private/canned_fs_config.h
  Remove include/private/fs_config.h
2020-09-16 20:38:33 +00:00
Akilesh Kailash
cbc865a22a Merge "Support of multiple device partitions by dm-user driver" am: 840d7b2aa8
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1428108

Change-Id: I83bdd6161c048f9cd661b83bf8130de2633ea28d
2020-09-16 18:56:29 +00:00
Tom Cherry
3d8b739f94 Remove include/private/android_logger.h
Users should depend on liblog or liblog_headers for this include.

Test: treehugger
Change-Id: I10dca8638082b2231e2c0713644f103c4c7e9b3f
2020-09-16 11:32:47 -07:00
Akilesh Kailash
840d7b2aa8 Merge "Support of multiple device partitions by dm-user driver" 2020-09-16 18:02:56 +00:00
Tom Cherry
7eb9580a29 Remove include/private/android_filesystem_capability.h
android_filesystem_capability.h should be included as part of
libcutils, not as a global include.  It looks like the few users of
this file already do this correctly, so it's time to remove the
symlink.

Test: treehugger
Change-Id: I150dc5fee24bef3518b1f26728ef2bec669ee63a
2020-09-16 10:43:03 -07:00
Tom Cherry
61ebd66137 Remove include/private/canned_fs_config.h
canned_fs_config.h should be included as part of libcutils, not as a
global include.  It looks like the few users of this file already do
this correctly, so it's time to remove the symlink.

Test: treehugger
Change-Id: I72d327c2f1f374a1fa9e22b5ee1cceb0311a6818
2020-09-16 10:23:43 -07:00
Tom Cherry
9c2005fc27 Remove include/private/fs_config.h
This file is empty and should have no users including it.

Test: treehugger
Change-Id: I6c5a97dc42456d51c89762c93c6a744a69780843
2020-09-16 10:20:46 -07:00
Elliott Hughes
d8e53a0e72 Merge "fastboot: switch to ZipEntry64." am: ed14908226
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1428115

Change-Id: I2a13e5f67c7115660b99ce220d0cd2b750b2346c
2020-09-16 17:19:06 +00:00
Elliott Hughes
ed14908226 Merge "fastboot: switch to ZipEntry64." 2020-09-16 16:41:53 +00:00
Josh Gao
84391884f1 Merge "ADB internals documentation" am: 190921ed5c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1406642

Change-Id: I138b0ee2da1b5bd8396a3fbfdd73e8dae52a316c
2020-09-16 06:17:59 +00:00
Josh Gao
190921ed5c Merge "ADB internals documentation" 2020-09-16 05:54:40 +00:00
Fabien Sanglard
59c0640fb0 ADB internals documentation
Document the internals of adb pipeline. In particular the fdevent,
smart socket, and transport flow.

Bug: NA
Test: NA
Change-Id: Ia8fd8a6da843b8e91ca3005545f33bd0a82cc0c3
2020-09-15 22:50:59 -07:00
Peter Collingbourne
864f15dd6d Dump the per-thread TAGGED_ADDR_CTRL value if available.
This value indicates whether memory tagging is enabled on a thread,
the mode (sync or async) and the set of excluded tags. This information
can sometimes be important for understanding an MTE related crash,
so include it in the per-thread tombstone output.

Bug: 135772972
Change-Id: I25a16e10ac7fbb2b1ab2a961a5279f787039000b
2020-09-15 21:32:36 -07:00
Akilesh Kailash
a020aa1743 Merge "Add "dmctl uuid" command" am: 9e5118326b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1405280

Change-Id: I176bba1f2b1bcae0bcded3078538d23428736d64
2020-09-16 00:38:01 +00:00
Akilesh Kailash
516ded7320 Support of multiple device partitions by dm-user driver
Add basic support for daemon creation and handle signals

Test: Add test case to test system and product COW partitions
Bug: 162790322

Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: Icf8dbe49d2237cec6f7dbcdd84256eb6c5afa1cd
2020-09-16 00:35:42 +00:00
Akilesh Kailash
9e5118326b Merge "Add "dmctl uuid" command" 2020-09-15 23:58:52 +00:00
Elliott Hughes
b138c21233 Merge "adb: switch to ZipEntry64." am: ebd07cc5d0
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1428116

Change-Id: I4b54492e65225b81fe5c83763092b958ed69fab0
2020-09-15 23:32:14 +00:00
David Anderson
a889c87b0f libsnapshot: Add an append mode to CowWriter.
When in append mode, CowWriter will re-open the existing COW and resume
writing at the end of the old data position. All existing operations
will be reimported and buffered in memory.

The size calculation has been simplified to make this work. We now
advance ops_offset and no longer track the number of bytes written.

Additionally, a "header_size" field has been added to the header. This
was missing from the original format and is useful for introducing
forward compatibility later.

Finally, Finalize has been renamed to Flush. It's still mandatory, but
it can be called multiple times to continue appending data without
reopening.

Bug: 168554689
Test: cow_api_test gtest
Change-Id: I637e99ae08a4db5b273c06318e6db523ea8ec7c5
2020-09-15 16:15:41 -07:00
David Anderson
a652877bd6 libsnapshot: Add support for brotli compression.
Bug: 162274240
Test: cow_api_test
Change-Id: I0b0ceec3c3041a6aea4b1e6c4d01ed0a8860d7e8
2020-09-15 16:15:33 -07:00
Elliott Hughes
ebd07cc5d0 Merge "adb: switch to ZipEntry64." 2020-09-15 22:59:41 +00:00