Commit graph

14252 commits

Author SHA1 Message Date
Christopher Ferris
329ed7dae4 Add load base to map for relocation packing.
The new linker relocation packing support uses non-zero load bases,
so we better handle them properly.

Also print out the load base for a map if it's non-zero.

Bug: 20687795
Change-Id: Iec2d1db2051e7b4a278c1dfa57d745128a7f2974
2015-05-01 16:04:24 -07:00
Elliott Hughes
f1a58f8f33 More fixed-length buffer removal.
Bug: http://b/20666660
Change-Id: I0c738e9fed2defed48a9cf2d0a4f7b99c08dcf3d
(cherry picked from commit 6452a89aa8)
2015-04-30 12:31:11 -07:00
Elliott Hughes
0156589846 Add missing 'else' to fix all devices showing up as "host".
Bug: http://b/20705355
Change-Id: I4f7830278f0c2bc87d95d148d85455b8da894645
(cherry picked from commit 3ce9575af7)
2015-04-29 22:44:47 -07:00
Mike Lockwood
c23f050b74 Merge "libusbhost: Add usb_device_get_version()" into mnc-dev 2015-04-29 20:25:19 +00:00
Mike Lockwood
f68600abfc libusbhost: Add usb_device_get_version()
Change-Id: If2161178e9fe94a94faf01c102ef64f2a72d093b
2015-04-29 13:04:10 -07:00
Elliott Hughes
2e06d3057e Fix Win32 build.
(cherry-pick of 1b600a902cc0b3a6065c962293292a5ac689fafe.)

Change-Id: Icf2c8df99b4b88bbf85a4097731733c5795fba44
2015-04-29 12:37:33 -07:00
Elliott Hughes
71aeb79815 Move __adb_error to std::string, and improve various errors.
Also remove an sprintf. Also fix various bits of code that were
reporting stale adb_error values when they meant strerror.

(cherry-pick of 078f0fcf4c63b8d8e8c10a18855eae04ca321e06.)

Bug: http://b/20666660
Change-Id: Ibeb48b7bc21bb0ec30ba47889d1d671ee480e1b7
2015-04-29 11:42:13 -07:00
Jeff Brown
28e84a147f Merge "Add float support to binary event log." into mnc-dev 2015-04-29 01:18:09 +00:00
Jeff Brown
b1993b637f Add float support to binary event log.
Bug: 20664753
Change-Id: Ib4752bd785496dab5bb4d4979d5d80f662adbdfa
2015-04-28 17:52:37 -07:00
Dan Stoza
0a866ea450 ANativeWindow: Add NATIVE_WINDOW_BUFFER_AGE query
Adds a NATIVE_WINDOW_BUFFER_AGE query, which returns the age of the
contents of the most recently dequeued buffer as the number of frames
that have elapsed since it was last queued.

Change-Id: Ib6fd62945cb62d1e60133a65beee510363218a23
(cherry picked from commit 19df32cd19)
2015-04-28 13:42:30 -07:00
Elliott Hughes
d81f75ae41 Remove strtok from adb.
Also fix android::base::Split to behave like Java, Python, and google3.

(cherry picked from commit 8d5fa6da44)

Change-Id: I9388ae37ee8dd4a4a6c2a9a19f068b70d9a78353
2015-04-28 10:55:24 -07:00
Elliott Hughes
03a90d6633 Support the full length of USB serial numbers.
Two bugs: we couldn't report the serial number correctly if it was long
enough, and it wasn't possible to connect to a device whose serial number
was long enough to overflow a different fixed-length buffer.

Bug: http://b/20317730

(cherry picked from commit 9309ecbcec)

Change-Id: I04c160a215418a57bd4fb27b7f63060c8be6f12e
2015-04-27 17:19:01 -07:00
Elliott Hughes
f5290ee1a7 Use WriteFully in debuggerd to talk to ActivityManager.
(cherry picked from commit b7cd09b93e)

Change-Id: Ic81b4134fe563d8ebb15ba4ff3e9b2e8893c97a5
2015-04-27 12:51:42 -07:00
Nick Kralevich
55db2ebca9 am ada332e4: am ecf184c9: am 9c9280d8: Merge "init: get rid of the remaining double mounts"
* commit 'ada332e4a01a3bb290be26f8a5b67993bd10af14':
  init: get rid of the remaining double mounts
2015-04-26 18:39:31 +00:00
Nick Kralevich
21de44a8a3 am ec9bd166: am 45a49d0e: am ccac2be8: Merge "init: use SELinux /dev/null if available"
* commit 'ec9bd166cc406d8079b7d33d04b3e04708183d96':
  init: use SELinux /dev/null if available
2015-04-26 18:39:30 +00:00
Nick Kralevich
ada332e4a0 am ecf184c9: am 9c9280d8: Merge "init: get rid of the remaining double mounts"
* commit 'ecf184c901b78994773d687763c1478752e9375e':
  init: get rid of the remaining double mounts
2015-04-26 02:11:28 +00:00
Nick Kralevich
ecf184c901 am 9c9280d8: Merge "init: get rid of the remaining double mounts"
* commit '9c9280d863d7377858af6e1543ea4ada7af3b0ec':
  init: get rid of the remaining double mounts
2015-04-26 02:00:51 +00:00
Nick Kralevich
9c9280d863 Merge "init: get rid of the remaining double mounts" 2015-04-26 01:51:04 +00:00
Nick Kralevich
ec9bd166cc am 45a49d0e: am ccac2be8: Merge "init: use SELinux /dev/null if available"
* commit '45a49d0eb7e2e9fc3d2c48884c84f6a6c7397720':
  init: use SELinux /dev/null if available
2015-04-26 01:39:13 +00:00
Nick Kralevich
45a49d0eb7 am ccac2be8: Merge "init: use SELinux /dev/null if available"
* commit 'ccac2be8a6269469087a7978e1a6db62ef4618c6':
  init: use SELinux /dev/null if available
2015-04-26 01:30:43 +00:00
Nick Kralevich
f667a3247a init: get rid of the remaining double mounts
Don't double mount /dev and its subdirectories anymore. Instead, the
first stage init is solely responsible for mounting it.

Don't have init prepare the property space. This is the responsibility
of the second stage init.

Don't have SELinux use the property space to determine how we should
be running. Instead, create a new function and extract the data we
need directly from /proc/cmdline. SELinux needs this information in
the first stage init process where the property service isn't available.

Change-Id: I5b4f3bec79463a7381a68f30bdda78b5cc122a96
2015-04-25 18:29:26 -07:00
Nick Kralevich
ccac2be8a6 Merge "init: use SELinux /dev/null if available" 2015-04-26 00:59:01 +00:00
Nick Kralevich
499eb29b58 am 1c2457ff: am b31c3a5a: am 178299fd: Merge "init: don\'t double mount /proc and /sys"
* commit '1c2457ffdaf833b06a2619d967fe9def7139180f':
  init: don't double mount /proc and /sys
2015-04-25 23:49:45 +00:00
Nick Kralevich
1d28e4fc37 am 2ae7d4ee: am 6b6df173: am f8b0743e: Merge "init: fix write_file checkreqprot logic error"
* commit '2ae7d4eefddf2cd7ac4bba60fb6d057e2b01731b':
  init: fix write_file checkreqprot logic error
2015-04-25 23:49:44 +00:00
Elliott Hughes
7c517acdd6 am 4f790e37: am ecd6e36d: am 47a9ef2f: Merge "Improve logging of USBDEVFS_CLAIMINTERFACE failures."
* commit '4f790e37142f2bda0f59bdf84060324bc51756fd':
  Improve logging of USBDEVFS_CLAIMINTERFACE failures.
2015-04-25 23:49:43 +00:00
Nick Kralevich
e34577ce1b init: use SELinux /dev/null if available
SELinux provides it's own /dev/null character device at
/sys/fs/selinux/null. This character device is exactly the same
as /dev/null, including the same major/minor numbers, and can
be used wherever /dev/null is used.

Use /sys/fs/selinux/null instead of trying to create our own
/dev/__null__ device. This moves us one step closer to eliminating
all uses of mknod() by init.

/sys/fs/selinux/null is only available once the /sys/fs/selinux filesystem
is mounted. It's not available to the first stage init, so we
still have to fall back to mknod then.

Change-Id: Ic733767ea6220a130537de33cc478ae79578ce20
2015-04-25 16:48:23 -07:00
Nick Kralevich
1c2457ffda am b31c3a5a: am 178299fd: Merge "init: don\'t double mount /proc and /sys"
* commit 'b31c3a5a453cd9f472698068af9909e80a96ab2c':
  init: don't double mount /proc and /sys
2015-04-25 23:28:45 +00:00
Nick Kralevich
2ae7d4eefd am 6b6df173: am f8b0743e: Merge "init: fix write_file checkreqprot logic error"
* commit '6b6df1733711ace006e0f4f9d44c718f85d2f70d':
  init: fix write_file checkreqprot logic error
2015-04-25 23:28:44 +00:00
Elliott Hughes
4f790e3714 am ecd6e36d: am 47a9ef2f: Merge "Improve logging of USBDEVFS_CLAIMINTERFACE failures."
* commit 'ecd6e36d37d2e1fcc021762baaff417c94920dd4':
  Improve logging of USBDEVFS_CLAIMINTERFACE failures.
2015-04-25 23:28:43 +00:00
Nick Kralevich
b31c3a5a45 am 178299fd: Merge "init: don\'t double mount /proc and /sys"
* commit '178299fd459b7622e9e3de05a48d6ba050f92bec':
  init: don't double mount /proc and /sys
2015-04-25 23:16:49 +00:00
Nick Kralevich
6b6df17337 am f8b0743e: Merge "init: fix write_file checkreqprot logic error"
* commit 'f8b0743ef418c15fe622143a6b4b42b102a07803':
  init: fix write_file checkreqprot logic error
2015-04-25 23:16:48 +00:00
Elliott Hughes
ecd6e36d37 am 47a9ef2f: Merge "Improve logging of USBDEVFS_CLAIMINTERFACE failures."
* commit '47a9ef2f116fd885a3ba0e9027a45b2a68cc5b3f':
  Improve logging of USBDEVFS_CLAIMINTERFACE failures.
2015-04-25 23:16:46 +00:00
Nick Kralevich
178299fd45 Merge "init: don't double mount /proc and /sys" 2015-04-25 23:11:27 +00:00
Nick Kralevich
f8b0743ef4 Merge "init: fix write_file checkreqprot logic error" 2015-04-25 23:09:08 +00:00
Elliott Hughes
47a9ef2f11 Merge "Improve logging of USBDEVFS_CLAIMINTERFACE failures." 2015-04-25 23:05:28 +00:00
Nick Kralevich
9dec93bfeb init: don't double mount /proc and /sys
The first stage init mounts /proc and /sys, and then the second
stage init also mounts /proc and /sys on top of the existing mount.
Only mount these two directories once, in the first stage init.

Not yet fixed: the double mounting of /dev. Removing the double
mounting doesn't work right now because both init stages are trying
to create a property space, and if the double mount of /dev goes away,
the property service in the second stage init fails to work.

Change-Id: I13719027a47526d074390c2b1a605ad99fb43a8f
2015-04-25 15:50:03 -07:00
Nick Kralevich
eedbe81f75 init: fix write_file checkreqprot logic error
write_file() returned -errno on error, not -1. Callers who check for
-1 would falsely believe that the write was successful when it wasn't.
Fixup write_file so that it return -1 on error consistent
with other functions.

Change-Id: Ic51aaf8678d8d97b2606bd171f11b3b11f642e39
2015-04-25 15:36:13 -07:00
Nick Kralevich
8591d91541 am 04faed7a: am ecfb3664: am 8929c77a: Merge "init: remove mkdir /dev /proc /sys"
* commit '04faed7aba1ff66ea62c041424ce572400494cbb':
  init: remove mkdir /dev /proc /sys
2015-04-25 21:54:18 +00:00
Elliott Hughes
ce6363bbbc Improve logging of USBDEVFS_CLAIMINTERFACE failures.
Bug: https://code.google.com/p/android/issues/detail?id=170054
Change-Id: I9b11eb019093e3322da0a8e70d6e17de4c25ab75
2015-04-25 14:44:23 -07:00
Nick Kralevich
04faed7aba am ecfb3664: am 8929c77a: Merge "init: remove mkdir /dev /proc /sys"
* commit 'ecfb3664fea6cbe39d94459ceb06a91f57006820':
  init: remove mkdir /dev /proc /sys
2015-04-25 21:30:45 +00:00
Nick Kralevich
ecfb3664fe am 8929c77a: Merge "init: remove mkdir /dev /proc /sys"
* commit '8929c77ab9aa9be612291809669e9162837c54ae':
  init: remove mkdir /dev /proc /sys
2015-04-25 21:19:17 +00:00
Nick Kralevich
8929c77ab9 Merge "init: remove mkdir /dev /proc /sys" 2015-04-25 21:08:12 +00:00
Nick Kralevich
a1f6a4b139 init: remove mkdir /dev /proc /sys
These directories are already present in the initial ramdisk, and
these mkdir calls are no-ops.

Change-Id: I528f9e96a3471de904845a2f9e09c1b6ff83a708
2015-04-25 13:48:26 -07:00
Elliott Hughes
5773993df4 am 893981c9: am cd58f488: am 6ce5625d: Merge "Improve toolbox SIGPIPE behavior."
* commit '893981c9774de525a5e481fb717613feb35fa4cf':
  Improve toolbox SIGPIPE behavior.
2015-04-25 19:59:02 +00:00
Elliott Hughes
893981c977 am cd58f488: am 6ce5625d: Merge "Improve toolbox SIGPIPE behavior."
* commit 'cd58f488c263f5a1db9f7491d2aa062240765a6c':
  Improve toolbox SIGPIPE behavior.
2015-04-25 19:37:19 +00:00
Elliott Hughes
cd58f488c2 am 6ce5625d: Merge "Improve toolbox SIGPIPE behavior."
* commit '6ce5625d58c2376b719802a0ae0b56bcd3afcdc8':
  Improve toolbox SIGPIPE behavior.
2015-04-25 19:26:23 +00:00
Elliott Hughes
6ce5625d58 Merge "Improve toolbox SIGPIPE behavior." 2015-04-25 19:14:54 +00:00
Elliott Hughes
5976018b4a Improve toolbox SIGPIPE behavior.
None of our tools -- except for top, which I'd fixed previously --
handles SIGPIE correctly. Let's just handle SIGPIPE in the driver.

Bug: https://code.google.com/p/android/issues/detail?id=157920
Change-Id: I322ea411f53c71585a64118c217d54389f675d4e
2015-04-25 12:03:41 -07:00
Elliott Hughes
bdabdd9279 am 75e18f3b: am 5281a2a8: am 9798023e: Merge "Add ReadFully and WriteFully to libbase."
* commit '75e18f3bced9f59791fb0774e7fbfd1ff1b38732':
  Add ReadFully and WriteFully to libbase.
2015-04-25 05:37:20 +00:00
Elliott Hughes
a81ee72c2e am 2b57981b: am ae3154e3: am 2899c94b: Merge "Switch init to epoll."
* commit '2b57981b05a3771bfce01e801581442e4b63299f':
  Switch init to epoll.
2015-04-25 05:37:18 +00:00