Commit graph

16161 commits

Author SHA1 Message Date
Elliott Hughes
d260be38c6 resolved conflicts for merge of 486645ee to mnc-dr-dev-plus-aosp
Change-Id: Ia7fbfc56f01b683e4e4870b3952fe2af32962123
2015-07-30 16:32:10 -07:00
Elliott Hughes
486645ee43 am 0cf93dc3: Merge "Write mkdirs in more idiomatic C++ style."
* commit '0cf93dc345cd5e8131009146a3b2767b1c60f77b':
  Write mkdirs in more idiomatic C++ style.
2015-07-30 23:00:45 +00:00
Elliott Hughes
0cf93dc345 Merge "Write mkdirs in more idiomatic C++ style." 2015-07-30 22:56:01 +00:00
Alex Vallée
47d67c96ec Write mkdirs in more idiomatic C++ style.
~ Rewrote mkdirs to be in C++ style.
~ Replaced adb_dir{start,stop} with std::string params and (r)find.
+ Added test for mkdirs.

Also make base/test_utils.h public and support temporary directories
as well as files.

Change-Id: I6fcbdc5e0099f3359d3aac6b00c436f250ca1329
2015-07-30 15:08:53 -07:00
Tom Cherry
7da270df1d am a21d8562: am d548e30f: Merge "init: Create classes for Action and Command"
* commit 'a21d85620560896bbed0cd43db9ed3224ab4e974':
  init: Create classes for Action and Command
2015-07-30 21:31:38 +00:00
Tom Cherry
a21d856205 am d548e30f: Merge "init: Create classes for Action and Command"
* commit 'd548e30f04b2eb7aa00deab42f5559d08396c38e':
  init: Create classes for Action and Command
2015-07-30 21:08:54 +00:00
Tom Cherry
d548e30f04 Merge "init: Create classes for Action and Command" 2015-07-30 21:03:48 +00:00
Andreas Gampe
9e12d94002 am 9773d945: am eb0b1513: Merge "Toolbox: Disable unused-const-variable warning"
* commit '9773d94571ed7c13a04ddb818a45820781d3bfdc':
  Toolbox: Disable unused-const-variable warning
2015-07-30 20:50:38 +00:00
Lee Campbell
45bd7bcf37 am 1691d968: am 138c540f: Merge "init: Add C++ tokenizer."
* commit '1691d968f8ae5f25036251fd5978be637bbf0b4a':
  init: Add C++ tokenizer.
2015-07-30 20:45:25 +00:00
Andreas Gampe
9773d94571 am eb0b1513: Merge "Toolbox: Disable unused-const-variable warning"
* commit 'eb0b151369371993a70c2079b8253f6dd24814b7':
  Toolbox: Disable unused-const-variable warning
2015-07-30 20:45:16 +00:00
Andreas Gampe
eb0b151369 Merge "Toolbox: Disable unused-const-variable warning" 2015-07-30 20:38:04 +00:00
Tom Cherry
fa0c21c94c init: Create classes for Action and Command
This creates the concept of 'event_trigger' vs 'property_trigger'

Previously these were merged into one, such that 'on property:a=b &&
property:b=c' is triggered when properties a=b and b=c as expected,
however combinations such as 'on early-boot && boot' would trigger
during both early-boot and boot.  Similarly, 'on early-boot &&
property:a=b' would trigger on both early-boot and again when property
a equals b.

The event trigger distinction ensures that the first example fails to
parse and the second example only triggers on early-boot if
property a equals b.

This coalesces Actions with the same triggers into a single Action object

Change-Id: I8f661d96e8a2d40236f252301bfe10979d663ea6
2015-07-30 13:37:23 -07:00
Lee Campbell
1691d968f8 am 138c540f: Merge "init: Add C++ tokenizer."
* commit '138c540f53249cdf3cbece7a54aca85202cf94e9':
  init: Add C++ tokenizer.
2015-07-30 20:36:46 +00:00
Lee Campbell
138c540f53 Merge "init: Add C++ tokenizer." 2015-07-30 20:30:07 +00:00
Dan Albert
629fe4a9ee am bec459a2: am 480bea33: Merge "Add top level sanitize options for ADB."
* commit 'bec459a277a0e391f5d36280bbf37eb6d84562fe':
  Add top level sanitize options for ADB.
2015-07-30 19:02:29 +00:00
Dan Albert
bec459a277 am 480bea33: Merge "Add top level sanitize options for ADB."
* commit '480bea3372e6b112c0ec80fdf82b16296d388d63':
  Add top level sanitize options for ADB.
2015-07-30 18:55:26 +00:00
Andreas Gampe
3294ad163f Toolbox: Disable unused-const-variable warning
For build-system CFLAGS clean-up, disable unused-const-variable
warning.

Bug: 18632512
Change-Id: I1be1ac744f8c77bd0a8378578072285a2c035245
2015-07-30 11:52:11 -07:00
Lee Campbell
220ca84223 init: Add C++ tokenizer.
Adds a C++ tokenizer along with unit tests.

This tokenizer will replace the current C implementation
which does a poor job of keeping track of pointers.

This CL is a prerequisite for up coming changes to
the parser. This CL does not wire up this tokenizer and
changes no exsiting code. All that builds is the unit tests.

Change-Id: Iec3740bce7153640adc5e5bbdc57e644cedf0038
TEST: Unit tests all pass. No leaks under valgrind
BUG: 22843198
2015-07-30 18:45:17 +00:00
Dan Albert
480bea3372 Merge "Add top level sanitize options for ADB." 2015-07-30 18:44:37 +00:00
Elliott Hughes
229014e384 am 7a699a6a: am 9bc4e7a5: Merge "bionic no longer sends SIGPIPE to debuggerd."
* commit '7a699a6ac63d9ed1e0b994c108189b219f1461bd':
  bionic no longer sends SIGPIPE to debuggerd.
2015-07-30 17:48:13 +00:00
Elliott Hughes
7a699a6ac6 am 9bc4e7a5: Merge "bionic no longer sends SIGPIPE to debuggerd."
* commit '9bc4e7a5530337e182a8876e14e71ee741dd67ac':
  bionic no longer sends SIGPIPE to debuggerd.
2015-07-30 17:42:56 +00:00
Elliott Hughes
9bc4e7a553 Merge "bionic no longer sends SIGPIPE to debuggerd." 2015-07-30 17:33:16 +00:00
Dan Albert
9113b47eac Add top level sanitize options for ADB.
Host and target are split here because the target can really only use
ubsan (most sanitizers don't support static executables).

Change-Id: I8a5a5adeeef5c27aaaa3d8145b1570760b764ce3
2015-07-30 10:25:32 -07:00
Dan Albert
5659918d6f am cc552ea3: am 3b5b1328: Merge "adb/test_device.py fixes for win32 and no use of ANDROID_SERIAL"
* commit 'cc552ea335497ecd95db3eae136d10ab3026d171':
  adb/test_device.py fixes for win32 and no use of ANDROID_SERIAL
2015-07-30 17:20:15 +00:00
Dan Albert
cc552ea335 am 3b5b1328: Merge "adb/test_device.py fixes for win32 and no use of ANDROID_SERIAL"
* commit '3b5b1328173b4914ccc3c50bdd5eaa046dbd6cd7':
  adb/test_device.py fixes for win32 and no use of ANDROID_SERIAL
2015-07-30 17:09:04 +00:00
Dan Albert
3b5b132817 Merge "adb/test_device.py fixes for win32 and no use of ANDROID_SERIAL" 2015-07-30 17:04:52 +00:00
Elliott Hughes
5ec940aed8 am fb1ecbc5: am e6e71608: Merge "Use __ANDROID__ instead of HAVE_ANDROID_OS."
* commit 'fb1ecbc55e7edeafb138eb2a60ca89ba9a7b1f0f':
  Use __ANDROID__ instead of HAVE_ANDROID_OS.
2015-07-30 16:50:27 +00:00
Elliott Hughes
fb1ecbc55e am e6e71608: Merge "Use __ANDROID__ instead of HAVE_ANDROID_OS."
* commit 'e6e71608bd60b4745b048ec466b5ea1301020b32':
  Use __ANDROID__ instead of HAVE_ANDROID_OS.
2015-07-30 16:42:50 +00:00
Elliott Hughes
e6e71608bd Merge "Use __ANDROID__ instead of HAVE_ANDROID_OS." 2015-07-30 16:34:47 +00:00
Elliott Hughes
9b828adfad Use __ANDROID__ instead of HAVE_ANDROID_OS.
Change-Id: I9967f3fd758c2a5b40be5b60ae72be7e2fb75136
2015-07-30 09:33:43 -07:00
Elliott Hughes
bb9c0a0031 am 42dbc4b1: am 44443bea: Merge "Use _WIN32 rather than HAVE_WINSOCK."
* commit '42dbc4b1859fe4de16b19e9b74324b345c5fcb9d':
  Use _WIN32 rather than HAVE_WINSOCK.
2015-07-30 15:17:38 +00:00
Elliott Hughes
f39383103b bionic no longer sends SIGPIPE to debuggerd.
Static binaries don't get the signal handler installed (that's done by the
dynamic linker) so we don't need to worry about seeing SIGPIPE crashes from
old binaries.

Bug: http://b/20659371
Change-Id: I3b5566634fadd3e822262561188d29814bccd1fd
2015-07-30 08:15:57 -07:00
Elliott Hughes
42dbc4b185 am 44443bea: Merge "Use _WIN32 rather than HAVE_WINSOCK."
* commit '44443bead6cf3c6e71029e7181f64ba82c6a8c8e':
  Use _WIN32 rather than HAVE_WINSOCK.
2015-07-30 15:03:27 +00:00
Elliott Hughes
44443bead6 Merge "Use _WIN32 rather than HAVE_WINSOCK." 2015-07-30 14:49:56 +00:00
Spencer Low
3e7feda3c5 adb/test_device.py fixes for win32 and no use of ANDROID_SERIAL
If ANDROID_SERIAL was not set, test_device.py was failing.

Use posixpath.join instead of os.path.join for make_random_device_files.

Change-Id: I24bfa43ba2a89a9a768f505fc0bba9d873082b2f
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2015-07-30 01:19:52 -07:00
Yasuhiro Matsuda
70ab38a570 am 102ead3a: am b10e562b: Merge "Introduce a mechanism to trace boot sequence."
* commit '102ead3ae187a007b8a90b61ea243197927b6ae2':
  Introduce a mechanism to trace boot sequence.
2015-07-30 08:05:46 +00:00
Yasuhiro Matsuda
102ead3ae1 am b10e562b: Merge "Introduce a mechanism to trace boot sequence."
* commit 'b10e562b4cb5ffd6f02ab891d40644b581ad5d47':
  Introduce a mechanism to trace boot sequence.
2015-07-30 07:51:09 +00:00
Yasuhiro Matsuda
b10e562b4c Merge "Introduce a mechanism to trace boot sequence." 2015-07-30 07:42:09 +00:00
Yasuhiro Matsuda
ea504bc084 am 1a1f9beb: am dcf89091: Merge "Add a script to record Android boot time."
* commit '1a1f9beb1dbd0da0f305ff44816661cc404ba877':
  Add a script to record Android boot time.
2015-07-30 05:48:08 +00:00
Yasuhiro Matsuda
1a1f9beb1d am dcf89091: Merge "Add a script to record Android boot time."
* commit 'dcf890914c7571d3068046b9df1f672e9f45b4d2':
  Add a script to record Android boot time.
2015-07-30 05:35:22 +00:00
Yasuhiro Matsuda
dcf890914c Merge "Add a script to record Android boot time." 2015-07-30 05:21:41 +00:00
Yasuhiro Matsuda
ab3798399d Add a script to record Android boot time.
perfboot.py repeats the record of each event log during Android
boot specified times. By default, interval between measurements
is adjusted in such a way that CPUs are cooled down sufficiently
to avoid boot time slowdown caused by CPU thermal throttling.
This script also works around the issue of dropbox slowing down
boot time on userdebug build (http://b/20890386) by limiting
the number of files to be created by dropbox.
The result is output in a tab-separated value format.

BUG: 22207911
Change-Id: I0ddbac5d1c941efda87bc6db6388d8194d4bb3dd
2015-07-30 14:16:15 +09:00
Elliott Hughes
8522d13936 am ae7e8d44: am 6fd4de76: Merge "Fix Win32 <ziparchive/zip_archive.h>."
* commit 'ae7e8d44b0d5e00e8487e6a53d7abf87fb2477dd':
  Fix Win32 <ziparchive/zip_archive.h>.
2015-07-30 03:45:25 +00:00
Elliott Hughes
ae7e8d44b0 am 6fd4de76: Merge "Fix Win32 <ziparchive/zip_archive.h>."
* commit '6fd4de76e05d98fa1fcbe07f579a715d61fbfbee':
  Fix Win32 <ziparchive/zip_archive.h>.
2015-07-30 03:32:31 +00:00
Elliott Hughes
6fd4de76e0 Merge "Fix Win32 <ziparchive/zip_archive.h>." 2015-07-30 03:19:10 +00:00
Elliott Hughes
bb50a393ff Fix Win32 <ziparchive/zip_archive.h>.
Contrary to the comment in AndroidConfig.h, mingw does have
__BEGIN_DECLS and __END_DECLS; you just have to #include <sys/cdefs.h>
first. Which is strictly true normally too, but you're going to
get it transitively with bionic or glibc.

Change-Id: I2f2de45f56a7217f91df322d8e896280997ae7a0
2015-07-29 19:58:57 -07:00
Elliott Hughes
eb3b94a1c4 am e0541c7d: am a6597598: Merge "fix adb {forward,reverse} --no-rebind"
* commit 'e0541c7d7e329f83b23bfde4f515cefd39d65a66':
  fix adb {forward,reverse} --no-rebind
2015-07-30 01:10:51 +00:00
Elliott Hughes
e0541c7d7e am a6597598: Merge "fix adb {forward,reverse} --no-rebind"
* commit 'a6597598a0b82759960df09fd173192ca8c82f0c':
  fix adb {forward,reverse} --no-rebind
2015-07-30 00:51:26 +00:00
Elliott Hughes
adbf442a51 Use _WIN32 rather than HAVE_WINSOCK.
Change-Id: I9855b6fe72e2f2f3a8360c0993a67cb988024ee4
2015-07-29 17:45:24 -07:00
Elliott Hughes
a6597598a0 Merge "fix adb {forward,reverse} --no-rebind" 2015-07-30 00:38:05 +00:00