Commit graph

62831 commits

Author SHA1 Message Date
Treehugger Robot
f80e02cffb Merge "Turn off -Wnon-virtual-dtor explicitly" am: fbb0314c33
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1429930

Change-Id: I6c6da87564d81ac43f5636e601d9e38da9ecf7c9
2020-09-25 05:50:24 +00:00
Treehugger Robot
fbb0314c33 Merge "Turn off -Wnon-virtual-dtor explicitly" 2020-09-25 03:53:02 +00:00
Jiyong Park
ee989fcb4d Turn off -Wnon-virtual-dtor explicitly
adb has been built without -Wnon-virtual-dtor because Soong doesn't turn
the flag for the host targets, and the flag can't coexist with
-Wexit-time-destructors.

However, the new host target linux_bionic_arm64 turns the flag on,
because it inherits most of the cflags from the device config.
That is forcing us to implement the virtual destructor, which isn't
possible due to -Wexit-time-destructors.

Solving the issue by explicitly turning -Wnon-virtual-dtor off so that
it is disabled also for the linux_bionic_arm64 target.

Bug: 159685774
Test: HOST_CROSS_OS=linux_bionic HOST_CROSS_ARCH=arm64 m \
out/soong/host/linux_bionic-arm64/bin/adb
Test: run the adb on an ARM emulator

Change-Id: I655b340e4f199a3a75b7df7cc3fe18832e26a7ae
2020-09-25 11:56:04 +09:00
Treehugger Robot
230d6658fe Merge "Chanage uid to userId where it denotes an Android user id." am: 978faa37ba
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1436554

Change-Id: I05d8bbed183f8024f2aef0f15e0673342837cd3b
2020-09-24 18:39:09 +00:00
Treehugger Robot
978faa37ba Merge "Chanage uid to userId where it denotes an Android user id." 2020-09-24 17:57:49 +00:00
Janis Danisevskis
0a738d9504 Chanage uid to userId where it denotes an Android user id.
This patch changes the variable name `uid` to `userId` where it
denotes an Android user id. This makes it harder to mistake the user id
for an actual UID.

Test: Trivial refactoring no logical changes.
Bug: 163636858
Change-Id: I9e240367bcd30bbfa1816014a7f44bbcb58ede4b
2020-09-23 18:01:37 -07:00
Tom Cherry
fcae88ecb8 Merge "logd: enable CFI" am: de540ad2f1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1435037

Change-Id: I5a5a25818fdc7d4167ce50dcc856ef10a7e01635
2020-09-23 20:02:54 +00:00
Tom Cherry
de540ad2f1 Merge "logd: enable CFI" 2020-09-23 18:44:02 +00:00
Tom Cherry
d96139f14c logd: enable CFI
Test: logd runs normally
Change-Id: Ic3e117bd445ae339fed7846e3eaa14478580f091
2020-09-23 09:34:15 -07:00
Treehugger Robot
48507b1c27 Merge "Removed RWLock fuzzer" am: 928910999f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1434261

Change-Id: Ibb967aee0ce0a97c81e0413a630a2133ed69da60
2020-09-22 19:13:20 +00:00
Treehugger Robot
928910999f Merge "Removed RWLock fuzzer" 2020-09-22 18:40:23 +00:00
David Anderson
ef77597707 Merge "libsnapshot: Make the new Open calls look more like MapUpdateSnapshot." am: 9ec8c31afb
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1433352

Change-Id: Ie2d6014607850c43c66192f82d8ec02eabb6993d
2020-09-22 18:10:19 +00:00
David Anderson
9ec8c31afb Merge "libsnapshot: Make the new Open calls look more like MapUpdateSnapshot." 2020-09-22 17:47:06 +00:00
Jooyung Han
25dea8c25f Merge "ueventd: change firmware location in apexes" am: fb2dafa538
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1429931

Change-Id: I0e399c78f3ac26808703623dc902b9da3dbc8d51
2020-09-22 01:55:23 +00:00
Treehugger Robot
27b3ddc2ea Merge "logd: additional logging if read_offset > buffer_it->write_offset()" am: 55d3e1f9b9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1433571

Change-Id: I0370d07bf013f15e04e2444f2887ea3596311a5d
2020-09-22 01:51:27 +00:00
Jooyung Han
fb2dafa538 Merge "ueventd: change firmware location in apexes" 2020-09-22 01:36:35 +00:00
Treehugger Robot
55d3e1f9b9 Merge "logd: additional logging if read_offset > buffer_it->write_offset()" 2020-09-22 01:14:15 +00:00
Tom Cherry
5d1fbece58 logd: additional logging if read_offset > buffer_it->write_offset()
I didn't expect this to ever be hit, but apparently it is, so add
additional logging to track it down.

Bug: 168870781
Test: build
Change-Id: Ia472bc7458a3727e4d407365672f7394426ae515
2020-09-21 15:10:20 -07:00
David Anderson
f53794d1af libsnapshot: Make the new Open calls look more like MapUpdateSnapshot.
To make the transition to these new calls easier, give them a very
similar signature to MapUpdateSnapshot. Also, allow them to work in
non-compression mode.

Bug: 168554689
Test: builds
Change-Id: I2eb6b41ba8a294dbde1763aabd7701a80c0789f3
2020-09-21 12:06:49 -07:00
Tom Cherry
eb2b5408b6 Merge "logd: remove min heap in SerializedFlushToState" am: b92ac53aeb
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1431987

Change-Id: I599fecb6e1f797bfa5409e3b767f6c0a14766cb9
2020-09-21 18:24:18 +00:00
David Anderson
4d620fc341 Merge "libsnapshot: Prototype the new API for mapping writable snapshots." am: 32771b2aa3
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1430217

Change-Id: Ic96666a7c2e1cf7840b7f7bd778cce13327a56b8
2020-09-21 18:19:07 +00:00
Tom Cherry
b92ac53aeb Merge "logd: remove min heap in SerializedFlushToState" 2020-09-21 18:10:43 +00:00
David Anderson
32771b2aa3 Merge "libsnapshot: Prototype the new API for mapping writable snapshots." 2020-09-21 17:56:08 +00:00
Jooyung Han
00fa8e7d5c Merge "fs_config: add bin paths of flattened apexes" am: 529ace17b6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1432791

Change-Id: Ibf3fa90572503c4a8d3054d09c37648bd9c4075d
2020-09-21 15:52:10 +00:00
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
Jooyung Han
529ace17b6 Merge "fs_config: add bin paths of flattened apexes" 2020-09-21 15:47:59 +00:00
Tom Cherry
67e08784ed Merge "Use libcutils_headers for android_filesystem_config.h" 2020-09-21 15:29:41 +00:00
Jooyung Han
a70cea57a9 fs_config: add bin paths of flattened apexes
Added missing partitions (/product and /vendor).

APEXes can be put in /system, /system_ext, /product, and /vendor.
Binaries within "flattened" apexes should be marked as executable.

Bug: 167383491
Bug: 169025459
Test: OVERRIDE_TARGET_FLATTEN_APEX=true m vendorimage with a vendor apex
      simg2img $OUT/vendor.img vendor.img
      debugfs -R 'ls -l /vendor/apex/com.android.foo/bin' vendor.img
      => check if binaries are executable
Change-Id: I67284166d70c98a2a184b47e7052ade8b9039df9
2020-09-21 19:50:43 +09:00
Jooyung Han
2833e5d37d ueventd: change firmware location in apexes
To be consistent with other prebuilt modules within APEXes, the location
for firmware files is switched from /apex/*/firmware to
/apex/*/etc/firmware.

Bug: 167942098
Test: loading vibrator firmware from vibrator apex(sunfish)
Change-Id: Ia05735bf5a54482fded26525fa4a8f795dcfc029
2020-09-21 10:56:10 +09: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
Tom Cherry
6533fff0e0 logd: remove min heap in SerializedFlushToState
There was a bug in SerializedFlushToState::Prune() caused by an access
to a SerializedLogEntry raw pointer as a member of a MinHeapElement,
which was deleted earlier in the function.

Instead of just fixing the order of the access and the deletion, I
sought out to remove the raw pointer entirely.  In doing so, I noticed
that the min heap doesn't provide significant benefit, since we'll
only ever have 8 log buffers so scalability is not an issue.

Therefore this change removes the min heap entirely and uses the
existing log_position_ and logs_needed_from_next_position_ members to
keep track of which are the next unread logs.

It also adds a smoke test for SerializedFlushToState::Prune() and
additional CHECK() statements to help prevent future errors.

Bug: 168869299
Test: unit tests
Change-Id: Id4d5fdbaff2fe6dc49c38f01e73f900f84d3696b
2020-09-18 15:32:32 -07:00
Peter Collingbourne
43ebae3e5d Merge "Dump the per-thread TAGGED_ADDR_CTRL value if available." 2020-09-18 22:00:53 +00:00
David Anderson
2f11ec6a13 libsnapshot: Prototype the new API for mapping writable snapshots.
Since we can't provide a single device or fd anymore, we need to expose
a CowWriter directly. Additionally, we expose an API for reading
snapshots through the FileDescriptor abstraction.

Bug: 168554689
Test: builds
Change-Id: If7e8adbfe69c2a84d34c63d4b0adff2b3365fd82
2020-09-18 14:24:40 -07: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