Commit Graph

14413 Commits

Author SHA1 Message Date
Siva Velusamy 5b476736da am 9498fc68: Merge "Use glog for logging in the OSX USB layer"
* commit '9498fc68ec4a6ddf29cf471225eb87dbcb908e3d':
  Use glog for logging in the OSX USB layer
2015-08-24 15:43:16 +00:00
Siva Velusamy 9498fc68ec Merge "Use glog for logging in the OSX USB layer" 2015-08-24 15:35:51 +00:00
Siva Velusamy 743883b570 Use glog for logging in the OSX USB layer
Change-Id: I8a3a4dfc768fdd335f03dc582c85b410c808aeb7
2015-08-24 08:22:15 -07:00
Steve Fung df56400935 am f87f5f90: Merge "crash_reporter: Fix tmp directory location"
* commit 'f87f5f90c56923e88c2a6728d919dabaab0e4177':
  crash_reporter: Fix tmp directory location
2015-08-24 04:21:57 +00:00
Steve Fung 7c6f31293c am ea1e07e9: Merge "crash_reporter: Relicense as Apache 2."
* commit 'ea1e07e94020deca44858108e7a8d0915be36168':
  crash_reporter: Relicense as Apache 2.
2015-08-24 04:21:55 +00:00
Steve Fung f87f5f90c5 Merge "crash_reporter: Fix tmp directory location" 2015-08-24 03:26:21 +00:00
Steve Fung ea1e07e940 Merge "crash_reporter: Relicense as Apache 2." 2015-08-24 01:03:14 +00:00
Steve Fung da98133cc0 crash_reporter: Fix tmp directory location
It is unsafe to use /data/local/tmp.  Use our own temporary
directory under /data/misc/crash_reporter.

Bug: 23430484
Change-Id: I186ba6b146bd884064177a3bb29b18b8edcc0b62
2015-08-23 17:57:19 -07:00
Yusuke Sato eaf04aa098 am 3b94cef1: Merge "Add FORK_EXECVP_OPTION_CAPTURE_OUTPUT to logwrap.h"
* commit '3b94cef1b75893f98ad3011a09582405bb32baf4':
  Add FORK_EXECVP_OPTION_CAPTURE_OUTPUT to logwrap.h
2015-08-22 02:35:08 +00:00
Yusuke Sato 3b94cef1b7 Merge "Add FORK_EXECVP_OPTION_CAPTURE_OUTPUT to logwrap.h" 2015-08-22 02:27:46 +00:00
Yusuke Sato 7980426a6f Add FORK_EXECVP_OPTION_CAPTURE_OUTPUT to logwrap.h
This allows raw popen calls in e.g. system/netd/ to be replaced
with android_fork_execvp_ext().

Change-Id: I159ece7369fa38ff8782024bef0d7cfafe74ecee
2015-08-21 17:14:59 -07:00
Chih-hung Hsieh f91d63e2b8 am 34d0e782: Merge "To compile with llvm integrated assembler."
* commit '34d0e782aff894a649f2672e7e9df7c7ccab8377':
  To compile with llvm integrated assembler.
2015-08-21 23:48:49 +00:00
Chih-hung Hsieh 34d0e782af Merge "To compile with llvm integrated assembler." 2015-08-21 23:42:31 +00:00
Steve Fung 975f85110b am 2e2dc003: Merge "crash_reporter: Fix path to dbus-send"
* commit '2e2dc0039950014d0948589899517e065a82a8b4':
  crash_reporter: Fix path to dbus-send
2015-08-21 23:29:35 +00:00
Steve Fung 2e2dc00399 Merge "crash_reporter: Fix path to dbus-send" 2015-08-21 23:23:34 +00:00
Chih-Hung Hsieh 7244cf2aa5 To compile with llvm integrated assembler.
* Explicitly specify default .align 0.
* Use standard ldmfdlo instruction.
* Before and after gas outputs are identical,
  with align 0 sections.
* Objdump showed .text/.data/.bss section alignment
  attributes are 2^0 from gas and 2^2 from llvm
  assembler. These .S files might be working when
  compiled by gas, but llvm assembler's output should
  be more correct or conservative.

Change-Id: I4e578dbc8155c0d06d1bbc1c33ec4cc851a18479
2015-08-21 15:58:26 -07:00
Steve Fung 916a5c8624 am 0f6c07b7: Merge "crash_reporter: Add Android.mk"
* commit '0f6c07b7b89f77927e94d6f87228eb5b15c607eb':
  crash_reporter: Add Android.mk
2015-08-21 22:14:55 +00:00
Steve Fung 0f6c07b7b8 Merge "crash_reporter: Add Android.mk" 2015-08-21 22:08:32 +00:00
Tom Cherry b21de5f627 am a1b2036f: Merge "remove bundled services from rootdir/init.rc"
* commit 'a1b2036f4daf9e0de0fe616e5f371d75f6b2357d':
  remove bundled services from rootdir/init.rc
2015-08-21 20:20:44 +00:00
Tom Cherry 08a6775f8c am 2d8be6c2: Merge "init: import init rc scripts from file systems after mount_all"
* commit '2d8be6c2790333479ac9ff84078d7de9903d64fb':
  init: import init rc scripts from file systems after mount_all
2015-08-21 20:20:43 +00:00
Tom Cherry a1b2036f4d Merge "remove bundled services from rootdir/init.rc" 2015-08-21 20:16:52 +00:00
Tom Cherry 2d8be6c279 Merge "init: import init rc scripts from file systems after mount_all" 2015-08-21 20:16:46 +00:00
Tom Cherry 54b22ca248 am ff5be396: Merge changes from topic \'init-rc-breakup\'
* commit 'ff5be396d77cdf7f18e7d8f7a14f62ec760f5a1e':
  init: Queue Triggers instead of Actions
  bundle init.rc contents with its service
2015-08-21 17:52:44 +00:00
Tom Cherry ff5be396d7 Merge changes from topic 'init-rc-breakup'
* changes:
  init: Queue Triggers instead of Actions
  bundle init.rc contents with its service
2015-08-21 17:42:29 +00:00
Mark Salyzyn e7b451950a am 8a4beeb6: Merge "logd: switch asprintf to std::string"
* commit '8a4beeb6941eada504b7be5c4c6f43374fb343fc':
  logd: switch asprintf to std::string
2015-08-21 17:22:33 +00:00
Mark Salyzyn 38e2877df1 am 67f3dd9c: Merge "logd: statistics switch to std::string"
* commit '67f3dd9c474e47dcea2bcd7a72e4b75ac686e80a':
  logd: statistics switch to std::string
2015-08-21 17:22:31 +00:00
Mark Salyzyn aa051ac68d am cf5bd8ba: Merge "logd: white and black switch to std::string"
* commit 'cf5bd8ba05a0ec3d0a15309276499a155b8aee5f':
  logd: white and black switch to std::string
2015-08-21 17:22:29 +00:00
Steve Fung 75e95ebcbf am cba296ca: Merge "metricsd: Give directory group permissions"
* commit 'cba296cacb281b27a714e9b5bae2387fdfc397e5':
  metricsd: Give directory group permissions
2015-08-21 17:22:28 +00:00
Tom Cherry 837135a64f remove bundled services from rootdir/init.rc
Services definitions for core services are now bundled with the source
for the service itself in the form of <service name>.rc.  These
individual .rc files are now located in /system/init/... and are
parsed when the system partition is mounted.

Bug: 23186545
Change-Id: Ia1b73af8d005633aa4252d603892064d7804163d
2015-08-21 10:14:44 -07:00
Tom Cherry b8dd0272e5 init: import init rc scripts from file systems after mount_all
Import /{system,vendor,odm}/etc/init/... after file systems are mounted

Bug: 23186545
Change-Id: Idb0cae9773f904c0330054c8b3e31eb87b2fb7cb
2015-08-21 10:14:43 -07:00
Tom Cherry cb716f976b init: Queue Triggers instead of Actions
When init queues a trigger, it actually enqueues all of the Actions
that match with that given trigger.  This works currently because
all init scripts are loaded and therefore all Actions are available
before init starts queueing any triggers.

To support loading init scripts after init has started queueing
triggers, this change enqueues Trigger objects instead of their
matching Actions.  Each Trigger object then matches its associated
Actions during its execution.

Additionally, this makes a few cosmetic clean ups related to triggers.

Bug: 23186545
Change-Id: I5d177458e6df1c4b32b1072cf77e87ef952c87e4
2015-08-21 10:14:43 -07:00
Tom Cherry 20391b1de5 bundle init.rc contents with its service
Bug: 23186545
Change-Id: I52616b8ab1165fdef716f9b8f958665f2308c12e
2015-08-21 10:14:43 -07:00
Mark Salyzyn 8a4beeb694 Merge "logd: switch asprintf to std::string" 2015-08-21 16:47:20 +00:00
Mark Salyzyn 67f3dd9c47 Merge "logd: statistics switch to std::string" 2015-08-21 16:43:28 +00:00
Mark Salyzyn cf5bd8ba05 Merge "logd: white and black switch to std::string" 2015-08-21 16:43:15 +00:00
Steve Fung cba296cacb Merge "metricsd: Give directory group permissions" 2015-08-21 16:39:26 +00:00
Mark Salyzyn 64f4adbadf am 25967bbc: Merge "libsparse: use strcmp and validate last_used pointer"
* commit '25967bbccbe108a91e65247427261017b2474962':
  libsparse: use strcmp and validate last_used pointer
2015-08-21 14:30:51 +00:00
Mark Salyzyn 25967bbccb Merge "libsparse: use strcmp and validate last_used pointer" 2015-08-21 14:26:07 +00:00
lei wang wang c227a1d855 libsparse: use strcmp and validate last_used pointer
This patch is used to fix two Bugs in backed_block.c

First, fix wrong comparing string way: we should use strcmp rather than
just compare their address. Second, fix using illegal memory risk in
bbl->last_used pointer. When entering queue_bb function,
bbl->last_used = new_bb, but in the following code if
queue_bb(xx, bb, new_bb) return ok, the space of new_bb is released. So
next time, if you use bbl->last_used pointer, may cause segment fault !

Change-Id: I6abb505f9b903b697448639fc64fb7518df5cca1
2015-08-21 14:23:31 +00:00
Steve Fung 8b8878a7d1 crash_reporter: Fix path to dbus-send
Bug: 22486906
Change-Id: If70b387bf95709719bb781719e7d0c195385be78
2015-08-21 02:17:01 -07:00
Steve Fung 3f62060b8d metricsd: Give directory group permissions
Since crash_reporter gets run as root, in order to use metrics_lib
it has to use group permissions to interact with metrics files.

Bug: 23406290
Change-Id: Ie9556233105312f973c0a3e018fc0305a466148d
2015-08-21 02:02:19 -07:00
Christopher Ferris 0ee72c10ee am 711e776c: Merge "Display the map offset for each frame."
* commit '711e776cc21d7a16a953abbb5734dbe8db3fd8f2':
  Display the map offset for each frame.
2015-08-20 21:47:05 +00:00
Christopher Ferris 711e776cc2 Merge "Display the map offset for each frame." 2015-08-20 21:10:03 +00:00
Christopher Ferris 600017332c Display the map offset for each frame.
The dlopen of a shared library in an apk results in large map offsets.
Unfortunately, the current way that the frame data is printed, it's
impossible to tell what the relative pc is relative to. With the
addition of the offset, it's possible to figure out what the relative
pc actually references.

Bug: 23348999
(cherry picked from commit e0ab23223a)

Change-Id: I950f92c1cb29ee05eed777f47453efa03318cf3e
2015-08-20 14:07:30 -07:00
Bertrand Simonnet 6b8fd10a79 am 300b1a6b: Merge "metricsd: Don\'t crash when some metadata is missing."
* commit '300b1a6b47bde407b5117cab55fa9d777825d97d':
  metricsd: Don't crash when some metadata is missing.
2015-08-20 20:27:29 +00:00
Bertrand Simonnet 300b1a6b47 Merge "metricsd: Don't crash when some metadata is missing." 2015-08-20 20:22:15 +00:00
Bertrand Simonnet 2888eec0bd am 565d20ef: Merge "metricsd: Enable https by default."
* commit '565d20ef0422fc3ed2f695306d84c14945ddd890':
  metricsd: Enable https by default.
2015-08-20 19:06:02 +00:00
Bertrand Simonnet 565d20ef04 Merge "metricsd: Enable https by default." 2015-08-20 18:58:53 +00:00
Bertrand SIMONNET 1f14655b27 metricsd: Don't crash when some metadata is missing.
Instead of crashing when the build target id is missing, simply print a
useful warning and discard the log.

BUG: 23351227

Change-Id: I3abf3063d6440b07103db29938eec5071ea8f60b
2015-08-20 11:57:50 -07:00
Steve Fung 6c34c2576e crash_reporter: Relicense as Apache 2.
MODULE_LICENSE_BSD and NOTICE were removed as the license is no longer
different from the rest of system/core.

Bug: 23368756
Change-Id: I31e48eb7c3d153c7c5ec4f694c61474dedac2eeb
2015-08-20 18:54:43 +00:00