Commit graph

12369 commits

Author SHA1 Message Date
Andreas Gampe
ebc903e3d1 am 6e014d77: Merge "Libbacktrace: Use frame-pointer on host"
* commit '6e014d774d5ff1fc05d619b348813a5e567f40d2':
  Libbacktrace: Use frame-pointer on host
2015-03-27 00:48:25 +00:00
Andreas Gampe
6e014d774d Merge "Libbacktrace: Use frame-pointer on host" 2015-03-27 00:43:15 +00:00
Andreas Gampe
dce8f2923d Libbacktrace: Use frame-pointer on host
Otherwise it may have problems unwinding over itself.

Change-Id: I9b0d108018ae3f5d98b9ae6fb62d0af83a77d18e
2015-03-26 16:21:13 -07:00
Nick Kralevich
5e49911c4a am de52ebc3: Merge "libaudit: limit to 5 selinux denials per sec"
* commit 'de52ebc3f97500e7d618c32cf5d627a1beb0ead7':
  libaudit: limit to 5 selinux denials per sec
2015-03-26 22:24:26 +00:00
Nick Kralevich
de52ebc3f9 Merge "libaudit: limit to 5 selinux denials per sec" 2015-03-26 21:33:02 +00:00
Nick Kralevich
a15db51bbf libaudit: limit to 5 selinux denials per sec
watchdog is triggering on shamu. This may be due to an excessive
number of SELinux denials. Drop the limit from 20/sec to 5/sec.

Bug: 19950451
Bug: 19949988
Change-Id: I979f11e17c241ff2ebda4dec9694ef441dc5d0ed
2015-03-26 14:04:13 -07:00
Sami Tolvanen
6ca1dbd442 am 6baab44e: Merge "Fix build"
* commit '6baab44eed58ed647cfd18a117e6ea9f9a52c2a5':
  Fix build
2015-03-26 12:02:35 +00:00
Sami Tolvanen
6baab44eed Merge "Fix build" 2015-03-26 11:56:53 +00:00
Sami Tolvanen
4d3ead9d7c Fix build
Fix build breakage in aosp_fugu-userdebug_clang (linux) caused
by Id8711f7d51dc1e4e9a4d84f9951240f64528e69d

Change-Id: Icd04aeaf131be045cf5788846ae9832e6cbbb944
2015-03-26 11:44:42 +00:00
Sami Tolvanen
3fdc2f2be8 am d33c6c0e: Merge "Use structured format for verity metadata"
* commit 'd33c6c0ef2a7b28b66aa372579bb8b2ac9d65ba6':
  Use structured format for verity metadata
2015-03-26 07:46:57 +00:00
Sami Tolvanen
d33c6c0ef2 Merge "Use structured format for verity metadata" 2015-03-26 07:38:15 +00:00
Elliott Hughes
f6a683f14a am cfead6da: Merge " isn\'t set for continuous builds."
* commit 'cfead6dacf422d0d9230d7881a7b4c32f4f2b309':
  $ANDROID_BUILD_TOP isn't set for continuous builds.
2015-03-26 04:24:42 +00:00
Elliott Hughes
cfead6dacf Merge "$ANDROID_BUILD_TOP isn't set for continuous builds." 2015-03-26 04:19:53 +00:00
Elliott Hughes
608fb70dd8 $ANDROID_BUILD_TOP isn't set for continuous builds.
Instead, take advantage of the fact that we'll be run from the root of the
tree.

Change-Id: I5ce6d1c9ae8d478748ab90c9d3cc8e665ae5859b
2015-03-25 21:18:43 -07:00
Elliott Hughes
bde9b3869d am 09b66b93: Merge "Auto-generate the getevent labels from <linux/input.h>."
* commit '09b66b93f17e639a6ff3994a51b6de61ca1c78d4':
  Auto-generate the getevent labels from <linux/input.h>.
2015-03-26 04:09:23 +00:00
Elliott Hughes
09b66b93f1 Merge "Auto-generate the getevent labels from <linux/input.h>." 2015-03-26 03:38:19 +00:00
Elliott Hughes
c7f3c5c10c Auto-generate the getevent labels from <linux/input.h>.
Now we only have to remember to update the kernel uapi headers, which
we're pretty good at.

Change-Id: If04eb8c50882fff5e5e2a5d72664f5d4c4c538b1
2015-03-25 17:34:22 -07:00
Richard Uhler
f30beae169 am a0115bf7: Merge "Add make target for shared libcutils on host."
* commit 'a0115bf78db6ef373754fade0fe4028ac8c88653':
  Add make target for shared libcutils on host.
2015-03-25 15:53:35 +00:00
Richard Uhler
a0115bf78d Merge "Add make target for shared libcutils on host." 2015-03-25 15:48:42 +00:00
Richard Uhler
acb31ba905 Add make target for shared libcutils on host.
Needed by host dex2oat.

Change-Id: Ia5b53136de3d531c820f03c3f251e58418204be1
2015-03-24 14:46:01 -07:00
Mark Salyzyn
1394033a6b am 8257211f: Merge "init: missing break statement"
* commit '8257211f9e696ebf7ca13f513f7e44431616313c':
  init: missing break statement
2015-03-24 16:48:48 +00:00
Mark Salyzyn
8257211f9e Merge "init: missing break statement" 2015-03-24 16:44:05 +00:00
Mark Salyzyn
7a3d66c9eb init: missing break statement
Change-Id: Iac4a19c404590c3faba6021c7e537b01805c2d45
2015-03-24 07:29:22 -07:00
Sami Tolvanen
946a0f3e19 Use structured format for verity metadata
Specify the location of verity metadata in fstab, and use a
type-length-value format for the metadata that allows other
data to be stored in the same location in an extensible way.

Change-Id: Id8711f7d51dc1e4e9a4d84f9951240f64528e69d
2015-03-24 09:02:47 +00:00
Christopher Ferris
730d7c530a am 8e1697e7: Merge "Fix mac sdk build."
* commit '8e1697e7528f88985a5d702af53ef5d446f65fa1':
  Fix mac sdk build.
2015-03-24 05:00:51 +00:00
Christopher Ferris
8e1697e752 Merge "Fix mac sdk build." 2015-03-24 04:55:37 +00:00
Christopher Ferris
fc3576f675 Fix mac sdk build.
Add include files for types and functions that were not included properly.

Change-Id: I4849f5bdf535c6eec9254228cf980c30d11a5a1b
2015-03-23 21:40:30 -07:00
Elliott Hughes
9d37a6af31 am 9c5a5b3c: Merge "Lose runcon to toybox."
* commit '9c5a5b3c2bb25de486135eee4c61bd7695a80d2d':
  Lose runcon to toybox.
2015-03-24 01:30:32 +00:00
Elliott Hughes
9c5a5b3c2b Merge "Lose runcon to toybox." 2015-03-24 01:23:36 +00:00
Elliott Hughes
addb229c72 Lose runcon to toybox.
Change-Id: I0fa4a1907a9def4ba7dc1348f57299cd578fdf87
2015-03-23 17:55:23 -07:00
Dan Albert
ee022be9f8 am c31de501: Merge "More Mac fix."
* commit 'c31de5011a2b73af04d9e85dca863352458104ca':
  More Mac fix.
2015-03-23 23:45:53 +00:00
Dan Albert
c31de5011a Merge "More Mac fix." 2015-03-23 23:39:33 +00:00
Dan Albert
483060208c More Mac fix.
Change-Id: I7a1f726819c68eea1afb7e45f92954325f8933e1
2015-03-23 16:38:46 -07:00
Dan Albert
4520048535 am 89996c4b: Merge "Undo mac fix to fix windows, fix mac differently."
* commit '89996c4b74c438bd426710ff52139893aa39514c':
  Undo mac fix to fix windows, fix mac differently.
2015-03-23 23:18:41 +00:00
Dan Albert
89996c4b74 Merge "Undo mac fix to fix windows, fix mac differently." 2015-03-23 23:13:00 +00:00
Dan Albert
e308104390 Undo mac fix to fix windows, fix mac differently.
Change-Id: I7d1ee439d25e17c31c0be448e67a90a0f626ff42
2015-03-23 16:07:42 -07:00
Mark Salyzyn
229f332f45 am ddccd24f: Merge "liblog: remove internal __write_to_log_null"
* commit 'ddccd24f446797cfc3455f309d55c54183b64b53':
  liblog: remove internal __write_to_log_null
2015-03-23 22:46:38 +00:00
Mark Salyzyn
ddccd24f44 Merge "liblog: remove internal __write_to_log_null" 2015-03-23 22:43:04 +00:00
Mark Salyzyn
0d00a44a8b liblog: remove internal __write_to_log_null
__write_to_log_null never retries initialization and only
made sense for the kernel logger. The user space logger
can come and go.

Bug: 19732485
Change-Id: Iac34ea1c52ec82db4ee0c2c73ba0950ace4d4dec
2015-03-23 22:07:29 +00:00
Dan Albert
9b2aba0733 am ec574408: Merge "(Probably) fix the mac build."
* commit 'ec57440878476149468a014bd41acef27ceb8789':
  (Probably) fix the mac build.
2015-03-23 21:55:49 +00:00
Dan Albert
ec57440878 Merge "(Probably) fix the mac build." 2015-03-23 21:49:06 +00:00
Dan Albert
728b13f08d (Probably) fix the mac build.
Change-Id: I4209f2d66d8701df2f32dcfb79abea9ea6d3dc69
2015-03-23 14:48:05 -07:00
Greg Hackmann
91080a4296 am 2de01f5a: Merge "libziparchive: fix extraction of >2GiB images"
* commit '2de01f5a99f916c36124c6bc8cb0d6f18df03496':
  libziparchive: fix extraction of >2GiB images
2015-03-23 21:45:34 +00:00
Greg Hackmann
2de01f5a99 Merge "libziparchive: fix extraction of >2GiB images" 2015-03-23 21:42:15 +00:00
Greg Hackmann
503cd6d437 libziparchive: fix extraction of >2GiB images
Bug: 19888174

Change-Id: I33a577909ced522d46223e2182e0bb18c291af27
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2015-03-23 14:30:40 -07:00
Dan Albert
4a3421862e am 9f8093f8: Merge "Move gettid() into libcutils."
* commit '9f8093f88850304fd225ae612c3df960d1d247fc':
  Move gettid() into libcutils.
2015-03-23 21:19:42 +00:00
Dan Albert
9f8093f888 Merge "Move gettid() into libcutils." 2015-03-23 21:13:37 +00:00
Dan Albert
7dfb61dcdc Move gettid() into libcutils.
Change-Id: Ic8a15036833e6d129b7998d954b804be391de399
2015-03-23 13:01:21 -07:00
Dan Albert
97179d4a28 am a5e9639c: Merge "Update string Split API."
* commit 'a5e9639cf94aad0ed88ccd1c08d43f5084432f74':
  Update string Split API.
2015-03-23 18:02:44 +00:00
Dan Albert
a5e9639cf9 Merge "Update string Split API." 2015-03-23 17:57:30 +00:00