Commit Graph

12471 Commits

Author SHA1 Message Date
Tao Bao cd153076dc Merge "adb: Add option to reboot into sideload mode in recovery" 2015-03-31 00:57:33 +00:00
Elliott Hughes 656957e814 am a58c0b5f: Merge "Build init with clang."
* commit 'a58c0b5f12d60a3ae62cca57192cd0c3d9416f49':
  Build init with clang.
2015-03-31 00:41:54 +00:00
Elliott Hughes a58c0b5f12 Merge "Build init with clang." 2015-03-31 00:35:20 +00:00
Tao Bao 175b7bbfb4 adb: Add option to reboot into sideload mode in recovery
Currently it requires manual key press to enter the sideload mode. This
CL adds 'adb reboot sideload' to reboot the device into sideload mode
directly with text display on. With 'adb reboot sideload-auto-reboot',
it will reboot after the sideload regardless of the installation result,
unless interrupted by user.

Since it needs to write to /cache/recovery/command file, 'adb root' is
required before calling 'adb reboot sideload' and the one with
'-auto-reboot'.

Also it requires the matching CL in bootable/recovery.

Change-Id: Ib7bd4e216a1efc01e64460659c97c6005bbaec1b
2015-03-31 00:19:52 +00:00
Elliott Hughes 9efd95b029 Build init with clang.
Change-Id: I14d95b3fe0505dd7d7632e2eedc537f97553c715
2015-03-30 14:37:11 -07:00
Elliott Hughes 1f9a22882f am ffa85da6: Merge "Lose route to toybox."
* commit 'ffa85da6125c4b820fdecfd2b49acfb2631fb07a':
  Lose route to toybox.
2015-03-30 21:04:02 +00:00
Elliott Hughes ffa85da612 Merge "Lose route to toybox." 2015-03-30 20:57:56 +00:00
Elliott Hughes 42997bfebc am eb809351: Merge "Always unlink /dev/__kmsg__."
* commit 'eb809351db938f4e99aad36a9e791c4b87b0c951':
  Always unlink /dev/__kmsg__.
2015-03-30 19:18:50 +00:00
Elliott Hughes eb809351db Merge "Always unlink /dev/__kmsg__." 2015-03-30 19:12:47 +00:00
Elliott Hughes 798ec0c39d Lose route to toybox.
Change-Id: If68fa6a691478921452ebd785bd35e3ba5a8470a
2015-03-30 11:23:44 -07:00
Dan Albert 20329fa427 am 6d457fe1: Merge "Enable building libbase on Windows."
* commit '6d457fe1a8f35c50c84f523846f0f1aa04491423':
  Enable building libbase on Windows.
2015-03-30 17:51:34 +00:00
Dan Albert 6d457fe1a8 Merge "Enable building libbase on Windows." 2015-03-30 17:47:03 +00:00
Dan Albert b2326bd56c Enable building libbase on Windows.
We have to exclude the logging facilities for now (since we don't have
a std::mutex on Windows), but there's plenty else in here that is
worth having.

Change-Id: I6d1369e34e08ea2e88a0b1130c4462e5d35d99e2
2015-03-30 10:30:42 -07:00
Elliott Hughes 9c39510e06 am c2d9cc85: Merge "toolbox: Fixed type mismatch for ioctl(BLKGETSIZE)"
* commit 'c2d9cc85766bbec22980021af4eb4b01200c9a9f':
  toolbox: Fixed type mismatch for ioctl(BLKGETSIZE)
2015-03-30 17:28:33 +00:00
Elliott Hughes c2d9cc8576 Merge "toolbox: Fixed type mismatch for ioctl(BLKGETSIZE)" 2015-03-30 17:18:51 +00:00
Johan Redestig c06541912d toolbox: Fixed type mismatch for ioctl(BLKGETSIZE)
ioctl(BLKGETSIZE) expects unsigned long
(8 bytes on 64 bit environment).

Change-Id: Ic0f1d48e1d4cb890dbf617b3eb6285425cdbf0d0
2015-03-30 10:17:29 -07:00
Elliott Hughes 9e0edb77b0 am 934102ba: Merge "Lose load_policy to toybox."
* commit '934102baf8fca57abf63df7f134e977e696722db':
  Lose load_policy to toybox.
2015-03-28 20:40:13 +00:00
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 1108b42aa5 am 48402951: Merge "Clarify a few things about bootcharts."
* commit '48402951cfd44217ba50dbce5cc742db95d915c6':
  Clarify a few things about bootcharts.
2015-03-28 20:27:14 +00: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 68d54808df am 8f03e3cb: Merge "Revert "Remove the emulator special case from the "adb root" code.""
* commit '8f03e3cb3db392127fd8dc0a2ce62aa15a755ffd':
  Revert "Remove the emulator special case from the "adb root" code."
2015-03-28 19:07:43 +00: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 7c3749c24a am 6a62cac4: Merge "Further cleanup of the logic in device_init."
* commit '6a62cac4c1d2f10aa0a535df8e9757ee2f0fe725':
  Further cleanup of the logic in device_init.
2015-03-28 18:52:16 +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 36dfe06f81 am 6dbbcc57: Merge "Fix clang build by removing unused locals."
* commit '6dbbcc57a00e6b44488e595d128e27168a939a02':
  Fix clang build by removing unused locals.
2015-03-28 18:01:58 +00: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 c02f81cccb Always unlink /dev/__kmsg__.
Whether the open succeeds or fails, we should unlink.

Change-Id: Ic2f1e10dc7b6d6e459c56049da00d165bd63ba8f
2015-03-28 09:51:54 -07:00
Elliott Hughes 0cd316a46b am 5db3936d: Merge "Log more timing information from init."
* commit '5db3936dbe6fa73d45ab0f02b7166f43680084d3':
  Log more timing information from init.
2015-03-28 16:50:35 +00: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
Richard Uhler 7d451ab96d Define atrace_* functions for both target and host.
This change defines atrace_* functions for the host that act as
no-ops, which makes it easier to add tracing in ART.

Change-Id: I89397e83986686a2b6a6f245c25017eb379081b1
2015-03-27 14:58:30 -07:00
Dan Albert 10cc88c1a5 am e29744d9: Merge "Remove uses of libcxx.mk."
* commit 'e29744d94df787fa83307572d90a954b1592f69b':
  Remove uses of libcxx.mk.
2015-03-27 18:43:43 +00: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 a6ad2e7ed8 am 42f11922: Merge "Pull in Windows compatibility header."
* commit '42f1192273f3d05531c3fcfc8ce0fe5c437f6b7f':
  Pull in Windows compatibility header.
2015-03-27 06:40:49 +00:00
Dan Albert a82875c6fd am 5188d556: Merge "Include what we use."
* commit '5188d556d1530b3675dab2fc30dcc17432aa0718':
  Include what we use.
2015-03-27 06:40:48 +00: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 a596623fbf am 6ccfabcf: Merge "O_CLOEXEC is O_NOINHERIT on Windows."
* commit '6ccfabcf5d547a04a1e6c5237f20670230a7f6a4':
  O_CLOEXEC is O_NOINHERIT on Windows.
2015-03-27 06:34:45 +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 be1eb6d435 am 87378814: Merge "adb shell: Win32: fix Ctrl-C, tab completion, line editing, server echo"
* commit '87378814a06f6fa2d22026cbcb2f54be4b65e6c6':
  adb shell: Win32: fix Ctrl-C, tab completion, line editing, server echo
2015-03-27 05:34:47 +00: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