Narayan Kamath
9b26aecdc4
am f84b61b3: am b5e13749: am 223fc42b: Merge "Add CleanSpec for zygote changes."
...
* commit 'f84b61b377c0acf2ad97fdb132b24762cb599bd8':
Add CleanSpec for zygote changes.
2014-04-02 16:30:54 +00:00
Narayan Kamath
f84b61b377
am b5e13749: am 223fc42b: Merge "Add CleanSpec for zygote changes."
...
* commit 'b5e137493998de960313c62d1824dfc581fb5327':
Add CleanSpec for zygote changes.
2014-04-02 16:24:07 +00:00
Narayan Kamath
b5e1374939
am 223fc42b: Merge "Add CleanSpec for zygote changes."
...
* commit '223fc42b5e289e882f67c893374ffbef595a6901':
Add CleanSpec for zygote changes.
2014-04-02 16:20:54 +00:00
Narayan Kamath
223fc42b5e
Merge "Add CleanSpec for zygote changes."
2014-04-02 16:17:03 +00:00
Narayan Kamath
346ccaf6d7
Add CleanSpec for zygote changes.
...
default.prop is generated out of several makefile variables,
and it isn't possible to neatly express a dependency on those
variables (except perhaps by adding every possible makefile that
could define them to the deps list).
Change-Id: I93ea45c956aa22922f2389f735c058700621f674
2014-04-02 12:49:09 +01:00
Wonsik Kim
94404eef65
Merge "Clarify ownership for NativeHandle::mHandle"
2014-04-02 06:13:59 +00:00
Mark Salyzyn
136317b131
am 990cdb14: am eb69b9a5: am 075828b8: Merge "logd: build breakage in user"
...
* commit '990cdb149e39e5b4fbac40680ea60cf18beae1a2':
logd: build breakage in user
2014-04-02 00:27:48 +00:00
Mark Salyzyn
990cdb149e
am eb69b9a5: am 075828b8: Merge "logd: build breakage in user"
...
* commit 'eb69b9a5020b15e97b448245b63cfa7a6171cd2b':
logd: build breakage in user
2014-04-02 00:21:46 +00:00
Mark Salyzyn
eb69b9a502
am 075828b8: Merge "logd: build breakage in user"
...
* commit '075828b83bd903465442dc5021004266d56e075c':
logd: build breakage in user
2014-04-02 00:17:05 +00:00
Mark Salyzyn
075828b83b
Merge "logd: build breakage in user"
2014-04-02 00:11:13 +00:00
Igor Murashkin
f15b45a7db
am cb6daaaf: am 9d379a1e: am dfdbb64f: Merge "Fix stack trace logging in RefBase."
...
* commit 'cb6daaafa45c81c3c304eac947d2e2fca15f3171':
Fix stack trace logging in RefBase.
2014-04-02 00:03:31 +00:00
Mark Salyzyn
d89c68e217
am 022fa5cc: am 7f92f390: am 5b0ad963: Merge "init: unused paramter warning messages"
...
* commit '022fa5cc85f80f828c203f344617365d867b9137':
init: unused paramter warning messages
2014-04-02 00:03:25 +00:00
Mark Salyzyn
ca4c63d799
logd: build breakage in user
...
build breakage in branch: git_klp-dev-gpl @ 1101951
Change-Id: I4c9681bf4c97368ec19f5a79fef134aba937f337
2014-04-01 16:57:29 -07:00
Igor Murashkin
cb6daaafa4
am 9d379a1e: am dfdbb64f: Merge "Fix stack trace logging in RefBase."
...
* commit '9d379a1e02f25cbc06db55952d981b0dbba75b5c':
Fix stack trace logging in RefBase.
2014-04-01 23:00:08 +00:00
Igor Murashkin
9d379a1e02
am dfdbb64f: Merge "Fix stack trace logging in RefBase."
...
* commit 'dfdbb64ff79df937e939f78ff70d5501f17e57d3':
Fix stack trace logging in RefBase.
2014-04-01 22:55:48 +00:00
Igor Murashkin
dfdbb64ff7
Merge "Fix stack trace logging in RefBase."
2014-04-01 22:52:03 +00:00
Mark Salyzyn
022fa5cc85
am 7f92f390: am 5b0ad963: Merge "init: unused paramter warning messages"
...
* commit '7f92f390039227cabac45c8ea1de6ff9d4ee7dde':
init: unused paramter warning messages
2014-04-01 22:51:10 +00:00
Mark Salyzyn
7f92f39003
am 5b0ad963: Merge "init: unused paramter warning messages"
...
* commit '5b0ad96351dfda6ed09fefed1ab24e514be27012':
init: unused paramter warning messages
2014-04-01 22:44:59 +00:00
Mark Salyzyn
5b0ad96351
Merge "init: unused paramter warning messages"
2014-04-01 22:38:58 +00:00
Mark Salyzyn
322445ce6d
init: unused paramter warning messages
...
Change-Id: I1667371106be4b230ac3850e9819e4549eea2973
2014-04-01 15:35:14 -07:00
Mark Salyzyn
0ecf6a842a
am b3d94f0a: am c76e38ba: am e7f3cce7: Merge "logd: Add minimum time bucket statistics"
...
* commit 'b3d94f0ab88aa22d8eec60fe979670674251df13':
logd: Add minimum time bucket statistics
2014-04-01 22:03:17 +00:00
Ian McKellar
55e0f1c8bd
Fix stack trace logging in RefBase.
...
This was broken about 5 months ago in change I78435ed49aa196a0efb45bf9b2d58b62c41737d3.
See: https://goto.google.com/jhtss
Change-Id: Icc32993552efed3015bc1b79a7bd872d7510e020
2014-04-01 15:02:57 -07:00
Mark Salyzyn
b3d94f0ab8
am c76e38ba: am e7f3cce7: Merge "logd: Add minimum time bucket statistics"
...
* commit 'c76e38bafacb63f7b13606de940079499f2d5fdd':
logd: Add minimum time bucket statistics
2014-04-01 21:59:49 +00:00
Mark Salyzyn
c76e38bafa
am e7f3cce7: Merge "logd: Add minimum time bucket statistics"
...
* commit 'e7f3cce7aa1e51f904f80df02d8d0fe5fe85e14e':
logd: Add minimum time bucket statistics
2014-04-01 21:53:59 +00:00
Mark Salyzyn
e7f3cce7aa
Merge "logd: Add minimum time bucket statistics"
2014-04-01 21:49:35 +00:00
Mark Salyzyn
e457b74ce6
logd: Add minimum time bucket statistics
...
* Only enabled for dev builds because halves performance.
- Used to establish if /proc/sys/net/unix/max_dgram_qlen
is appropriate for the platform
(see logd/LogStatistics.cpp comments)
- enabled if logd.dgram_qlen.statistics is not zero/empty
Change-Id: Ib8ecfeb75b6f0f954c099a6b1032b8afb5efcbd4
2014-04-01 14:38:52 -07:00
Narayan Kamath
dc9af896f0
resolved conflicts for merge of 6a949b45
to master
...
Change-Id: Ie123b4fff76ef43e2b1c0583731e88997504320e
2014-04-01 17:40:45 +01:00
Narayan Kamath
6a949b45e9
am ffca173c: am 5da2dbbc: Merge "Move zygote init config to its own file."
...
* commit 'ffca173c853a2e312610d87f40957f696ac8364a':
Move zygote init config to its own file.
2014-04-01 16:29:57 +00:00
Narayan Kamath
ffca173c85
am 5da2dbbc: Merge "Move zygote init config to its own file."
...
* commit '5da2dbbc935356f526cdfb0b522b332fc8b95fc7':
Move zygote init config to its own file.
2014-04-01 16:26:39 +00:00
Narayan Kamath
5da2dbbc93
Merge "Move zygote init config to its own file."
2014-04-01 16:22:02 +00:00
Paul McLean
89086df24f
Merge "Adding a handy predicate function (str_parms_has_key()"
2014-04-01 15:34:18 +00:00
Greg Hackmann
d9354b20c6
am 05b0d848: am 5b98e049: rootdir: reduce permissions on /dev/rtc0
...
* commit '05b0d848b890181e5782b39988a167eda7558554':
rootdir: reduce permissions on /dev/rtc0
2014-03-31 21:02:16 +00:00
Greg Hackmann
05b0d848b8
am 5b98e049: rootdir: reduce permissions on /dev/rtc0
...
* commit '5b98e0499a6cdd09b72445ceb88b1d32a5e82fd1':
rootdir: reduce permissions on /dev/rtc0
2014-03-31 20:56:21 +00:00
Greg Hackmann
788b272268
am ae66fbbe: am 697bdc60: am a740b3bb: Merge "rootdir: reduce permissions on /dev/rtc0"
...
* commit 'ae66fbbe0e747cb2485bac0fa47c9223268a2fc9':
rootdir: reduce permissions on /dev/rtc0
2014-03-31 20:30:26 +00:00
Greg Hackmann
ae66fbbe0e
am 697bdc60: am a740b3bb: Merge "rootdir: reduce permissions on /dev/rtc0"
...
* commit '697bdc604e8f266ebd6c94fc84eb5057b1a700e3':
rootdir: reduce permissions on /dev/rtc0
2014-03-31 20:24:39 +00:00
Greg Hackmann
697bdc604e
am a740b3bb: Merge "rootdir: reduce permissions on /dev/rtc0"
...
* commit 'a740b3bb409c9acdf4cf6a829b982e57a89d08de':
rootdir: reduce permissions on /dev/rtc0
2014-03-31 20:18:22 +00:00
Greg Hackmann
5b98e0499a
rootdir: reduce permissions on /dev/rtc0
...
Remove world-readable, reduce group permissions to readable by system
daemons
Change-Id: I6c7d7d78b8d8281960659bb8490a01cf7fde28b4
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2014-03-31 13:16:28 -07:00
Greg Hackmann
a740b3bb40
Merge "rootdir: reduce permissions on /dev/rtc0"
2014-03-31 20:13:52 +00:00
Narayan Kamath
4456a55ce6
Move zygote init config to its own file.
...
This allows us to choose different configs depending on
whether or not the target is 64 capable, and what its preferred
default is.
bug: 13647418
Change-Id: Ie1ce4245a3add7544c87d27c635ee390f4062523
2014-03-31 12:31:11 +01:00
Greg Hackmann
b34fed34af
rootdir: reduce permissions on /dev/rtc0
...
Remove world-readable, reduce group permissions to readable by system
daemons
Change-Id: I6c7d7d78b8d8281960659bb8490a01cf7fde28b4
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2014-03-27 15:52:01 -07:00
Colin Cross
66d4797673
am 47de0060: am bd514144: am 47770b73: Merge "debuggerd: use LOCAL_MULTILIB"
...
* commit '47de0060757b90737f1a409acd99fa4372efbf07':
debuggerd: use LOCAL_MULTILIB
2014-03-27 18:29:25 +00:00
Colin Cross
47de006075
am bd514144: am 47770b73: Merge "debuggerd: use LOCAL_MULTILIB"
...
* commit 'bd514144ad5254e4e2c08e17affe6e178bb49074':
debuggerd: use LOCAL_MULTILIB
2014-03-27 18:20:03 +00:00
Colin Cross
bd514144ad
am 47770b73: Merge "debuggerd: use LOCAL_MULTILIB"
...
* commit '47770b7396186d6700688fd039320283e5b68501':
debuggerd: use LOCAL_MULTILIB
2014-03-27 18:13:16 +00:00
Colin Cross
47770b7396
Merge "debuggerd: use LOCAL_MULTILIB"
2014-03-27 18:09:04 +00:00
Mark Salyzyn
ad3b38dfa8
am 509b1983: am a43bb3a4: am e644664f: Merge "liblog: deal with restart of logd"
...
* commit '509b198388b857236ab8f687a4b14dc1d326b875':
liblog: deal with restart of logd
2014-03-27 00:17:45 +00:00
Mark Salyzyn
509b198388
am a43bb3a4: am e644664f: Merge "liblog: deal with restart of logd"
...
* commit 'a43bb3a4d0093a45a3203c3511257116f6029f49':
liblog: deal with restart of logd
2014-03-27 00:10:38 +00:00
Mark Salyzyn
a43bb3a4d0
am e644664f: Merge "liblog: deal with restart of logd"
...
* commit 'e644664f1cbc4add3cc56981bab007380859853a':
liblog: deal with restart of logd
2014-03-26 23:59:24 +00:00
Mark Salyzyn
e644664f1c
Merge "liblog: deal with restart of logd"
2014-03-26 23:24:22 +00:00
Colin Cross
87a6b1d799
debuggerd: use LOCAL_MULTILIB
...
Use LOCAL_MULTILIB to build multiple versions of executables
instead of manually creating two build rules.
Change-Id: I1a993ff7b5f527a88735f46eec9822bb97d16490
2014-03-26 15:16:23 -07:00
Michael Wright
bbb2d48990
am a45ff0f5: (-s ours) am df33e8b5: Add BitSet64. DO NOT MERGE
...
* commit 'a45ff0f586a609974d5897bdf735d68831d2fcb7':
Add BitSet64. DO NOT MERGE
2014-03-26 19:32:08 +00:00