Commit Graph

16289 Commits

Author SHA1 Message Date
Dan Willemsen
7ad271e774 Merge "Update windows sdk to build non-recursively" 2015-09-09 18:13:21 +00:00
Christopher Ferris
a861beec5c Merge "Update the stack script for apk handling." 2015-09-04 18:09:58 +00:00
Christopher Ferris
ece64c4bd5 Update the stack script for apk handling.
The dlopen of a shared library within an apk is not handled by
the stack tool. Modify to understand and search through the apk to
find the shared library associated with the offset. Then unzip
that shared library to use as the target of addr2line.

Change-Id: I404302f68dff45c35a1dc2a55547f42ea04f02bf
2015-09-04 10:51:22 -07:00
Dan Willemsen
1162db78ec Merge "Stop checking HOST_OS" 2015-09-04 02:53:19 +00:00
Chris Craik
8ae499e1d3 Merge "Support new systrace file structure after switching to catapult" 2015-09-02 17:17:30 +00:00
Dan Willemsen
a55701c0be Merge "Remove USE_MINGW, whitelist modules for windows" 2015-08-31 19:26:19 +00:00
Dan Willemsen
349f891d94 Update windows sdk to build non-recursively
Now the build system can support a HOST_CROSS_OS to build both linux and
windows binaries at the same time.

Bug: 23566667
Change-Id: I82b497c2621fbfbe493d0568fca42863c5fe9433
2015-08-28 13:30:16 -07:00
Dan Willemsen
d93269d03a Stop checking HOST_OS
LOCAL_MODULE_HOST_OS is now enforced, so these can always be defined.

Bug: 23566667
Change-Id: I098aaa5e4d346ef346afff3fa641106870aab363
2015-08-28 13:29:43 -07:00
Dan Willemsen
b2fa10bf9c Remove USE_MINGW, whitelist modules for windows
Bug: 23566667
Change-Id: I944f48aea13abef0efa157c82ef7c91a63429eb5
2015-08-28 13:29:35 -07:00
Zhen Wang
fe9acde0a2 Support new systrace file structure after switching to catapult
Change-Id: Ib7e99ff8d5679e32673a62ada7a9e1d9ad2e75cb
Signed-off-by: Zhen Wang <zhenw@google.com>
2015-08-28 12:43:01 -07:00
Elliott Hughes
1a8697f91c Merge "Patch android-21 with aarch64 <sys/user.h> fixes." 2015-08-26 15:22:05 +00:00
Elliott Hughes
2e60272c03 Patch android-21 with aarch64 <sys/user.h> fixes.
This makes the files match (AOSP ToT post-M) bionic.

Bug: http://b/23377194
Change-Id: Ie72614612fbe49c4250ca1383d1d224e8bff62dc
2015-08-25 18:43:20 -07:00
Andreas Gampe
07ddfb0edf Merge "Development/scripts: Add sanitizer dump support to stack" 2015-08-22 00:34:13 +00:00
Andreas Gampe
d900d08d81 Development/scripts: Add sanitizer dump support to stack
Add trace parsing for sanitizer output. The output is different
from debuggerd output (and we do not have control over it). Use
two separate regexes and factor out the parsing into a method
returning a tuple of data.

Note: as we have no control over the prologue of the dump, we
cannot change it to include information like the ABI. Thus, this
functionality only works in a lunched tree, where the tool
implicitly uses the symbols directory.

Change-Id: Ic1189f4f65cf7728d1baec7055ecb549b0aa5f62
2015-08-21 17:29:47 -07:00
Dan Willemsen
d592f8c716 Merge "Remove the mingw package check" 2015-08-13 21:31:03 +00:00
Dan Willemsen
cb994dd019 Remove the mingw package check
We're using mingw prebuilts checked into the tree now, the external
package is no longer necessary.

Change-Id: I349f9605d3d09decc3ec5df3ba595728c0a2727c
2015-08-13 14:27:23 -07:00
Elliott Hughes
944f23ec76 Merge "AdbWinUsbApi.dll: fix race condition crash in WinUsb.dll" 2015-08-12 21:20:24 +00:00
Spencer Low
487b1deae9 AdbWinUsbApi.dll: fix race condition crash in WinUsb.dll
There is a race condition in AdbWinUsbApi.dll where AdbCloseHandle() of an
interface would clobber the WinUsb handles, causing a concurrent
Adb{Read,Write}EndpointSync() to crash.

The fix is to make AdbCloseHandle(endpoint) set a flag to prevent future IOs
from starting up, abort any pending IOs, and wait for the pending IOs to abort.
Adb{Read,Write}EndpointSync() participates in this scheme.

There is still a race condition if the caller calls AdbCloseHandle(interface)
before calling AdbCloseHandle(endpoint). No AOSP code does this and assuming
that this never happens simplifies the fix.

This fix also ignores Adb{Read,Write}EndpointAsync() (the async APIs) since
those APIs are unused by AOSP.

This fix should not affect devices whose vendor supplies Windows USB drivers
that use a 'legacy kernel driver'. This causes AdbWinApi.dll to call a 'legacy
kernel driver' instead of AdbWinUsbApi.dll (which uses WinUsb.dll which uses a
kernel driver included with Windows). The source code for the 'legacy kernel
driver' was deleted from AOSP over 4 years ago, so it is probably deprecated
(I don't know the official status of it). Even so, I wouldn't be surprised if
some modern 3rd party devices were still using the legacy driver or a similar
driver derived from the original source code.

Also in this change:

 - Added a test case to adb_winapi_test that reproduces the race condition and
   verifies the fix.

 - adb_winapi_test misc: more strictly check return values and error codes,
   symbolize some dumped data to make things more readable, disable old test
   code that looked for specific hardware, test AdbGetInterfaceName() the same
   way adb uses it, fix dumping of initial "handshake".

 - Increased AdbWinUsbApi.dll file version info from 2.0.0.0 to 2.0.0.1.

 - Update AdbWinUsbApi.dll in prebuilt tree.

 - Include AdbWinUsbApi.pdb (debugging symbols) so the DLL can be debugged in
   the future (or at least so crash addresses can be manually symbolized).

 - Update AdbWinApi.dll, AdbWinUsbApi.dll, adb_winapi_test.exe build
   environments to WDK 7.1.0, which seems to be the publicly available closest
   version to what built the last version of these files.

   This entailed modifying SOURCES files to use USE_NATIVE_EH=1 instead of
   USER_C_FLAGS=/EHsc, removing /Wp64, manually setting DLL base addresses to
   the old address, using DEBUG_CRTS=1 to pickup the debug ATL for checked
   builds.

 - Update BUILDME.TXT files with up-to-date instructions.

 - For source files that are already majority CRLF, make the whole file CRLF.

 - Update SOURCES to explicitly set Windows Vista as the target. This means
   that future rebuilders don't need to worry as much about their build
   environment.

Bug: https://code.google.com/p/android/issues/detail?id=161890

Change-Id: I30a4e2ff3919929001c2319c4bb80354f7bcfda0
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2015-08-12 14:14:52 -07:00
Ying Wang
f6b91cf39b Merge "Switch to 64-bit host tools in Linux/Mac SDK build." 2015-08-01 17:23:30 +00:00
Ying Wang
fca823453b Switch to 64-bit host tools in Linux/Mac SDK build.
Bug: 22776595
Change-Id: Iadf56f045f6920d4e97c8b1219b1b3907213b12b
2015-07-31 13:38:57 -07:00
Paul Miller
6ae8b0bf0f Merge "Remove references to Browser tests" 2015-07-24 21:02:50 +00:00
Elliott Hughes
7a734ced76 Merge "Warn if you're trying to use gdbclient without "adb root"." 2015-07-24 17:39:59 +00:00
Elliott Hughes
ef3f1e2c1a Warn if you're trying to use gdbclient without "adb root".
Bug: http://b/22715953
Change-Id: If729fbc89ccd65407e8900bc27df8fa4174dd64e
2015-07-24 10:32:07 -07:00
Paul Miller
f5da1f2a76 Remove references to Browser tests
Browser is going away

BUG:19351071
Change-Id: Ief2a0843fce4d28be7fa1200021ad2b3aa047958
2015-07-22 11:15:58 -07:00
Elliott Hughes
73371e581b Merge "Fix gdbclient to work with emulator builds" 2015-07-09 15:48:55 +00:00
Nikola Veljkovic
4efdec68b0 Fix gdbclient to work with emulator builds
gdbclient got broken by:
https://android-review.googlesource.com/156974

To fix, check for special case when device is actually an emulator,
and set the $DEVICE variable accordingly.

Change-Id: I85d0d520ae1e2ea022aa3e2d08a10cd0b1cb491f
2015-07-09 12:05:13 +02:00
Dmitriy Ivanov
30b96ba70d Merge "Use ro.hardware property to detect the device" 2015-06-29 21:08:28 +00:00
Dmitriy Ivanov
91dcbe968b Use ro.hardware property to detect the device
Bug: http://b/22120411
Change-Id: Ida9bc157b560edbe8c2db67f5df5109c192fef9d
2015-06-29 11:27:30 -07:00
Elliott Hughes
6201465c3c Merge "Remove more libportable cruft." 2015-06-25 22:06:46 +00:00
Elliott Hughes
9e164c6a56 Remove more libportable cruft.
Change-Id: I971f6d501abf5145bd03a05eeed246f34406e6ea
2015-06-25 15:03:54 -07:00
Stephen Hines
b85e0a9e59 Merge "Remove unnecessary clang from product_sdk.mk." 2015-06-25 21:57:57 +00:00
Stephen Hines
27241e7056 Remove unnecessary clang from product_sdk.mk.
It is sufficient to just have this exist in windows_sdk.mk.

Change-Id: I33e4b41622bd7891f5e4868ba0e5138f3d83fa1f
2015-06-25 14:37:59 -07:00
Stephen Hines
2ca0c6f9b6 Merge "Add clang.exe to Windows SDK build." 2015-06-25 21:17:24 +00:00
Stephen Hines
eb8b46d7a7 Add clang.exe to Windows SDK build.
Bug: 22044739

This is needed as part of the NDK itself, now that we are shipping the
platform Clang as the one true Clang. It can be built by doing:

make winsdk-tools

Change-Id: I3363f46b5dcc52258aa92b42b5a92a96bf868e73
2015-06-25 14:11:11 -07:00
Elliott Hughes
71142c8d92 Merge "Patch android-21 with x86 gdbserver <sys/procfs.h> and <sys/user.h> fixes." 2015-06-25 14:30:37 +00:00
Elliott Hughes
dd0632273f Patch android-21 with x86 gdbserver <sys/procfs.h> and <sys/user.h> fixes.
This makes the files match (AOSP ToT post-M) bionic.

Bug: http://b/22068064
Change-Id: I100ac14afc06c2fe09ef5ecf9c2e3afa13b68c3b
2015-06-24 17:41:12 -07:00
Elliott Hughes
2acf10ae21 Merge "Don't try to build libportable." 2015-06-24 19:56:01 +00:00
Elliott Hughes
e9dcde67ad Don't try to build libportable.
Change-Id: I161a2e05c9bedddda40713346769878fb8c5a588
2015-06-24 12:41:52 -07:00
Chris Craik
400ae3d4e7 Merge "Support new systrace file structure after refactor" 2015-06-23 01:33:48 +00:00
Zhen Wang
05819dbf05 Support new systrace file structure after refactor
This is needed for
https://android-review.googlesource.com/#/c/154850/

Change-Id: Ibd5f33d0c038bfba37d81b23234945b9033c210a
Signed-off-by: Zhen Wang <zhenw@google.com>
2015-06-22 15:44:20 -07:00
Elliott Hughes
2807d9535a Merge "Remove bogus "arch-p" directory." 2015-06-19 22:11:37 +00:00
Elliott Hughes
608e77f701 Remove bogus "arch-p" directory.
Change-Id: I89d9710357dc9ee490e2d54894b5fea48236a5b2
2015-06-19 14:19:11 -07:00
Elliott Hughes
7bc5bfc65c Merge "Retcon recent header fixes needed to build gdbserver." 2015-06-18 16:29:53 +00:00
Elliott Hughes
e3ca8e7434 Retcon recent header fixes needed to build gdbserver.
Bug: http://b/21695943
Change-Id: I2b2f0e21a66093bdbbdbc0320ffa574eefaaf5fa
2015-06-17 21:51:13 -07:00
Andreas Gampe
172283617b Merge "Development: change gdbclient GDB selection" 2015-06-02 00:08:29 +00:00
Andreas Gampe
ec469238b2 Merge "Development: Mips64 stack-core test" 2015-06-02 00:05:47 +00:00
Andreas Gampe
876b092025 Development: change gdbclient GDB selection
Mips now uses the 64-bit version in general. Also simplify the x86
selection.

Bug: 21467410
Bug: 21555893
Change-Id: If0477356d3c3dbf9e0dfbfcabcb098dc7b8aeba2
2015-06-01 15:57:25 -07:00
Andreas Gampe
820ca728db Development: Mips64 stack-core test
Add a test for Mips64 stack-core.

Bug: 21555893
Change-Id: I2d6feba9bde3977cabc5e771bf14c55de1fbff53
2015-06-01 15:43:52 -07:00
Andreas Gampe
7d4a83600f Merge "Add mips64 to stack tool" 2015-05-26 16:59:37 +00:00
Andrew Hsieh
e6d6227a90 Merge "Fix fegetenv and fesetenv for arm" 2015-05-26 05:01:19 +00:00