Commit Graph

12360 Commits

Author SHA1 Message Date
Elliott Hughes 934102baf8 Merge "Lose load_policy to toybox." 2015-03-28 20:35:05 +00:00
Elliott Hughes f29940559a Lose load_policy to toybox.
Change-Id: I3ef3aab9eef8e07ee598e2559a316e2fccf7199b
2015-03-28 13:29:05 -07:00
Elliott Hughes 48402951cf Merge "Clarify a few things about bootcharts." 2015-03-28 20:22:01 +00:00
Elliott Hughes 59abac27cb Clarify a few things about bootcharts.
Make it clearer in dmesg when we're deliberately not doing
bootcharting, and explain in the documentation that the output
for init is quite misleading (and, as far as I can tell, not
within our power to fix).

Change-Id: I0b22a56f83521d64c6d176dc423c81f7ea86b23c
2015-03-28 12:12:51 -07:00
Dan Albert 8f03e3cb3d Merge "Revert "Remove the emulator special case from the "adb root" code."" 2015-03-28 19:04:40 +00:00
Dan Albert 868402e5bf Revert "Remove the emulator special case from the "adb root" code."
adb root doesn't work on the emulator, so this prevents root access
to a userdebug emulator.

Since the emulator has always been root even on userdebug builds, it
may be that adb root has never worked on the emulator.

Bug: 19974213

This reverts commit abd6773b41.
2015-03-28 19:04:15 +00:00
Elliott Hughes 6a62cac4c1 Merge "Further cleanup of the logic in device_init." 2015-03-28 18:45:45 +00:00
Elliott Hughes 56a0656ed9 Further cleanup of the logic in device_init.
Change-Id: I96e4b11894926b50792b9b7d7cfa0fe8392abef6
2015-03-28 11:26:15 -07:00
Elliott Hughes 6dbbcc57a0 Merge "Fix clang build by removing unused locals." 2015-03-28 17:57:46 +00:00
Elliott Hughes 747383649c Fix clang build by removing unused locals.
Also don't manually set FD_CLOEXEC on a socket that's always opened
with SOCK_CLOEXEC. (None of the other callers to the function do this.)

Also move locals to where they're first used to help prevent more of this
kind of breakage.

Change-Id: I1ba7cd9400f53508dffb51a2bbf9d491ae647f26
2015-03-28 10:51:23 -07:00
Elliott Hughes 5db3936dbe Merge "Log more timing information from init." 2015-03-28 16:46:06 +00:00
Elliott Hughes da40c00137 Log more timing information from init.
Also make important events in init's life NOTICE rather than INFO,
and ensure that NOTICE events actually make it to the kernel log.

Also fix the logging so that if you have a printf format string
error, the compiler now catches it.

Also give messages from init, ueventd, and watchdogd distinct tags.
(Previously they'd all call themselves "init", and dmesg doesn't
include pids, so you couldn't untangle them.)

Also include the tag in SELinux messages.

Bug: 19544788
Change-Id: Ica6daea065bfdb80155c52c0b06f346a7df208fe
2015-03-28 00:25:22 -07:00
Dan Albert e29744d94d Merge "Remove uses of libcxx.mk." 2015-03-27 18:33:41 +00:00
Dan Albert d0a793dca3 Remove uses of libcxx.mk.
This is a no-op.

Change-Id: Iecbcd5f6d818abbf98767a2e996c10f454b652e4
2015-03-27 11:24:04 -07:00
Dan Albert 42f1192273 Merge "Pull in Windows compatibility header." 2015-03-27 06:35:54 +00:00
Dan Albert 5188d556d1 Merge "Include what we use." 2015-03-27 06:35:14 +00:00
Dan Albert 94d1360f7e Pull in Windows compatibility header.
Needed for O_CLOEXEC, O_NOFOLLOW, and DEFFILEMODE.

Change-Id: Id6c0465a6559c30ac8c085c28be0d47c9738f02a
2015-03-26 23:33:28 -07:00
Dan Albert 6ccfabcf5d Merge "O_CLOEXEC is O_NOINHERIT on Windows." 2015-03-27 06:29:40 +00:00
Dan Albert c6b30f376d O_CLOEXEC is O_NOINHERIT on Windows.
Change-Id: I714aa08344fa10684c99651f953834086cc162c7
2015-03-26 23:24:15 -07:00
Dan Albert 4b3f533be9 Include what we use.
Change-Id: If510431d3d445de94f781b4fdec2e1b445f7c294
2015-03-26 23:23:43 -07:00
Dan Albert 87378814a0 Merge "adb shell: Win32: fix Ctrl-C, tab completion, line editing, server echo" 2015-03-27 05:28:38 +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 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
Spencer Low 50184062b8 adb shell: Win32: fix Ctrl-C, tab completion, line editing, server echo
The 'adb shell' command on Windows has had problems:

* Ctrl-C killed the local Windows adb.exe process instead of sending the
Ctrl-C to the Android device.

* Local echo was enabled, causing everything typed to be displayed twice.

* Line input was enabled, so the Android device only received input
after hitting enter. This meant that tab completion did not work because
the tab wasn't seen by the shell until pressing enter.

* The usual input line editing keys did not work (Ctrl-A to go to the
beginning of the line, etc.).

This commit fixes these issues by reconfiguring the Win32 console and
then translating input into what Gnome Terminal would send, in effect
somewhat emulating a Unix terminal.

This does not fix all Win32 console issues, but is designed to be better
than what we had before, and to make the common day-to-day usage much
more comfortable and usable.

Change-Id: Idb10e0b634e27002804fa99c09a64e7176cf7c09
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2015-03-26 12:26:08 -07: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 d33c6c0ef2 Merge "Use structured format for verity metadata" 2015-03-26 07:38:15 +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 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 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 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 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 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 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 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 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 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