Commit Graph

50205 Commits

Author SHA1 Message Date
Martin Stjernholm 8dc3adfb2c Merge "Revert "Fix libnativeloader to correctly link to the platform namespace."" am: 68cf801ad9
am: affe1f2617

Change-Id: Ide5ec7791838db081c666f7aa7a137a92e4be460
2019-04-29 17:41:28 -07:00
Martin Stjernholm affe1f2617 Merge "Revert "Fix libnativeloader to correctly link to the platform namespace.""
am: 68cf801ad9

Change-Id: I4787e48d5abe6a0a282ebe0b65705853b67e4849
2019-04-29 17:35:51 -07:00
Treehugger Robot 68cf801ad9 Merge "Revert "Fix libnativeloader to correctly link to the platform namespace."" 2019-04-30 00:13:22 +00:00
Tom Cherry 8a9996d0d6 Merge "liblog: display valid utf8 characters with 'printable' log format" am: 6682d3bbba
am: 047e9407f3

Change-Id: I19fb0d89937a2bec85930e270284c8a3dd4e5a6e
2019-04-29 16:48:12 -07:00
Tom Cherry 047e9407f3 Merge "liblog: display valid utf8 characters with 'printable' log format"
am: 6682d3bbba

Change-Id: I5051f7579274992ec59d4225ee5a537934345f04
2019-04-29 16:33:44 -07:00
Tom Cherry 6682d3bbba Merge "liblog: display valid utf8 characters with 'printable' log format" 2019-04-29 23:17:12 +00:00
Josh Gao 60a5541e04 Merge "adb: restore generation of public key in `adb keygen`." am: fe6cc3e2d3
am: 6848befe69

Change-Id: I018c396127b0bb68358b74a72ecd33532440df5d
2019-04-29 16:04:00 -07:00
Josh Gao 6848befe69 Merge "adb: restore generation of public key in `adb keygen`."
am: fe6cc3e2d3

Change-Id: Ifaa0d70091189374c2294d021ede28d8786b5710
2019-04-29 15:53:43 -07:00
Treehugger Robot fe6cc3e2d3 Merge "adb: restore generation of public key in `adb keygen`." 2019-04-29 22:31:17 +00:00
Tao Bao 53930eaf88 [automerger skipped] adb: Support rescue install and getprop.
am: fbeac4605c -s ours
am skip reason: change_id Ia246b30314fbcd2bd4cc71a8085a280e33041967 with SHA1 11cf30b5ed is in history

Change-Id: I196e15fa5773d4956cc4f6fe440209faab4de83e
2019-04-29 14:27:29 -07:00
Tao Bao dedac70def [automerger skipped] adb: Recognize rescue mode.
am: 25fe126fb0 -s ours
am skip reason: change_id I367d7339fe68006aba09a1e3db6370d472296676 with SHA1 55d407ec4a is in history

Change-Id: Ic67c114dfd98876f3e071b53bea54a7f904c182f
2019-04-29 14:27:03 -07:00
Martin Stjernholm b9259a9cbe Revert "Fix libnativeloader to correctly link to the platform namespace."
This reverts commit 4ca0ca67bf.

Reason for revert: Breaks android.compilation.cts.AdbRootDependentCompilationTest#testCompile_curProfile and others: http://g/art-team/R2nEDA1Ka_s

Change-Id: Ia6285648133d21e61040efafc73cac97d702a7c4
2019-04-29 20:57:16 +00:00
Josh Gao 032989a2ba adb: restore generation of public key in `adb keygen`.
We don't need the public key to be generated at ~/.android/adbkey.pub,
but it's still useful to be able to generate the public key for use with
ADB_VENDOR_KEYS.

Bug: http://b/119634232
Test: manual
Change-Id: Iecd6ff1bba4af4ba142456034f3faf52bb9e017d
2019-04-29 12:36:32 -07:00
Tianjie Xu 0eff930825 Merge "Support adb rescue wipe command" am: 56311071fe
am: 979f05c621

Change-Id: I8bc2ffef336c57b47972b7f37ccfc70ab7a19158
2019-04-29 11:06:03 -07:00
Tianjie Xu 979f05c621 Merge "Support adb rescue wipe command"
am: 56311071fe

Change-Id: I19eea45c09b8a5bc1064701af9b5f4d6bb8494a4
2019-04-29 11:00:14 -07:00
Tianjie Xu 56311071fe Merge "Support adb rescue wipe command" 2019-04-29 17:47:20 +00:00
Andreas Gampe f07b5fe9d8 Merge "Nativeloader: Restrict anonymous namespace creation" am: d21a090f79
am: 7b3377cdc6

Change-Id: I057a90ced0ee9e7aba34df509802e4e23c915a57
2019-04-29 09:40:25 -07:00
Andreas Gampe 7b3377cdc6 Merge "Nativeloader: Restrict anonymous namespace creation"
am: d21a090f79

Change-Id: Ic080bbb6bb6f0a8ecadd31ee3d29b89546475782
2019-04-29 09:26:07 -07:00
Tom Cherry 9158984894 liblog: display valid utf8 characters with 'printable' log format
This started as a change to use mbrtowc() instead of
utf8_character_length() as mbrtowc() does everything that
utf8_character_length() intends to do, but is a libc function. The
change was further intended to add unit tests to ensure that these
functions operate as intended.

It turns out that utf8_character_length() returned an error for the
utf8 characters that I tested, so this also has the side effect of
allowing valid utf8 characters to be printed in the 'printable' log
format, which was the original intention.

Also, print the binary data as hex instead of octal, since it is a
more suitable choice.

Test: new unit tests, existing unit tests, logcat -v printable
Change-Id: I4cc95aee81519411ef47892ca74eb31117c972d2
2019-04-29 09:14:37 -07:00
Treehugger Robot d21a090f79 Merge "Nativeloader: Restrict anonymous namespace creation" 2019-04-29 16:08:15 +00:00
Martin Stjernholm 71a0804f95 Merge "Fix libnativeloader to correctly link to the platform namespace." am: bce25d2363
am: 487b5784b6

Change-Id: I8b96f74250d2dc2f42e2392c8b8705e5d3fd95bc
2019-04-29 08:27:05 -07:00
Martin Stjernholm 487b5784b6 Merge "Fix libnativeloader to correctly link to the platform namespace."
am: bce25d2363

Change-Id: Ic5178afa9241f697d04a8ea93534620582b6d291
2019-04-29 08:21:46 -07:00
Treehugger Robot bce25d2363 Merge "Fix libnativeloader to correctly link to the platform namespace." 2019-04-29 15:08:52 +00:00
Martin Stjernholm 4ca0ca67bf Fix libnativeloader to correctly link to the platform namespace.
This affected binaries in the Runtime APEX, where the platform namespace is
"platform" rather than "default".

Also extend ANDROID_ADDITIONAL_PUBLIC_LIBRARIES to create links to both to
platform and runtime namespaces, so that it can be used to open up access to
internal libraries in the Runtime APEX as well, which is used by ART gtests
and run tests.

Also update some comments in the ld.config*.txt files to accurately explain
why some namespaces need to be visible, and some other minor changes for
consistency. There are no semantically significant changes in those files.

Test: Flash and boot
Test: Run an ART run test with the internal libarttest.so library
Bug: 130293232
Bug: 121117762
Change-Id: I7ebaf5370dd0f533b1bb5f0e67e7c3c1df48e512
2019-04-29 13:09:08 +01:00
SzuWei Lin 24e72d2735 [automerger skipped] Merge "Remove the mount points defined in skip_mount.cfg from ReadDefaultFstab()" into qt-dev
am: ff9ac9e286 -s ours
am skip reason: change_id I3156260b5d37647dbecf98ca90601a089bea5c46 with SHA1 77c28476f1 is in history

Change-Id: Ief5a58b208dfb343f800a43fae6c12586b047c96
2019-04-26 18:01:43 -07:00
Tao Bao fbeac4605c adb: Support rescue install and getprop.
Bug: 128415917
Test: Enter rescue mode on taimen. Send the following commands:
      `adb rescue getprop ro.build.fingerprint`
      `adb rescue getprop ro.build.date.utc`
      `adb rescue getprop ro.build.invalid`
      `adb rescue install /path/to/package.zip`
Test: Sideload on taimen w/ `adb sideload /path/to/package.zip`.
Change-Id: Ia246b30314fbcd2bd4cc71a8085a280e33041967
Merged-In: Ia246b30314fbcd2bd4cc71a8085a280e33041967
(cherry picked from commit 11cf30b5ed)
2019-04-26 12:27:39 -07:00
Tao Bao 25fe126fb0 adb: Recognize rescue mode.
This CL adds client support to recognize the rescue mode (which will be
served by recovery image). It also allows waiting for a device to enter
rescue mode. The support for the actual rescue commands will be added in
follow-up CLs.

Bug: 128415917
Test: `adb devices` recognizes devices under rescue mode.
Test: `adb wait-for-rescue` waits for device to be in rescue mode.
Change-Id: I367d7339fe68006aba09a1e3db6370d472296676
Merged-In: I367d7339fe68006aba09a1e3db6370d472296676
(cherry picked from commit 55d407ec4a)
2019-04-26 12:27:17 -07:00
xunchang c2265c5343 Support adb rescue wipe command
Support `adb rescue wipe` command on the host side. This command runs
under the rescue mode and wipes data (and cache/metadata).

Bug: 131037235
Test: run adb rescue wipe

Change-Id: Ib3a3f2d564cc19d0446540d616cc21489ba558c2
2019-04-26 10:37:13 -07:00
Andreas Gampe b9df7d936c Nativeloader: Restrict anonymous namespace creation
Create the anonymous namespace only from a non-empty library path.

This is a better heuristic than the current "first-come" one. It
allows creating classloaders that are not directly related to an
app's "main" classloader, that is, do not have any library path.
This is the case, for example, for shared libraries, including
preloaded ones.

Longer-term, the anonymous namespace creation should be made
explicit, so that the framework can have full control.

Bug: 130623656
Test: m
Test: manual
Change-Id: I8251363b372e365d10ae09d23df93d76388ac7f9
2019-04-26 08:55:53 -07:00
Joseph Jang d798ff1e78 Merge "init: Add reboot timeout handler" am: 67231474fe
am: 57f086ea4c

Change-Id: I5918986fa44d9decf7a8aa4cfcaf0b1520b1041e
2019-04-26 01:46:06 -07:00
Misha Wagner cac1871407 Merge "Add UID printing to tombstone headers" am: 79474ce6f3
am: 2ded863997

Change-Id: I5bafc9c83458096a3367d92214b2eb79efb227f4
2019-04-26 01:45:19 -07:00
Joseph Jang 57f086ea4c Merge "init: Add reboot timeout handler"
am: 67231474fe

Change-Id: I233976350653d41b76c1413aa4b6212b4a206a13
2019-04-26 01:40:51 -07:00
Misha Wagner 2ded863997 Merge "Add UID printing to tombstone headers"
am: 79474ce6f3

Change-Id: I9284850d1dafe216e44feb041c21ca78a8ec64ee
2019-04-26 01:40:11 -07:00
Joseph Jang 67231474fe Merge "init: Add reboot timeout handler" 2019-04-26 08:23:06 +00:00
Misha Wagner 79474ce6f3 Merge "Add UID printing to tombstone headers" 2019-04-26 08:22:17 +00:00
TreeHugger Robot ff9ac9e286 Merge "Remove the mount points defined in skip_mount.cfg from ReadDefaultFstab()" into qt-dev 2019-04-26 03:59:33 +00:00
josephjang aaddf282ec init: Add reboot timeout handler
In order to prevent device stuck at reboot, we try to create shutdownt
monitor thread with a timeout (default 30s). It will dump init process
and blocked tasks call trace in last kmsg then trigger kernel panic to
reboot device.

Test: reboot device

bug: 128561401
Change-Id: Ieb400ab9fbd983544b61241a4f4b8aa2f4baa863
2019-04-26 06:02:09 +08:00
Ian Kasprzak 19187f1bfc Merge "Revert "Add a way to turn off unique_fd's operator int."" am: e30fe5fe89
am: e285dbeae3

Change-Id: I8a4911e8b6970c3b0defef66dc109358ff2d6748
2019-04-25 10:30:15 -07:00
Ian Kasprzak e285dbeae3 Merge "Revert "Add a way to turn off unique_fd's operator int.""
am: e30fe5fe89

Change-Id: Icfde91e105016922777dc24e0676de9b88b42058
2019-04-25 10:24:50 -07:00
Ian Kasprzak e30fe5fe89 Merge "Revert "Add a way to turn off unique_fd's operator int."" 2019-04-25 17:16:55 +00:00
Tom Cherry d5e099db8e Merge "liblog: remove LIBLOG_WEAK" am: 81f5424560
am: b7ff39410f

Change-Id: I7f1c0137bc40de5dfbdc5a2ca1f1ac44f2265bf4
2019-04-25 09:10:03 -07:00
Tom Cherry b7ff39410f Merge "liblog: remove LIBLOG_WEAK"
am: 81f5424560

Change-Id: Ib47fb2cf497fd76159614ae8f8da4383761ee882
2019-04-25 08:59:31 -07:00
Ian Kasprzak 2c58e1924a Revert "Add a way to turn off unique_fd's operator int."
This reverts commit 93d63c010a.

Reason for revert: b/131312539 - All aosp-master-with-phones phones failing boot / health check.

Change-Id: Id4239f93484b7d6b8d9bcd355a59cbd40d9766e2
2019-04-25 15:59:28 +00:00
Dongwon Kang 2bff760e83 Merge "Fix a warning on namespace.media.link.default.shared_libs" into qt-dev
am: a04e48dbec

Change-Id: Ic45a521f32dfbe81da5f8f46af27024b3412ea42
2019-04-25 08:45:55 -07:00
Tom Cherry 81f5424560 Merge "liblog: remove LIBLOG_WEAK" 2019-04-25 15:43:36 +00:00
Josh Gao ed0033b4c0 Merge "adbd: reduce queue depths." am: 0fcd9292c4
am: 1c6d4f3663

Change-Id: I95bc10b35cf00f02833978d762c21be4b8e9b5e2
2019-04-24 18:29:59 -07:00
Josh Gao 1c6d4f3663 Merge "adbd: reduce queue depths."
am: 0fcd9292c4

Change-Id: Ib73e5111a82c42627df6a8645f58db8a7831bba6
2019-04-24 18:24:49 -07:00
Josh Gao 0fcd9292c4 Merge "adbd: reduce queue depths." 2019-04-25 01:09:23 +00:00
Nick Kralevich 610cf04a31 Merge "logd: remove SELinux dup handling" am: 8e6fb82af6
am: ba658099a6

Change-Id: I15ab8ad0e7787b3469fd9af1d9ed68e17e64b0c7
2019-04-24 17:30:47 -07:00
Tom Cherry 927c3d9184 liblog: remove LIBLOG_WEAK
I'm not sure why I didn't remove this when I got rid of the other
functions marked as weak.

Test: build
Change-Id: I45e6bca7be0497e33be88d15afea8bb1d5165380
2019-04-24 17:24:23 -07:00