Commit Graph

9618 Commits

Author SHA1 Message Date
JP Abgrall 6bd72beff6 fastboot: fix windows sdk build (don't do f2fs dyn load on windows)
Only do f2fs dynamic loading on linux.
Adds a stub for windows builds.

Change-Id: I7bbaaa1b2ff5992709d904b7ace40ae263d32922
Signed-off-by: JP Abgrall <jpa@google.com>
2014-06-17 23:43:18 -07:00
JP Abgrall e14efeac9a Merge topic 'f2fs'
* changes:
  fsmgr: allow for a multiple fs-types for a mount point.
  F2FS support for fastboot format and fsmgr
2014-06-17 20:49:29 +00:00
JP Abgrall a794f86522 fsmgr: allow for a multiple fs-types for a mount point.
This changes allows an fstab to contain multiple lines for a given
mount point.
The lines sharing a mount MUST be after each other.

The 1st matching line is the primary when it comes to mounting
and look ups for wiping.

Mounting based on a mount_point will attempt each dup in turn
until one succeeds.

This is to allow quick experimentations between different FSes.
It does not deal with checkfs yet, because the underlying invocation
of fs-type appropriate fsck does not handle the error code.
Only the primary FS (1st in the dups) is checked.

Change-Id: I8329737454b53e2681436fe85cd00a9bc522676b
Signed-off-by: JP Abgrall <jpa@google.com>
2014-06-17 17:01:20 -07:00
JP Abgrall 1235158c29 F2FS support for fastboot format and fsmgr
- Enables fsck.f2fs for partitions with type F2FS.
- Adds support for f2fs as format fs-type.
- f2fs is optional and support is dlopen()d when needed.

Needs changes in
  system/extras/f2fs_utils
  external/f2fs-tools

Change-Id: I8d141a0d4d14df9fe84d3b131484e9696fcd8870
Signed-off-by: JP Abgrall <jpa@google.com>
2014-06-17 17:01:14 -07:00
Elliott Hughes 429502d4da am d478aec2: am bd80e0d8: am 0ef3fa24: Merge "Changed maps output in debuggerd."
* commit 'd478aec2a9aea7c0e041a9c4f81202fa77862622':
  Changed maps output in debuggerd.
2014-06-17 23:02:01 +00:00
Elliott Hughes d478aec2a9 am bd80e0d8: am 0ef3fa24: Merge "Changed maps output in debuggerd."
* commit 'bd80e0d8e6de5c2d4fbd2e8a1bc750dc6e0b7e20':
  Changed maps output in debuggerd.
2014-06-17 22:58:11 +00:00
Elliott Hughes bd80e0d8e6 am 0ef3fa24: Merge "Changed maps output in debuggerd."
* commit '0ef3fa24fb0c3c58b8440527e4de4f3f98ddaaa5':
  Changed maps output in debuggerd.
2014-06-17 22:52:46 +00:00
Elliott Hughes e1f7c176f6 am 6419687f: am 929c7fe1: am 5bc6b5b8: Merge "Fixed logcat debug output issue."
* commit '6419687fe05ea5b64e3db4f380f45b157d6fa10a':
  Fixed logcat debug output issue.
2014-06-17 21:40:41 +00:00
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 0ef3fa24fb Merge "Changed maps output in debuggerd." 2014-06-17 20:56:23 +00:00
Brigid Smith 7b2078eeb4 Changed maps output in debuggerd.
Now the map output is only sent to the tombstone, and the entire
contents of /prod/$PID/maps is logged, not just 3 lines.  Additionally,
crasher now supports "crasher SIGSEGV-non-null", which attempts to write to a
dereferenced function address, causing a SIGSEGV at a non-zero address.
This new crasher mode can be used to test the new maps output.

Bug: 15343662
Change-Id: I796d92e8352a6b9714bbbfe96f3143c56565ef2f
2014-06-17 15:32:22 -07: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
William Luh 5695df2427 Merge "Add event log tag for Safety Net." 2014-06-17 04:56:28 +00:00
Ian Rogers 9db200f7ad am 44367492: am 4ac17e3b: am 4dfe6faa: Merge "Enable host multilib for ART testing."
* commit '4436749284dc2b74e6e0f430d0f803d1b7862d19':
  Enable host multilib for ART testing.
2014-06-17 18:58:34 +00:00
Nick Kralevich 3a53b49075 am 545c6599: am a029d14d: am 2af91ffb: Merge "Extend ueventd to use the label-by-symlink support in libselinux."
* commit '545c6599fa2702a3a220f486367e9df42b20e0b6':
  Extend ueventd to use the label-by-symlink support in libselinux.
2014-06-17 18:53:56 +00:00
William Luh 66929dbe1b Add event log tag for Safety Net.
This is for clients who log to EventLog and want Safety Net to
pick up and send the logs.

Bug:15572351
Change-Id: I6fdbe7905ec8b3b27a36eb38aee61c97bcd8d4bf
2014-06-17 10:05:47 -07: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
Nick Kralevich 97690a28ea Merge "fs_mkdirs: use O_NOFOLLOW and O_CLOEXEC" 2014-06-16 22:12:26 +00:00
Nick Kralevich 30a86ebc7a fs_mkdirs: use O_NOFOLLOW and O_CLOEXEC
Don't follow symlinks. Suggestion from Jann Horn.

Also, add O_CLOEXEC. This prevents file descriptor leakage should
this code ever run in a multithreaded environment.

I'm not sure if either of these changes actually address any
security concerns, but it's harmless, so go ahead and add it.

Bug: 15675141
Change-Id: I7ba4e9d10439b7150f59759b54e3ad8ccba411e3
2014-06-16 15:40:40 -07:00
Elliott Hughes b3afd6c7f4 resolved conflicts for merge of 96021e03 to master
Change-Id: I60815f9581cdd5b43be5b0ef0612db3dcce2dcdb
2014-06-16 15:30:31 -07: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 def14fc4ed am cd0d5935: am 6c65cd5d: am 60218f19: Merge "Add gionee USB vendor id."
* commit 'cd0d593569d7f2b8f8ec81ab3ef6dd942230e973':
  Add gionee USB vendor id.
2014-06-16 18:11:41 +00: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
Ying Wang 7011a85606 Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed.
Change-Id: I4686c1239aa5ed361c918ce4e7a5abf9a1552ab4
2014-06-14 09:11:58 -07:00
Mark Salyzyn e5fdfcdcb4 am 9b86360f: am c3e23666: am 7fa1cd19: Merge "log: Fix warning with __USE_MINGW_ANSI_STDIO"
* commit '9b86360fb41b46abfc0e475cfdea4370a93179d5':
  log: Fix warning with __USE_MINGW_ANSI_STDIO
2014-06-13 14:43:58 +00: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 232c711795 am 46ed1c8c: am ed1a0dbd: am b44e626c: Merge "Fix windows sdk build."
* commit '46ed1c8c99fce33c78e239d4155ece84feca069d':
  Fix windows sdk build.
2014-06-13 10:24:51 +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 9ea2ad5796 am 6dfe9495: am 9b2d964d: am 08430b1e: Merge "Use syscall(2) instead of ioprio_get/ioprio_set."
* commit '6dfe949568fa9413db72cdccb26baca2c4592a2a':
  Use syscall(2) instead of ioprio_get/ioprio_set.
2014-06-13 03:04:23 +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 8ffe8eac5b am f8cb68e1: am 3bff77a8: am 875dc8f3: Merge "Create /data/dalvik-cache/profiles"
* commit 'f8cb68e15ba242200e3525fffa2f969960e18a50':
  Create /data/dalvik-cache/profiles
2014-06-12 23:17:38 +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