Commit Graph

59638 Commits

Author SHA1 Message Date
android-build-team Robot d025826e62 Snap for 6413355 from 139c571053 to mainline-release
Change-Id: I230bcdfaf9314e0c0d89a7d27bc916f0faa81b48
2020-04-21 07:21:57 +00:00
Jiyong Park 132bb5f861 Merge changes from topic "apex_available" into rvc-dev
* changes:
  adbd: add apex_available and visibility for internal libs.
  Set apex_available property
  Set apex_available property
  Set apex_available property
  Set apex_available property
2020-04-21 03:15:39 +00:00
TreeHugger Robot 139c571053 Merge "adb: change mdns tls service names (RFC 6763)." into rvc-dev am: 0970bcf9f7 am: b735cf7624 am: 81972ef470
Change-Id: I06dc1029a3ebc180094dc470234f2be4bff68370
2020-04-20 23:25:22 +00:00
TreeHugger Robot 81972ef470 Merge "adb: change mdns tls service names (RFC 6763)." into rvc-dev am: 0970bcf9f7 am: b735cf7624
Change-Id: Id9ddf148a911332e53536a5286344137ae379314
2020-04-20 23:10:58 +00:00
TreeHugger Robot b735cf7624 Merge "adb: change mdns tls service names (RFC 6763)." into rvc-dev am: 0970bcf9f7
Change-Id: I1242f921c9247e0a0b6456267b815c0dd57f210a
2020-04-20 22:51:33 +00:00
TreeHugger Robot 0970bcf9f7 Merge "adb: change mdns tls service names (RFC 6763)." into rvc-dev 2020-04-20 22:41:29 +00:00
Joshua Duong aa0b72931d adb: change mdns tls service names (RFC 6763).
Even though mdnsresponder seems to allow us to use _adb_secure_connect
and _adb_secure_pairing as service names, these names violate the syntax
outlined in RFC6763, and may not be compatible with other dns-sd
implementations.

Also address some comments from a previous CL.

Bug: 154268895

Test: atest adbd_test
Change-Id: Ia872e976fc4276587b500a827a41d46d9dc755dd
Merged-In: Ia872e976fc4276587b500a827a41d46d9dc755dd
2020-04-20 21:03:15 +00:00
Nikita Ioffe 53b9576dfd Merge "PrepareZramBackingDevice: use loop_control.h" into rvc-dev am: f42f972130 am: 327708dcad am: c1344fb0fe
Change-Id: I4a359cd45aa1e6d837c2ade6a32cd033e2d90d75
2020-04-20 21:03:01 +00:00
Nikita Ioffe c1344fb0fe Merge "PrepareZramBackingDevice: use loop_control.h" into rvc-dev am: f42f972130 am: 327708dcad
Change-Id: Ia282666caa458c3fb99136e5605a6d3a80e1a8d7
2020-04-20 20:37:11 +00:00
Nikita Ioffe 327708dcad Merge "PrepareZramBackingDevice: use loop_control.h" into rvc-dev am: f42f972130
Change-Id: I4699b610041b13e17d8ff72fc0eebf997cf498df
2020-04-20 20:20:30 +00:00
Nikita Ioffe f42f972130 Merge "PrepareZramBackingDevice: use loop_control.h" into rvc-dev 2020-04-20 20:06:16 +00:00
Nikita Ioffe c8313adf88 PrepareZramBackingDevice: use loop_control.h
loop_control.h already provides loop device management APIs that we need
here. In addition, this change fixes a subtle race condition between
uevented creating a loop device node in userspace and
PrepareZramBackingDevice accessing it without waiting for it to be
created.

Test: device boots
Test: adb reboot userspace
Bug: 154500256
Change-Id: If80f18c8c337210030a6caf2aec6f7a47472b6fb
2020-04-20 17:38:17 +01:00
Alessio Balsini b9b35a814f Merge "Fix liblp imported both as static and dynamic lib" into rvc-dev am: 2f8bbb97c0 am: daba18b647 am: a474e6901d
Change-Id: Iaaeb47667428c587203f4c3ef120ead660aea222
2020-04-20 16:26:16 +00:00
Tom Cherry 902ce22ed0 Merge "liblog: return -EPERM if a log_is_loggable() returns false" into rvc-dev am: 2dd0ddff06 am: 096570935a am: 4ae5e1f050
Change-Id: If5eed9785a6ce66c23371d2812c33d4e11aa0d13
2020-04-20 16:25:22 +00:00
Alessio Balsini a474e6901d Merge "Fix liblp imported both as static and dynamic lib" into rvc-dev am: 2f8bbb97c0 am: daba18b647
Change-Id: I25a5aa04b355077098548452ea8634b7d0cfdbe7
2020-04-20 16:02:49 +00:00
Tom Cherry 4ae5e1f050 Merge "liblog: return -EPERM if a log_is_loggable() returns false" into rvc-dev am: 2dd0ddff06 am: 096570935a
Change-Id: I336277a31f30f3b99c4ebaf57b86e7d878f098f1
2020-04-20 16:02:35 +00:00
Alessio Balsini daba18b647 Merge "Fix liblp imported both as static and dynamic lib" into rvc-dev am: 2f8bbb97c0
Change-Id: I1d3c1e48f2d61908251dc995a0041691df22ac24
2020-04-20 16:00:12 +00:00
Alessio Balsini 2f8bbb97c0 Merge "Fix liblp imported both as static and dynamic lib" into rvc-dev 2020-04-20 15:35:23 +00:00
Tom Cherry 096570935a Merge "liblog: return -EPERM if a log_is_loggable() returns false" into rvc-dev am: 2dd0ddff06
Change-Id: I16cbb79ad6d18e5fe6945cb14260abc9104e509e
2020-04-20 15:26:26 +00:00
Tom Cherry 2dd0ddff06 Merge "liblog: return -EPERM if a log_is_loggable() returns false" into rvc-dev 2020-04-20 15:05:26 +00:00
Alessio Balsini 75be098a45 Fix liblp imported both as static and dynamic lib
In vts_libsnapshot_test, liblp was explicitly imported as static
library, but due to the importing of libsnapshot_defaults, it also
inherited the shared importing.
The import in libsnapshot_default, is not required, drop it.

Test: manual inspection with ldd
Bug: 148889015
Signed-off-by: Alessio Balsini <balsini@google.com>
Change-Id: I12ba0516a482dc917848b5f34cccc659a60a4803
Merged-in: I12ba0516a482dc917848b5f34cccc659a60a4803
2020-04-20 14:54:23 +01:00
Josh Gao d11e67d88d adbd: add apex_available and visibility for internal libs.
abb links against libadbd_core for the shell protocol, and must be
on the system image because it links against cmd, so let's just
expose it to abb for now.

Exempt-From-Owner-Approval: cherry-pick from AOSP

Bug: http://b/151398197
Test: treehugger
Merged-In: Id926bc4324d3259def21ea19d3bd72320311a6e3
(cherry picked from commit b567303330)
Change-Id: Id926bc4324d3259def21ea19d3bd72320311a6e3
2020-04-20 17:21:22 +09:00
Jiyong Park a6bcd4817c Set apex_available property
The marked library(ies) were available to the APEXes via the
hand-written whitelist in build/soong/apex/apex.go. Trying to remove the
whitelist by adding apex_available property to the Android.bp of the
libraries.

Exempt-From-Owner-Approval: cherry-pick from AOSP

Bug: 150999716
Test: m
Merged-In: I8fd2a3c9b69454c6018c72f5198898bc90dc4d0d
(cherry picked from commit 937b4bf173)
Change-Id: I8fd2a3c9b69454c6018c72f5198898bc90dc4d0d
2020-04-20 16:35:05 +09:00
Jiyong Park 5390bee3f4 Set apex_available property
The marked library(ies) were available to the APEXes via the
hand-written whitelist in build/soong/apex/apex.go. Trying to remove the
whitelist by adding apex_available property to the Android.bp of the
libraries.

Exempt-From-Owner-Approval: cherry-pick from AOSP

Bug: 150999716
Test: m
Merged-In: Id08058f3105463558c6c82298344a33af0efb2d3
(cherry picked from commit e3d371e319)
Change-Id: Id08058f3105463558c6c82298344a33af0efb2d3
2020-04-20 16:34:28 +09:00
Jiyong Park 137fb1ff1e Set apex_available property
The marked library(ies) were available to the adbd APEX via the
hand-written whitelist in build/soong/apex/apex.go. Trying to remove the
whitelist by adding apex_available property to the Android.bp of the
libraries.

Exempt-From-Owner-Approval: already +2'ed by the owner (enh)

Bug: 150999716
Bug: 151398197
Test: m
Merged-In: I8b572e3c4e76bd10c0443a6c08b72e9519243ab5
(cherry picked from commit d25bb60e05)
Change-Id: I8b572e3c4e76bd10c0443a6c08b72e9519243ab5
2020-04-20 16:07:35 +09:00
Jiyong Park a206b8cbf4 Set apex_available property
The marked library(ies) were available to the APEXes via the hand-written
whitelist in build/soong/apex/apex.go. Trying to remove the whitelist
by adding apex_available property to the Android.bp of the libraries.

In this change, following libs were made available to all apexes because
their usage is quite common and there is no reason to restrict them
to some APEXes.

* libbase_headers
* libcutils, libcutils_headers
* libutils_headers, libsystem_headers
* liblog_headers
* libbacktrace, libbacktrace_headers
* libcrypto_utils

Exempt-From-Owner-Approval: cherry-pick from aosp

Bug: 150999716
Test: m
Merged-In: If3d3652e6604ed4f6d7694fe7ac61ae496621026
(cherry picked from commit 8bf9b1632e)
Change-Id: If3d3652e6604ed4f6d7694fe7ac61ae496621026
2020-04-20 16:06:02 +09:00
android-build-team Robot 6c2d150475 Snap for 6408566 from c21bed2094 to mainline-release
Change-Id: Ia69be5a875f21c512acaf90500abcdcd95312480
2020-04-19 07:09:48 +00:00
TreeHugger Robot c21bed2094 Merge "start: Toggle iorapd on/off when using 'start' command (by itself)" into rvc-dev am: 8ee349bdbd am: 3ef041d0e8 am: b985abd45b
Change-Id: I311886eec977f6c408b612c7b8e3f73391375321
2020-04-18 00:39:54 +00:00
TreeHugger Robot b985abd45b Merge "start: Toggle iorapd on/off when using 'start' command (by itself)" into rvc-dev am: 8ee349bdbd am: 3ef041d0e8
Change-Id: I0e85d5b4f7059fd09ca981c26215d1244a09466b
2020-04-18 00:23:35 +00:00
TreeHugger Robot 3ef041d0e8 Merge "start: Toggle iorapd on/off when using 'start' command (by itself)" into rvc-dev am: 8ee349bdbd
Change-Id: Icf6dc2471755d099b317886adfeca1cf3b6b77cb
2020-04-18 00:00:51 +00:00
TreeHugger Robot 8ee349bdbd Merge "start: Toggle iorapd on/off when using 'start' command (by itself)" into rvc-dev 2020-04-17 23:26:47 +00:00
Tom Cherry ef855954de liblog: return -EPERM if a log_is_loggable() returns false
This was the previous behavior, so retain it.

Bug: 119867234
Test: logging unit tests
Merged-In: I088f760cc274a4a42d72477eb4e2e8d23c613a8a
Change-Id: I088f760cc274a4a42d72477eb4e2e8d23c613a8a
(cherry picked from commit 1ff17fcebb)
2020-04-17 15:51:55 -07:00
Nikita Ioffe 881b4a62a8 Merge "Cleanup logic in KillZramBackingDevice" into rvc-dev am: aa0ec1a902 am: 52cd9bc6a6 am: 3698bc6abf
Change-Id: Ifde2955b347fcc234905c4c3ca8d71ec635271f1
2020-04-17 11:17:27 +00:00
Jerome Gaillard 0b38364260 Merge "macOS build fix: no off64_t on darwin." into rvc-dev am: acc1a1b5de am: 13aa91708b am: ec6c44029f
Change-Id: Ia076fd2810c14c735192ed1e7c90de27cdaa4181
2020-04-17 11:17:21 +00:00
Nikita Ioffe 3698bc6abf Merge "Cleanup logic in KillZramBackingDevice" into rvc-dev am: aa0ec1a902 am: 52cd9bc6a6
Change-Id: I9dd768b9df283f214384a042abf151c884753f19
2020-04-17 11:01:18 +00:00
Jerome Gaillard ec6c44029f Merge "macOS build fix: no off64_t on darwin." into rvc-dev am: acc1a1b5de am: 13aa91708b
Change-Id: I8b7167d735780b3fed58e0b333d73260f2b6444d
2020-04-17 11:00:57 +00:00
Nikita Ioffe 52cd9bc6a6 Merge "Cleanup logic in KillZramBackingDevice" into rvc-dev am: aa0ec1a902
Change-Id: Ie5c192034658a62c759c0ec2a954fec14e9c5a37
2020-04-17 10:34:39 +00:00
Jerome Gaillard 13aa91708b Merge "macOS build fix: no off64_t on darwin." into rvc-dev am: acc1a1b5de
Change-Id: I61188ed6b3a128922efad2ceb9ec01ad7b9fc37f
2020-04-17 10:34:28 +00:00
Nikita Ioffe aa0ec1a902 Merge "Cleanup logic in KillZramBackingDevice" into rvc-dev 2020-04-17 10:23:44 +00:00
Jerome Gaillard acc1a1b5de Merge "macOS build fix: no off64_t on darwin." into rvc-dev 2020-04-17 10:17:22 +00:00
Elliott Hughes 44daa2dde1 macOS build fix: no off64_t on darwin.
Darwin has always had a 64-bit off_t, and never added an off64_t.

Bug: 153328340
Test: builds on mac
Change-Id: I4b244dda94c67da76c9e0f47b333c2734f5a94af
2020-04-17 10:17:02 +00:00
Martijn Coenen fd9c7cf5a0 Merge "Rename external storage properties." into rvc-dev am: 884c64a052 am: abdd488e74 am: 9e4151bd3c
Change-Id: I9f0a067fda386e92fc93156cffe92f57994c0af3
2020-04-17 08:44:30 +00:00
Martijn Coenen 9e4151bd3c Merge "Rename external storage properties." into rvc-dev am: 884c64a052 am: abdd488e74
Change-Id: Iaa4ac03bce0c51c64226798c5f1f318ce23dc08e
2020-04-17 08:24:29 +00:00
Martijn Coenen abdd488e74 Merge "Rename external storage properties." into rvc-dev am: 884c64a052
Change-Id: Ia94b5339716ab5cc3f0ff055fbbf8edf34db01d0
2020-04-17 08:10:37 +00:00
Martijn Coenen 884c64a052 Merge "Rename external storage properties." into rvc-dev 2020-04-17 07:59:26 +00:00
android-build-team Robot f7da958655 Snap for 6403403 from 76ee7050cb to mainline-release
Change-Id: I7f9e8634ca5d868d90ca6caf9862817a7bf13bf5
2020-04-17 07:09:46 +00:00
Tianjie 76ee7050cb Handle the invalid timestamp in zipfile am: abf60c8d2e am: 69b259ccb4 am: 784cbd2c42
Change-Id: I9521cee9a8ed754af141be2d00e262a4732cc348
2020-04-16 22:11:21 +00:00
Tianjie 784cbd2c42 Handle the invalid timestamp in zipfile am: abf60c8d2e am: 69b259ccb4
Change-Id: Id1ab60762a3f6c1e62c53ed7487263120041fd74
2020-04-16 21:57:49 +00:00
Tianjie 69b259ccb4 Handle the invalid timestamp in zipfile am: abf60c8d2e
Change-Id: I0dc212fd60248ab80309c58d526e402bb0478735
2020-04-16 21:42:26 +00:00
Igor Murashkin 2680b3158e start: Toggle iorapd on/off when using 'start' command (by itself)
iorapd depends on pm in system_server, so turn it off too when we
turn off system_server with the 'stop' command.

Bug: 153964298
Test: adb shell stop
Test: adb shell start
Change-Id: I08390472b1e1b969d0380843efa1bbd35b194250
2020-04-16 14:24:45 -07:00