Commit Graph

61965 Commits

Author SHA1 Message Date
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
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 73b1ac878b Merge "Remove include/private/android_logger.h" 2020-09-16 22:07:02 +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
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 ed14908226 Merge "fastboot: switch to ZipEntry64." 2020-09-16 16:41:53 +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
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 ebd07cc5d0 Merge "adb: switch to ZipEntry64." 2020-09-15 22:59:41 +00:00
Elliott Hughes 0016ffc516 adb: switch to ZipEntry64.
Test: treehugger
Change-Id: I1eba8c641912e46ed243deddd19f367ae40a5d46
2020-09-15 14:31:08 -07:00
Elliott Hughes b407414fd0 fastboot: switch to ZipEntry64.
Test: treehugger
Change-Id: I17a023f113590e469f69174f7004c4579255c6ed
2020-09-15 14:26:17 -07:00
Yifan Hong d50c7374cc Revert "rootdir: Add modules directory"
Revert submission 1413808-modules_partition

Reason for revert: modules partition no longer needed
Reverted Changes:
Iceafebd85:Add modules partition
I2fa96199a:rootdir: Add modules directory
Ie397b9ec6:Add modules partition.
I4200d0cf5:fastboot: add modules partition

Bug: 163543381

Change-Id: Ic9a94892c3403675eeac694d9ca0af5654f1a5c8
2020-09-15 20:07:03 +00:00
Yifan Hong 0d4a6887fb Revert "fastboot: add modules partition"
Revert submission 1413808-modules_partition

Reason for revert: modules partition no longer needed
Reverted Changes:
Iceafebd85:Add modules partition
I2fa96199a:rootdir: Add modules directory
Ie397b9ec6:Add modules partition.
I4200d0cf5:fastboot: add modules partition

Bug: 163543381

Change-Id: I17dc2da5a0901797c1bc1905274e7eb02e80fd83
2020-09-15 19:08:57 +00:00
Palmer Dabbelt 7dd8fe8e70 Add "dmctl uuid" command
This makes looking up device UUIDs a bit easier, as rather than depending on
the device mapper's sysfs layout we can depend on dmctl.  There's some
associated libdm plumbing, but the UUID was already pretty much availiable.

Test: I just ran this by hand.
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
Change-Id: I7028eec6ab04601308047b67057e51a0ff44c0a7
2020-09-15 18:39:39 +00:00
Treehugger Robot fd19ef40e8 Merge "Freeze com.android.sysprop.init API" 2020-09-15 02:02:25 +00:00
Treehugger Robot 011c4df302 Merge "Skip android11-tests-dev." 2020-09-15 01:54:17 +00:00
Jooyung Han cb4704f3fe Merge "init: "init subcontext" in default mount namespace" 2020-09-15 01:18:03 +00:00
Xin Li c6a5bb31c7 Skip android11-tests-dev.
Bug: 168333982
Change-Id: Ib113f6d9296bf3ceb1f941ff441a4f5669a777f1
2020-09-14 17:21:32 -07:00
Treehugger Robot 7259edacb3 Merge "libcutils must check /sys/kernel/tracing for tracefs first" 2020-09-14 21:46:36 +00:00
Hridya Valsaraju 355ff8c7c1 libcutils must check /sys/kernel/tracing for tracefs first
Currently it falls back to /sys/kernel/tracing if debugfs is not found.
/sys/kernel/tracing must be checked first since debugfs is not allowed
to be mounted in user builds starting with Android R launching devices.

Test: manual
Change-Id: I2fb5ec91bbf7d5304a1a6efcb06530969485e78f
2020-09-14 20:04:43 +00:00
Treehugger Robot c72df4e2a6 Merge "Setup ueventd to support DMA-BUF heaps" 2020-09-14 19:56:06 +00:00
Arve Hjønnevåg 5ec14a7fb2 Merge "trusty: keymaster: Add set_attestation_key" 2020-09-14 18:32:13 +00:00
Jooyung Han 7bfe477b3d init: "init subcontext" in default mount namespace
"init subcontext" is responsible to handle a few commands in vendor
context. To support Vendor APEX, "init subcontext" is now started in
"default" mount namespace so that those commands can access /apex/*.

For example, insmod should see the contents of /apex to install kernel
modules in apexes.

Bug: 162701747
Test: adb shell ps -ef | grep init
      => check pid of <init subcontext>
      adb shell readlink /proc/<pid: init>/ns/mnt
      adb shell readlink /proc/<pid: init subcontext>/ns/mnt
      => check if these are equal
Change-Id: Icd5e862e52d78635e83824b267b6d32d8f3e9eea
2020-09-14 17:40:45 +09:00
Inseob Kim 2a8c714145 Freeze com.android.sysprop.init API
Bug: 145259948
Test: m com.android.sysprop.init-check-api
Change-Id: I5909c16390c35b5e5adf4c82eed191cc9ae82014
2020-09-14 13:51:27 +09:00
Hridya Valsaraju 72a0f10f51 Setup ueventd to support DMA-BUF heaps
Test: tested on cuttelfish with DMA-BUF heaps enabled.
Bug: 168333162
Change-Id: I2e7ed71d329edbb77319ca3cfbc4f0bf6be8fd98
2020-09-11 14:42:31 -07:00
Treehugger Robot 3bede4f44f Merge "Remove persist.sys.fuse == false code paths" 2020-09-11 15:00:27 +00:00
vichang 277c702dc3 Merge "Add a new public library libicu.so" 2020-09-11 10:19:37 +00:00
Zim c46c2350e5 Remove persist.sys.fuse == false code paths
Since Android R, the FUSE prop is always on and FUSE-off is no longer
supported

Test: m
Bug: 160159282
Change-Id: I6db20fe8cbf8d260ba21fed5da289eacd4e53ef5
2020-09-11 11:06:29 +01:00
Treehugger Robot 316298d7b0 Merge "adb: fix `push --sync` with multiple inputs." 2020-09-11 04:55:49 +00:00
Yifan Hong 135508168a Merge changes from topic "modules_partition"
* changes:
  fastboot: add modules partition
  rootdir: Add modules directory
2020-09-11 00:25:24 +00:00
Arve Hjønnevåg 0c32a253df trusty: keymaster: Add set_attestation_key
Add tool to provision keymaster attestation keys.

Bug: 154033394
Test: keys from soft_attestation_cert then VtsHalKeymasterV4_0TargetTest

Change-Id: Ic96e9a8676991b3126bbae99118a1f23ee0744a5
2020-09-10 16:43:20 -07:00
David Anderson 1f8c18ee55 Merge "libsnapshot: Refactor cow_reader decompression." 2020-09-10 23:05:08 +00:00
Tom Cherry 9481c67321 Merge "init: do not create dev.mnt. properties for emulated mounts" 2020-09-10 20:47:35 +00:00
Treehugger Robot 0ceb0339aa Merge "logd: don't require chatty to pass CTS" into android11-tests-dev 2020-09-10 18:39:07 +00:00
Tom Cherry e1bcd93326 init: do not create dev.mnt. properties for emulated mounts
dev.mnt. properties are primarily intended for tuning parameters for
mounts such as /system and /data but don't have much use for emulated
mounts.

There are additional emulated mounts created for each user on a
device, so if too many users are created, init would otherwise create
too many dev.mnt. properties, filling the property file that backs
these properties, and preventing more properties from being
generated.

Therefore, this change stops init from creating dev.mnt. properties
for emulated mounts.

Bug: 156721033
Test: user creation stress test doesn't create large numbers of
properties

Change-Id: I6475956719b7c938b8289189abfef661140d526d
2020-09-10 18:09:25 +00:00
Xin Li 8484c0a7ca Merge "Merge Android R" 2020-09-10 17:22:00 +00:00
David Anderson 511c4bc601 libsnapshot: Refactor cow_reader decompression.
Bug: 162274240
Test: cow_api_test
Change-Id: I12c177f3ebb7bb0550669bd5edbdbbde6f572cfd
2020-09-09 21:54:48 -07:00
Xin Li e1ebeab9c5 Merge Android R
Bug: 168057903
Merged-In: I88f6774ca9985fb50f015756b8f8508d4691dc62
Change-Id: Iefe2872d29836b77344479ad2552a9c03d81bdcb
2020-09-09 20:21:27 -07:00
Akilesh Kailash c7c7252289 Merge "libsnapshot:Snapuserd: IO path support with dm-snapshot target" 2020-09-10 01:59:38 +00:00
Akilesh Kailash 2c6c0bff7d libsnapshot:Snapuserd: IO path support with dm-snapshot target
Integrate Snapuserd daemon with libsnapshot library and handle
IO requests from dm-snap and dm-snap-persistent.

Tested all the 3 COW operations on a compressed
cow-device file generated through vab_converter_payload.

BUG: 163046732
Test: Added test case to independently test snapuserd IO path.
      Manual test on compressed cow file generated and verifying
      md5sum.

Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: I9d017ac671733a93c3bc21344228260224640c78
[Palmer: clean up some build issues]
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
2020-09-10 00:27:50 +00:00
Tom Cherry cec1c89ac3 Merge "logd: Fix ClearUidLogs() when writer_active_ is true" am: 5f2474e430
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1424008

Change-Id: I88f6774ca9985fb50f015756b8f8508d4691dc62
2020-09-09 23:07:33 +00:00
Tom Cherry 5f2474e430 Merge "logd: Fix ClearUidLogs() when writer_active_ is true" 2020-09-09 22:41:22 +00:00
Tom Cherry b31cbd6bdd logd: don't require chatty to pass CTS
Remove a few tests that require logd to implement chatty to not
require chatty to pass CTS.  Note that these tests are already removed
in AOSP and won't be required in S.

Bug: 168100439
Test: these tests don't run
Merged-In: Ie12898617429a75b6caff92725aa7145650f8fc6
Change-Id: Ia81042a48e9675f2ad3ad75a10ec4d60c96ff712
2020-09-09 21:26:46 +00:00
Tom Cherry 2adbece108 logd: Fix ClearUidLogs() when writer_active_ is true
Previously ClearUidLogs() would Compress() the log buffer in all
cases, however that is the wrong behavior when writer_active_ is true
and would leave the SerializedLogChunk object in an invalid state.  If
more logs are written to the log, then write_offset() will be higher
than the compressed size of the log, violating a CHECK() when later
decompressing the log.

This change does not call Compress() in ClearUidLogs() if
writer_active_ is true.  It upgrades a check in Compress() from a
simple if statement to a CHECK() to prevent against this happening in
the future.

It adds a test that exercises the previously failing path.

Bug: 166187079
Test: unit tests
Change-Id: Ic5fbcf16f724af1c20170b8f4e6e2daadf6a9529
2020-09-09 20:26:59 +00:00