Commit Graph

8544 Commits

Author SHA1 Message Date
Elliott Hughes 6419687fe0 am 929c7fe1: am 5bc6b5b8: Merge "Fixed logcat debug output issue."
* commit '929c7fe179dc8c7ca0e0f0268ffb1213d0c929f4':
  Fixed logcat debug output issue.
2014-06-17 21:35:40 +00:00
Elliott Hughes 929c7fe179 am 5bc6b5b8: Merge "Fixed logcat debug output issue."
* commit '5bc6b5b804546c683953393441e697e0eb84ac48':
  Fixed logcat debug output issue.
2014-06-17 21:30:24 +00:00
Elliott Hughes 5bc6b5b804 Merge "Fixed logcat debug output issue." 2014-06-17 20:56:23 +00:00
Brigid Smith 1babede38b Fixed logcat debug output issue.
Change-Id: Ibeb048b683ec11b05af23371e5e4b17cdd50fea0
2014-06-17 14:24:43 -07:00
Ian Rogers 4436749284 am 4ac17e3b: am 4dfe6faa: Merge "Enable host multilib for ART testing."
* commit '4ac17e3b1979f3dcdc2b515fc9d1f349f1b21da6':
  Enable host multilib for ART testing.
2014-06-17 18:53:03 +00:00
Ian Rogers 4ac17e3b19 am 4dfe6faa: Merge "Enable host multilib for ART testing."
* commit '4dfe6faa932e255413dc4dbbaada7e19dd01efd4':
  Enable host multilib for ART testing.
2014-06-17 18:48:51 +00:00
Nick Kralevich 545c6599fa am a029d14d: am 2af91ffb: Merge "Extend ueventd to use the label-by-symlink support in libselinux."
* commit 'a029d14d03ecc9bde97b9394298c5123c14be081':
  Extend ueventd to use the label-by-symlink support in libselinux.
2014-06-17 18:48:30 +00:00
Nick Kralevich a029d14d03 am 2af91ffb: Merge "Extend ueventd to use the label-by-symlink support in libselinux."
* commit '2af91ffb6c5f93ecbc322183c755bb249edc2488':
  Extend ueventd to use the label-by-symlink support in libselinux.
2014-06-17 18:44:18 +00:00
Ian Rogers 4dfe6faa93 Merge "Enable host multilib for ART testing." 2014-06-17 03:56:33 +00:00
Ian Rogers 5af80aa119 Enable host multilib for ART testing.
Change-Id: Ic3ae5122eba13565fb5a4cb1bd0e7e465fb2140c
2014-06-17 01:50:25 -07:00
Nick Kralevich 2af91ffb6c Merge "Extend ueventd to use the label-by-symlink support in libselinux." 2014-06-17 03:56:33 +00:00
Elliott Hughes 96021e03d6 am e3c2e761: am 46a97883: Merge "Changing how debuggerd filters log messages to different locations."
* commit 'e3c2e761ffb9de62dd277673a6c9a486362cef8b':
  Changing how debuggerd filters log messages to different locations.
2014-06-16 21:51:19 +00:00
Elliott Hughes e3c2e761ff am 46a97883: Merge "Changing how debuggerd filters log messages to different locations."
* commit '46a97883e7eb12fa00946f8ba6eb578e6514ea1c':
  Changing how debuggerd filters log messages to different locations.
2014-06-16 21:47:02 +00:00
Elliott Hughes 46a97883e7 Merge "Changing how debuggerd filters log messages to different locations." 2014-06-16 19:18:38 +00:00
Brigid Smith 62ba489ba0 Changing how debuggerd filters log messages to different locations.
The system by which debuggerd filters its output to different locations
is now based on an enum called logtype with easy to understand
categories for log messages (like THREAD, MEMORY, etc.) instead of the
old, fairly esoteric scope_flags variable.  Now much of the output that
previously went to logcat does not show up on the screen, but all output
can be found in the tombstone file.  In addition, the tombstone's
location is now printed so it can be located easily.

Bug: 15341747
Change-Id: Ia2f2051d1dfdea934d0e6ed220f24345e35ba6a2
2014-06-16 14:41:21 -07:00
Elliott Hughes cd0d593569 am 6c65cd5d: am 60218f19: Merge "Add gionee USB vendor id."
* commit '6c65cd5db84361c66983903638ddb251762f9151':
  Add gionee USB vendor id.
2014-06-16 17:41:49 +00:00
Elliott Hughes 6c65cd5db8 am 60218f19: Merge "Add gionee USB vendor id."
* commit '60218f19c94a12ab38444dc598cbb8f8db1f72ca':
  Add gionee USB vendor id.
2014-06-16 17:36:48 +00:00
Elliott Hughes 60218f19c9 Merge "Add gionee USB vendor id." 2014-06-16 15:34:52 +00:00
xuefeng cai 4f8d3be3b2 Add gionee USB vendor id.
Change-Id: I3745f0e8462d0bffcd2eb4d926a9d2f9af8578f9
2014-06-16 17:29:42 +00:00
Stephen Smalley b4c5200f51 Extend ueventd to use the label-by-symlink support in libselinux.
When ueventd creates a device node, it may also create one or more
symlinks to the device node.  These symlinks may be the only stable
name for the device, e.g. if the partition is dynamically assigned.
A corresponding change with the same Change-Id to external/libselinux
introduces selabel_lookup_best_match() to support looking up the "best match"
for a device node based on its real path (key) and any links to it
(aliases).  This change updates ueventd to use this new interface
to find the best match for the device node when creating it.

Change-Id: Id6c2597eee2b6723a5089dcf7c450f8d0a4128f4
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-06-16 09:44:30 -04:00
Mark Salyzyn 9b86360fb4 am c3e23666: am 7fa1cd19: Merge "log: Fix warning with __USE_MINGW_ANSI_STDIO"
* commit 'c3e2366602c428cf39ce9068a834771f535d58b2':
  log: Fix warning with __USE_MINGW_ANSI_STDIO
2014-06-13 14:40:42 +00:00
Mark Salyzyn c3e2366602 am 7fa1cd19: Merge "log: Fix warning with __USE_MINGW_ANSI_STDIO"
* commit '7fa1cd19638c8ada0786e03abe50b5fe9b9f4270':
  log: Fix warning with __USE_MINGW_ANSI_STDIO
2014-06-13 14:37:40 +00:00
Dan Albert 46ed1c8c99 am ed1a0dbd: am b44e626c: Merge "Fix windows sdk build."
* commit 'ed1a0dbd43ba81c3f1cb723c0e4fa5ca2807d473':
  Fix windows sdk build.
2014-06-13 09:42:26 +00:00
Dan Albert ed1a0dbd43 am b44e626c: Merge "Fix windows sdk build."
* commit 'b44e626cf0c29dd8b8112db3d8e72970dc09b617':
  Fix windows sdk build.
2014-06-13 04:13:48 +00:00
Dan Albert 6dfe949568 am 9b2d964d: am 08430b1e: Merge "Use syscall(2) instead of ioprio_get/ioprio_set."
* commit '9b2d964d0139198c2cce2b8f6bb5b1a566e47913':
  Use syscall(2) instead of ioprio_get/ioprio_set.
2014-06-13 03:00:41 +00:00
Dan Albert 9b2d964d01 am 08430b1e: Merge "Use syscall(2) instead of ioprio_get/ioprio_set."
* commit '08430b1e8c9cf42289289d88e7dd05294da7589e':
  Use syscall(2) instead of ioprio_get/ioprio_set.
2014-06-13 02:56:31 +00:00
Nick Kralevich f8cb68e15b am 3bff77a8: am 875dc8f3: Merge "Create /data/dalvik-cache/profiles"
* commit '3bff77a8f90e673dbf41d97b7b842a3e4a6986bf':
  Create /data/dalvik-cache/profiles
2014-06-12 23:12:45 +00:00
Nick Kralevich 3bff77a8f9 am 875dc8f3: Merge "Create /data/dalvik-cache/profiles"
* commit '875dc8f3f31fe9f5ee42d900737149bdeb95f1c7':
  Create /data/dalvik-cache/profiles
2014-06-12 23:09:12 +00:00
Mark Salyzyn 7fa1cd1963 Merge "log: Fix warning with __USE_MINGW_ANSI_STDIO" 2014-06-12 21:07:49 +00:00
Dan Albert b44e626cf0 Merge "Fix windows sdk build." 2014-06-12 21:07:49 +00:00
Dan Albert 5e541bf47d Fix windows sdk build.
Change-Id: I53c9f43a5f9ae2f40de686316185d162d0e0503a
2014-06-13 04:09:37 +00:00
Dan Albert 08430b1e8c Merge "Use syscall(2) instead of ioprio_get/ioprio_set." 2014-06-12 21:07:49 +00:00
Dan Albert 167c0ed6da Use syscall(2) instead of ioprio_get/ioprio_set.
Change-Id: Ibfd0bdd3dd0bad9804ec9fd9292f4b68a510afdb
2014-06-12 19:48:10 -07:00
Dan Willemsen 0cddcc67cc log: Fix warning with __USE_MINGW_ANSI_STDIO
I haven't seen this warning in any AOSP code, but some of our code is
using this header differently than the rest of the build system, and
hits this warning-turned-error:

error: "__USE_MINGW_ANSI_STDIO" is not defined [-Werror=undef]

Change-Id: I3c5a91f107af8bf6078e06f2ce326c5466349b79
2014-06-12 13:19:51 -07:00
Nick Kralevich 44aadc4daf am 1eebf538: am 59d16c9e: Merge "make console shell run as GID=shell"
* commit '1eebf538d3e5465bbec84d86017bb9ca250a052b':
  make console shell run as GID=shell
2014-06-12 19:43:07 +00:00
Nick Kralevich 1eebf538d3 am 59d16c9e: Merge "make console shell run as GID=shell"
* commit '59d16c9e9171f4367ad3a0516e7000c0d95e89cf':
  make console shell run as GID=shell
2014-06-12 19:39:45 +00:00
Nick Kralevich 59d16c9e91 Merge "make console shell run as GID=shell" 2014-06-12 03:32:07 +00:00
Nick Kralevich f2cb352412 make console shell run as GID=shell
Change-Id: I240bec07b04de1b26eef14e4f590af56c1aaa276
2014-06-12 12:33:21 -07:00
Ian Rogers 2b95811601 am a31dab8a: am a9aa0f2c: Merge "Build the libc++ variant of libbacktrace on the host for Mac."
* commit 'a31dab8a8fbdd6d4e91d5e5fb3d0031594b92dfc':
  Build the libc++ variant of libbacktrace on the host for Mac.
2014-06-11 20:04:53 +00:00
Ian Rogers a31dab8a8f am a9aa0f2c: Merge "Build the libc++ variant of libbacktrace on the host for Mac."
* commit 'a9aa0f2c42e2291496f39ca60775ff95648eba31':
  Build the libc++ variant of libbacktrace on the host for Mac.
2014-06-11 20:01:36 +00:00
Colin Cross cfd002c90d am 428a6d23: am f2521e76: Merge changes I46586cba,I6c500ab5,I2f7d9934
* commit '428a6d23fc71b1fe5c5e785905693b9d1c414958':
  Add mknod utility to system/core/toolbox
  Getevent: make sure the monotonic timestamp is displayed; warning cleanup.
  toolbox: Add nohup command
2014-06-11 18:23:27 +00:00
Colin Cross 428a6d23fc am f2521e76: Merge changes I46586cba,I6c500ab5,I2f7d9934
* commit 'f2521e76ffd5baaf13f7ddf16bcc0ef58959cfae':
  Add mknod utility to system/core/toolbox
  Getevent: make sure the monotonic timestamp is displayed; warning cleanup.
  toolbox: Add nohup command
2014-06-11 18:19:44 +00:00
Ian Rogers a9aa0f2c42 Merge "Build the libc++ variant of libbacktrace on the host for Mac." 2014-06-10 22:20:24 +00:00
Ian Rogers deebae596b Build the libc++ variant of libbacktrace on the host for Mac.
Bug: 13751317
Change-Id: Iefadec1cd9b3ca109ac436bd5eb7c096c2dcbe40
2014-06-11 12:55:50 -07:00
Colin Cross f2521e76ff Merge changes I46586cba,I6c500ab5,I2f7d9934
* changes:
  Add mknod utility to system/core/toolbox
  Getevent: make sure the monotonic timestamp is displayed; warning cleanup.
  toolbox: Add nohup command
2014-06-10 22:20:24 +00:00
Sujith Ramakrishnan 032d4e298b Add mknod utility to system/core/toolbox
Change-Id: I46586cba83ecb8095721be8ffad9e386d4698e4a
2014-06-11 11:10:28 -07:00
Sasha Levitskiy 140b13546a Getevent: make sure the monotonic timestamp is displayed; warning cleanup.
Change-Id: I6c500ab55470155ddf692fe5f655bdd575f195f5
Signed-off-by: Sasha Levitskiy <sanek@google.com>
2014-06-11 11:10:28 -07:00
Glenn Kasten 38e5f07c0f toolbox: Add nohup command
Change-Id: I2f7d9934b54d98886d7a6205ea122d9ce91066ec
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2014-06-11 11:10:28 -07:00
Nick Kralevich 875dc8f3f3 Merge "Create /data/dalvik-cache/profiles" 2014-06-10 21:55:12 +00:00
Nick Kralevich 347ee511e4 Create /data/dalvik-cache/profiles
Make sure /data/dalvik-cache/profiles gets the correct
permissions and SELinux context, and ownership is properly
assigned to the system UID.

Change-Id: Ic1b44009faa30d704855e97631006c4b990a4ad3
2014-06-11 18:32:57 -07:00