Commit graph

16944 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
Mark Salyzyn
77e27d8c2a Merge changes I9f21ce95,Ib0530b9d,I981d9fa6,Icc60dd06,I902ba6b4, ... into mnc-dr-dev
* changes:
  logd: worst uid record watermark
  logd: log buffer switch to std::list
  logd: white and black switch to std::list
  logd: logtimes switch to std::list
  logd: prune 10% or 256 entries max
  logd: sizes > 1M prune in smaller batches
2015-08-24 14:19:12 +00:00
Steve Fung
bc9b1723fe am df564009: am f87f5f90: Merge "crash_reporter: Fix tmp directory location"
* commit 'df564009353213c71b649a8b77c25ede4817785c':
  crash_reporter: Fix tmp directory location
2015-08-24 04:30:25 +00:00
Steve Fung
4e8152b237 am 7c6f3129: am ea1e07e9: Merge "crash_reporter: Relicense as Apache 2."
* commit '7c6f31293c7b13378671546adaa76a3ce80638cc':
  crash_reporter: Relicense as Apache 2.
2015-08-24 04:30:23 +00: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
f336c514f4 am eaf04aa0: am 3b94cef1: Merge "Add FORK_EXECVP_OPTION_CAPTURE_OUTPUT to logwrap.h"
* commit 'eaf04aa0986e069a2ccffb69b94f1e4d6ad6726c':
  Add FORK_EXECVP_OPTION_CAPTURE_OUTPUT to logwrap.h
2015-08-22 02:40:46 +00: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
75386e5a89 am f91d63e2: am 34d0e782: Merge "To compile with llvm integrated assembler."
* commit 'f91d63e2b88291dcf7d2c03ccdcd1a7233e56363':
  To compile with llvm integrated assembler.
2015-08-21 23:58:09 +00: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
c8c76266ed am 975f8511: am 2e2dc003: Merge "crash_reporter: Fix path to dbus-send"
* commit '975f85110b75d36c59977f2482154bbbda986ee7':
  crash_reporter: Fix path to dbus-send
2015-08-21 23:39:10 +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
Steve Fung
10ac72ea22 am 916a5c86: am 0f6c07b7: Merge "crash_reporter: Add Android.mk"
* commit '916a5c86249fb424fc7057a25240978855431f90':
  crash_reporter: Add Android.mk
2015-08-21 23:01:03 +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
Tom Cherry
9acbce65d8 Merge "update bundled rc files to their contents from rootdir/init.rc" into mnc-dr-dev-plus-aosp 2015-08-21 22:15:02 +00: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
Tom Cherry
b267af9808 update bundled rc files to their contents from rootdir/init.rc
Bug 23186545

Change-Id: Ieb03ba89db2dee0365ae346295207ddfd29bd2b7
(cherry picked from commit 297991b324)
2015-08-21 22:10:17 +00:00
Tom Cherry
22bc242a5b resolved conflicts for merge of b21de5f6 to mnc-dr-dev-plus-aosp
Change-Id: I13fd71d5af0b0a66d0c3e2f026581c60e9b95e8b
2015-08-21 15:09:30 -07:00
Steve Fung
0f6c07b7b8 Merge "crash_reporter: Add Android.mk" 2015-08-21 22:08:32 +00:00
Tom Cherry
25c22bb9e7 am 08a6775f: am 2d8be6c2: Merge "init: import init rc scripts from file systems after mount_all"
* commit '08a6775f8cdadf48e7b5f4f4d710180fda43b2b6':
  init: import init rc scripts from file systems after mount_all
2015-08-21 21:47:03 +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
Sergio Giro
66b6eb9490 [DO NOT MERGE] libutils: fix overflow in SharedBuffer
See
https://code.google.com/p/android/issues/detail?id=181910

Bug: 22952485
(cherry picked from commit 7987b83553)

Change-Id: I3cac87185f209dc79678ae702aa18afbdf4190df
2015-08-21 20:36:19 +01:00
Tom Cherry
c7676b5037 am 54b22ca2: am ff5be396: Merge changes from topic \'init-rc-breakup\'
* commit '54b22ca2488e4901265c99a42b5c5e0725a99199':
  init: Queue Triggers instead of Actions
  bundle init.rc contents with its service
2015-08-21 18:24:18 +00:00
Mark Salyzyn
3bee4feefe am e7b45195: am 8a4beeb6: Merge "logd: switch asprintf to std::string"
* commit 'e7b451950acc0b845f1fab20a9e62c80bc81750a':
  logd: switch asprintf to std::string
2015-08-21 18:23:41 +00:00
Mark Salyzyn
deeb03a8c4 am 38e2877d: am 67f3dd9c: Merge "logd: statistics switch to std::string"
* commit '38e2877df102c4a817c6b24337a6be253945ed33':
  logd: statistics switch to std::string
2015-08-21 18:23:40 +00:00
Mark Salyzyn
75cc67ac49 am aa051ac6: am cf5bd8ba: Merge "logd: white and black switch to std::string"
* commit 'aa051ac68d769194751624612bf68cb753d94b6d':
  logd: white and black switch to std::string
2015-08-21 18:23:38 +00:00
Steve Fung
e86e612b98 am 75e95ebc: am cba296ca: Merge "metricsd: Give directory group permissions"
* commit '75e95ebcbfc1f01d0822eb4e30192d3ce8ca2ad3':
  metricsd: Give directory group permissions
2015-08-21 18:23:37 +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