summaryrefslogtreecommitdiff
path: root/adb
AgeCommit message (Collapse)Author
2020-10-22Migrate system/core/adb to packages/modules/adbBaligh Uddin
BUG: 167963357 Test: TH Change-Id: Ie1f82db2fb14e1bdd183bf8d3d93d5e9f974be5d Ignore-AOSP-First: Unable to Merge into aosp/master due to downstream conflicts, so working from bottom up.
2020-10-19Merge "Migrate system/core/adb to packages/modules/adb" am: 4fdc6f1328 am: ↵Treehugger Robot
0a5509a105 am: 085bed9e1a am: 4840e9afad Original change: https://android-review.googlesource.com/c/platform/system/core/+/1465245 Change-Id: Ie6a425a8e659776aefa86f9cfeb3601f63d84092
2020-10-19Merge "Migrate system/core/adb to packages/modules/adb" am: 4fdc6f1328 am: ↵Treehugger Robot
0a5509a105 am: 085bed9e1a Original change: https://android-review.googlesource.com/c/platform/system/core/+/1465245 Change-Id: If3b17a33b260fb9b41e7785dd8318346df2b246c
2020-10-19Merge "Migrate system/core/adb to packages/modules/adb" am: 4fdc6f1328 am: ↵Treehugger Robot
0a5509a105 Original change: https://android-review.googlesource.com/c/platform/system/core/+/1465245 Change-Id: Icaffb8bcecf6915935f8b65d0c8236a8d813d9f8
2020-10-18Migrate system/core/adb to packages/modules/adbBaligh Uddin
Adding new path to visibility rule, as b/170958306 prevents adding new changes to a project being introduced in the same topic. We need to do this ahead of the migration and then cleanup after the migration is complete. BUG: 167963357 Test: TH Change-Id: Id02e4ea3a6d387bad7b2dbd5d0a38f662d0254fc
2020-10-16Merge "adb: fix timeout-related test flakiness." am: fe1eba0056 am: ↵Josh Gao
51d8abc846 am: b9fd9097cc am: 966c3febea Original change: https://android-review.googlesource.com/c/platform/system/core/+/1463230 Change-Id: I37bc298f741fa5c91baf50b5ae3ef468859b3d4a
2020-10-16Merge "adb: fix timeout-related test flakiness." am: fe1eba0056 am: ↵Josh Gao
51d8abc846 am: b9fd9097cc Original change: https://android-review.googlesource.com/c/platform/system/core/+/1463230 Change-Id: Icb8e0e8663681cdcb60d2965be49599223ba2203
2020-10-16Merge "adb: fix timeout-related test flakiness." am: fe1eba0056 am: 51d8abc846Josh Gao
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1463230 Change-Id: If1eac7f4b6e51ea2c291a93f0007c16fdc1faeea
2020-10-15adb: fix timeout-related test flakiness.Josh Gao
When running tests against cuttlefish, `adb root` sometimes flakes because of a 6 second timeout in wait_for_device, which can get triggered when adbd's restart gets throttled by init. The adb client would notice that the socket went down, try to reconnect and fail because adbd still hasn't started yet, and then wait up to 10 seconds to reconnect, before which the `adb root` invocation would have failed due to timeout. Increase the timeout to be long enough to handle this, and also reduce the interval of reconnections to speed things up when we're in this scenario. Bug: http://b/170707786 Test: while true; do adb root; adb wait-for-device; adb unroot; adb wait-for-device; done Change-Id: I140d721dfcfd635d45813a55990684a25e32228c
2020-10-07Merge "Clarify `adb bugreport` failures on pre-N devices." am: 4c7104ab2a ↵Treehugger Robot
am: 73afed6c6f am: c33fa91b68 am: 742ba27b75 Original change: https://android-review.googlesource.com/c/platform/system/core/+/1451737 Change-Id: I203f39fddfb5b9e397807da08998d93fb4c79a89
2020-10-07Merge "Clarify `adb bugreport` failures on pre-N devices." am: 4c7104ab2a ↵Treehugger Robot
am: 73afed6c6f am: c33fa91b68 Original change: https://android-review.googlesource.com/c/platform/system/core/+/1451737 Change-Id: Iba96e21fe1e8678620fca450b8c607c7ca0c99ce
2020-10-07Merge "Clarify `adb bugreport` failures on pre-N devices." am: 4c7104ab2a ↵Treehugger Robot
am: 73afed6c6f Original change: https://android-review.googlesource.com/c/platform/system/core/+/1451737 Change-Id: I543a41883dd19f1886603c81c24bd76932cde196
2020-10-06Clarify `adb bugreport` failures on pre-N devices.Elliott Hughes
The error was meant to imply "without the filename" but (a) that wasn't spelled out and (b) anyone who did just try the command would probably be unpleasantly surprised by the massive amount of spam on their terminal. So give them copy & paste instead. (I did consider using their supplied filename, but since that's almost certainly blah.zip, it seemed uncool to silently create a large text file called "something.zip"!) Bug: http://b/170225883 Test: untested for lack of a working pre-N device right now Change-Id: I834939c963ca09927ccd4dc5ed8e88c65455838e
2020-09-25Merge "Turn off -Wnon-virtual-dtor explicitly" am: fbb0314c33 am: f80e02cffb ↵Treehugger Robot
am: adb2f5e6e2 am: 38193ea5b9 am: a51acd3e12 Original change: https://android-review.googlesource.com/c/platform/system/core/+/1429930 Change-Id: Ia56e368477ae163c275a2721e4d866b72eae67e9
2020-09-25Merge "Turn off -Wnon-virtual-dtor explicitly" am: fbb0314c33 am: f80e02cffb ↵Treehugger Robot
am: adb2f5e6e2 am: 38193ea5b9 Original change: https://android-review.googlesource.com/c/platform/system/core/+/1429930 Change-Id: I93d6c6ce5db183e9de3de17f272ef053da3664e7
2020-09-25Merge "Turn off -Wnon-virtual-dtor explicitly" am: fbb0314c33 am: f80e02cffbTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1429930 Change-Id: Iaa67c8e7b175974c42c779fb090aab16fe1c5e10
2020-09-25Turn off -Wnon-virtual-dtor explicitlyJiyong Park
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-21Merge "adbd: Fix check against valid payload size" am: 596f3b5384 am: ↵Josh Gao
9a80494702 am: aeb5be6f45 am: 74246334dd am: 51a73f342f Original change: https://android-review.googlesource.com/c/platform/system/core/+/1428117 Change-Id: Ia3df25a6f432a4866e2cd0072e4a968d6b1d21cf
2020-09-19Merge "adbd: Fix check against valid payload size" am: 596f3b5384 am: ↵Josh Gao
9a80494702 am: aeb5be6f45 am: 74246334dd Original change: https://android-review.googlesource.com/c/platform/system/core/+/1428117 Change-Id: I4a55276fb0b501569c65e59c9e72bde3577a2e21
2020-09-19Merge "adbd: Fix check against valid payload size" am: 596f3b5384 am: 9a80494702Josh Gao
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1428117 Change-Id: I6818a334a1a9655cc590805f17f129471d427821
2020-09-18Merge "adbd: Fix check against valid payload size"Josh Gao
2020-09-18adbd: Fix check against valid payload sizeMayank Rana
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-17Merge mainline-release 6664920 to master - DO NOT MERGEBill Yi
Merged-In: Ib2a6c8b5cc127d4aab61a454f47f3cce410d674e Change-Id: Ief5996d70b59986c15a1b8056c678a6ef35a72d3
2020-09-16Merge "ADB internals documentation" am: 190921ed5c am: 84391884f1 am: ↵Josh Gao
2bbd8f3615 am: 14f501f328 am: 129edd2eac Original change: https://android-review.googlesource.com/c/platform/system/core/+/1406642 Change-Id: I1bf5373a24253acd37ed1032b5b702ff2491ed8f
2020-09-16Merge "ADB internals documentation" am: 190921ed5c am: 84391884f1 am: ↵Josh Gao
2bbd8f3615 am: 14f501f328 Original change: https://android-review.googlesource.com/c/platform/system/core/+/1406642 Change-Id: I64b65a1f0f4b6334700a23ebd272fa69a3dff35d
2020-09-16Merge "ADB internals documentation" am: 190921ed5c am: 84391884f1Josh Gao
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1406642 Change-Id: I292aac33c654674c5ce709879f6c1f3d6ac53bbd
2020-09-16Merge "ADB internals documentation" am: 190921ed5cJosh Gao
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1406642 Change-Id: I138b0ee2da1b5bd8396a3fbfdd73e8dae52a316c
2020-09-16Merge "ADB internals documentation"Josh Gao
2020-09-15ADB internals documentationFabien Sanglard
Document the internals of adb pipeline. In particular the fdevent, smart socket, and transport flow. Bug: NA Test: NA Change-Id: Ia8fd8a6da843b8e91ca3005545f33bd0a82cc0c3
2020-09-16Merge "adb: switch to ZipEntry64." am: ebd07cc5d0 am: b138c21233 am: ↵Elliott Hughes
bcb60b915c am: 41a62498f6 am: d9e9eca8f5 Original change: https://android-review.googlesource.com/c/platform/system/core/+/1428116 Change-Id: Ib7f8e4d7e788ac888cd51b4d1e90260ec4fca243
2020-09-16Merge "adb: switch to ZipEntry64." am: ebd07cc5d0 am: b138c21233 am: ↵Elliott Hughes
bcb60b915c am: 41a62498f6 Original change: https://android-review.googlesource.com/c/platform/system/core/+/1428116 Change-Id: I93e4aec51956102d7eb4aea0bfe8764fbf0b6d65
2020-09-15Merge "adb: switch to ZipEntry64." am: ebd07cc5d0 am: b138c21233Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1428116 Change-Id: Ic5837beac4207e1350b2757abd3acd406c8bd781
2020-09-15Merge "adb: switch to ZipEntry64." am: ebd07cc5d0Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1428116 Change-Id: I4b54492e65225b81fe5c83763092b958ed69fab0
2020-09-15Merge "adb: switch to ZipEntry64."Elliott Hughes
2020-09-15adb: switch to ZipEntry64.Elliott Hughes
Test: treehugger Change-Id: I1eba8c641912e46ed243deddd19f367ae40a5d46
2020-09-13Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGEBill Yi
Merged-In: I92ad7146ad926a1c9a76461bf4bda38bfbf6b0c8 Change-Id: I00b57cb1b7ca75ba19667ae947492536cc58628d
2020-09-11Merge "adb: fix `push --sync` with multiple inputs." am: 316298d7b0 am: ↵Treehugger Robot
2e4934b582 am: 91b046a8ff am: f6ba92f171 am: da99abef81 Original change: https://android-review.googlesource.com/c/platform/system/core/+/1422155 Change-Id: I860956a853a8b9914488148d9e145120bb9b5248
2020-09-11Merge "adb: fix `push --sync` with multiple inputs." am: 316298d7b0 am: ↵Treehugger Robot
2e4934b582 am: 91b046a8ff am: f6ba92f171 Original change: https://android-review.googlesource.com/c/platform/system/core/+/1422155 Change-Id: I747488e250eb8624be80efe013bab34363ccfe91
2020-09-11Merge "adb: fix `push --sync` with multiple inputs."Treehugger Robot
2020-09-08adb: fix `push --sync` with multiple inputs.Josh Gao
Previously, when push --sync was used with multiple files, we tried to stat a remote file with pending acknowledgements still in the socket buffer, which leads to an abort when we read ID_OKAY instead of the response we were expecting. This patch changes the behavior to always wait for acknowledgements if we're pushing with --sync (or `adb sync`). This results in a ~100ms regression during a 10 second sync of every file on the system image, but that's not very much, so perhaps we should consider doing this always. Bug: http://b/166155032 Test: test_device.py Change-Id: I7110243071ba5fbaa77dcc76f42a19d9ed2b4195
2020-09-01Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into ↵Xin Li
stage-aosp-master
2020-09-01Merge changes I3a2191b0,Ide1056b5 am: af13a8b744 am: b1463adad0 am: ↵Treehugger Robot
3e97c64c33 am: c122bafe2f am: f6b726ed54 Original change: https://android-review.googlesource.com/c/platform/system/core/+/1409690 Change-Id: I3be4dc25b747d8cba8b2a10f65e419fcd11641c8
2020-09-01Merge changes I3a2191b0,Ide1056b5 am: af13a8b744 am: b1463adad0 am: ↵Treehugger Robot
3e97c64c33 am: c122bafe2f Original change: https://android-review.googlesource.com/c/platform/system/core/+/1409690 Change-Id: Idae8d06fbf332742b98d2f0b729ec7bed21fc05b
2020-09-01Merge changes I3a2191b0,Ide1056b5 am: af13a8b744 am: b1463adad0Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1409690 Change-Id: I26dfd2fe0eef8ebc9e8bbb6bcc1561a074a0a6da
2020-08-29Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li
Bug: 166295507 Merged-In: Id18cb0e2d2f3e776a42b566c4a1af2e250890896 Change-Id: Iba7cab32ab3aa6f47952c840ff6dc8492e8d0704
2020-08-28Don't enable version lib for libadb_sysdepsJiyong Park
When use_version_lib is set to true, but build::GetBuildNumber() isn't used, the library can't be processed by symbol_inject. For example, $ m out/soong/.intermediates/system/core/adb/libadb_sysdeps/android/arm64_armv8-a_shared/versioned/libadb_sysdeps.so FAILED: out/soong/.intermediates/system/core/adb/libadb_sysdeps/android_arm64_armv8-a_shared/versioned/libadb_sysdeps.so out/soong/host/linux-x86/bin/symbol_inject -i out/soong/.intermediates/system/core/adb/libadb_sysdeps/android_arm64_armv8-a_shared/unstripped/libadb_sysdeps.so -o out/soong/.intermediates/system/core/adb/libadb_sysdeps/android_arm64_armv8-a_shared/versioned/libadb_sysdeps.so -s soong_build_number -from 'SOONG BUILD NUMBER PLACEHOLDER' -v $(cat out/soong/build_number.txt) symbol not found 17:09:10 ninja failed with: exit status 1 This is because the visibility of the symbol `soong_build_number` in libbuildversion.a is hidden via the -fvisibility=hidden flag for the library. In addition, -Wl,--gc-sections strips the hidden symbol when it is not referenced. This fortunately hasn't caused a problem because, for the device target, the output of symbol_inject was used only for dist outputs. libadb_sysdeps wasn't registered as dists. So versioned/libadb_sysprops.so never had a chance to be built. For the host target, in the other hand, the output of symbol_inject is used always, but --gc-sections is not used for host targets. So the symbol wasn't stripped and therefore symbol_inject could always find the symbol. This however is expected to cause a problem when the support for LinuxCross is added. It is one of the host targets, therefore symbol_inject is always used. However, unlike other host targets, --gc-sections is turned on because it inherits most of the flags from Android/ARM64. To avoid the problem, we might want to disable --gc-sections for the target. But regardless of the decision, having a build rule that always fails is not desirable - even though the build rule is essentially never triggered. Therefore, we choose to not use version lib for libadb_sysdeps because GetBuildNumber() is not used in the lib. Bug: 159685774 Test: m \ out/soong/.intermediates/system/core/adb/libadb_sysdeps/android/\ arm64_armv8-a_shared/versioned/libadb_sysdeps.so Change-Id: Ide1056b5b55e409ab809e302a697d10d759c92ce
2020-08-26Merge "Allow shell to write to /sdcard/Android/data and ↵Treehugger Robot
/sdcard/Android/obb." am: 0297fef2f9 am: 56a0602e4a am: fa8393ecec am: 7797b07fb9 am: 36f0631698 Original change: https://android-review.googlesource.com/c/platform/system/core/+/1404487 Change-Id: I2f28330cd32ad676f948fe4b4d334f23e97213e8
2020-08-26Merge "Allow shell to write to /sdcard/Android/data and ↵Treehugger Robot
/sdcard/Android/obb." am: 0297fef2f9 am: 56a0602e4a am: fa8393ecec am: 7797b07fb9 Original change: https://android-review.googlesource.com/c/platform/system/core/+/1404487 Change-Id: Id60f74f40b7798d25a4ee7ddf9f5e08ff48f14de
2020-08-26Merge "Allow shell to write to /sdcard/Android/data and ↵Treehugger Robot
/sdcard/Android/obb." am: 0297fef2f9 am: 56a0602e4a Original change: https://android-review.googlesource.com/c/platform/system/core/+/1404487 Change-Id: Ib5c8b901c62367fe0ed2750a4ff0ea06cbd7f3c0
2020-08-21Merge "Allow shell to write to /sdcard/Android/data and /sdcard/Android/obb."Treehugger Robot
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-04 06:48:31 +0000