Commit graph

6916 commits

Author SHA1 Message Date
Christopher Ferris
f7adcfc8bd am 17b9c827: Merge "Add PROT_* constants not found on windows."
* commit '17b9c82765a325d88fc2e8920f9df3155c5773e2':
  Add PROT_* constants not found on windows.
2014-01-17 11:19:48 -08:00
Christopher Ferris
237fdb4a95 am eb8d73b6: Merge "Rewrite libbacktrace to be all C++."
* commit 'eb8d73b675d8d9613310b5d5e5865571b98d6f78':
  Rewrite libbacktrace to be all C++.
2014-01-17 11:19:48 -08:00
Christopher Ferris
17b9c82765 Merge "Add PROT_* constants not found on windows." 2014-01-17 16:26:37 +00:00
Christopher Ferris
0dbce4564b Add PROT_* constants not found on windows.
Change-Id: Ic515363ed66dfb2d8e1a6fdfa274508b3a91311d
2014-01-17 08:25:26 -08:00
Christopher Ferris
eb8d73b675 Merge "Rewrite libbacktrace to be all C++." 2014-01-17 15:07:18 +00:00
Christopher Ferris
46756821c4 Rewrite libbacktrace to be all C++.
This includes removing the map_info.c source and replacing it with the
BacktraceMap class to handle all map related code.

Change all callers of libbacktrace map functionality.

Also modify the corkscrew thread code so that it doesn't need to build
the map twice (once in the corkscrew format and once in the libbacktrace
format).

Change-Id: I32865a39f83a3dd6f958fc03c2759ba47d12382e
2014-01-16 16:12:29 -08:00
Elliott Hughes
e20b5f71c0 am 524b3a0c: Merge "Remove obsolete \'setconsole\' command."
* commit '524b3a0c40fcca4b2259f317b2d098434998ce47':
  Remove obsolete 'setconsole' command.
2014-01-16 16:00:58 -08:00
Elliott Hughes
524b3a0c40 Merge "Remove obsolete 'setconsole' command." 2014-01-16 23:55:50 +00:00
Elliott Hughes
c1e91b0034 Remove obsolete 'setconsole' command.
Change-Id: I643a48653006b97bb10d7b996ecc003dbafad590
2014-01-16 14:50:23 -08:00
Elliott Hughes
97373bbc71 am 7cd15614: Merge "system/core 64-bit cleanup."
* commit '7cd1561410473c71d40cec822fb53a282b5b3279':
  system/core 64-bit cleanup.
2014-01-16 14:05:24 -08:00
Elliott Hughes
7cd1561410 Merge "system/core 64-bit cleanup." 2014-01-16 21:59:58 +00:00
Elliott Hughes
ccecf14254 system/core 64-bit cleanup.
This cleans up most of the size-related problems in system/core.
There are still a few changes needed for a clean 64-bit build,
but they look like they might require changes to things like the
fastboot protocol.

Change-Id: I1560425a289fa158e13e2e3173cc3e71976f92c0
2014-01-16 12:54:18 -08:00
Nick Kralevich
a6b65eeef1 am 7580661d: Merge "fs_mgr: increase verboseness on mount errors"
* commit '7580661df179eb037c0dbe96e3bde1bc9e6bfbdc':
  fs_mgr: increase verboseness on mount errors
2014-01-16 11:19:51 -08:00
Nick Kralevich
7580661df1 Merge "fs_mgr: increase verboseness on mount errors" 2014-01-16 19:14:30 +00:00
Nick Kralevich
c93904b445 am e847f429: Merge "restorecon /data/misc/media."
* commit 'e847f429f43ae56aaa406697ca603c8469e2100b':
  restorecon /data/misc/media.
2014-01-15 12:13:20 -08:00
Nick Kralevich
e847f429f4 Merge "restorecon /data/misc/media." 2014-01-15 20:06:52 +00:00
William Roberts
071f28ae0e fs_mgr: increase verboseness on mount errors
While debugging a mount error, the dmesg output was less
than ideal. The error would be declared but why the mount
failed, and what options were passed was not present. This
patch ensures that the mount options and underlying
errno are printed.

Change-Id: I2b3a2c113149df878c0a8a10ef86fd9e4f909658
2014-01-15 13:26:26 -05:00
Stephen Smalley
9e9f05e5eb restorecon /data/misc/media.
Otherwise it will be mislabeled on upgrades with existing userdata.

Change-Id: Ibde88d5d692ead45b480bb34cfe0831baeffbf94
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-01-15 13:19:31 -05:00
Nick Kralevich
93557002e1 am 37fd839f: Merge "Revert "fs_mgr: correct warning on unused function parameter""
* commit '37fd839fc26b9b3da451a3cb23da6e49c6b676d9':
  Revert "fs_mgr: correct warning on unused function parameter"
2014-01-14 22:26:03 -08:00
Nick Kralevich
37fd839fc2 Merge "Revert "fs_mgr: correct warning on unused function parameter"" 2014-01-15 06:20:42 +00:00
Nick Kralevich
bc7776716a Revert "fs_mgr: correct warning on unused function parameter"
The build is broken.

system/core/fs_mgr/fs_mgr.c:824:77: error: expected '(' before 'unused'
                      const char *blk_device, long long length  __attribute__(unused))
                                                                             ^
system/core/fs_mgr/fs_mgr.c: In function 'fs_mgr_add_entry':
system/core/fs_mgr/fs_mgr.c:824:56: warning: unused parameter 'length' [-Wunused-parameter]
                      const char *blk_device, long long length  __attribute__(unused))
                                                        ^
make: *** [out/target/product/generic_x86/obj/STATIC_LIBRARIES/libfs_mgr_intermediates/fs_mgr.o] Error 1
make: *** Waiting for unfinished jobs....
This reverts commit 21095d0cae.

Change-Id: I64f8c4d9c17c0e3bbf2eb427a2c0b81bbe66ec3a
2014-01-15 06:18:54 +00:00
Nick Kralevich
e220e9e06d am 7169b230: Merge "fs_mgr: correct warning on unused function parameter"
* commit '7169b2303d9340b3537e5059f1790a246490b899':
  fs_mgr: correct warning on unused function parameter
2014-01-14 22:03:29 -08:00
Nick Kralevich
7169b2303d Merge "fs_mgr: correct warning on unused function parameter" 2014-01-15 05:57:33 +00:00
Elliott Hughes
4a8996fb42 am 3352c503: Merge "Copy the bionic -fstack-protector hack into libbacktrace."
* commit '3352c5037526e1f5cd3291a4853c497e488b824c':
  Copy the bionic -fstack-protector hack into libbacktrace.
2014-01-14 16:52:33 -08:00
Elliott Hughes
3352c50375 Merge "Copy the bionic -fstack-protector hack into libbacktrace." 2014-01-15 00:46:48 +00:00
Elliott Hughes
1380ddcab2 Copy the bionic -fstack-protector hack into libbacktrace.
aarch64 doesn't support -fstack-protector yet.

Change-Id: Id1e589742ba074f59d3390d059248c9b371aff58
2014-01-14 16:44:31 -08:00
Elliott Hughes
ea8dcdcf64 am 21ecc30c: Merge "Fix fastbootd build for 64-bit."
* commit '21ecc30cd0bb0eb5035d48e4eb0e78d6a509dd8d':
  Fix fastbootd build for 64-bit.
2014-01-14 16:29:53 -08:00
Elliott Hughes
21ecc30cd0 Merge "Fix fastbootd build for 64-bit." 2014-01-15 00:24:37 +00:00
Elliott Hughes
4f24125ccc Fix fastbootd build for 64-bit.
Change-Id: I04bef46f0125fd6a8fc0cb966bd257ad594aff1e
2014-01-14 16:17:08 -08:00
Elliott Hughes
53cd1484aa am aead003c: Merge "Don\'t set LD_LIBRARY_PATH globally."
* commit 'aead003c8bc677218329c535b063a5bb66695414':
  Don't set LD_LIBRARY_PATH globally.
2014-01-14 16:05:23 -08:00
Elliott Hughes
aead003c8b Merge "Don't set LD_LIBRARY_PATH globally." 2014-01-14 23:59:09 +00:00
Elliott Hughes
ab3d503627 am d47ffb88: Merge "AArch64: Add atomic functions"
* commit 'd47ffb8890b937ee4f162032d9426f45b52b4346':
  AArch64: Add atomic functions
2014-01-14 15:36:57 -08:00
Elliott Hughes
d47ffb8890 Merge "AArch64: Add atomic functions" 2014-01-14 23:32:22 +00:00
Ashok Bhat
c15d2ce5fc AArch64: Add atomic functions
This patch adds atomic functions for AArch64. The functions
will be revisited later for potential optimizations using
assembly or otherwise.

This patch also introduces new 64-bit atomic functions for
LP64 platforms.

Change-Id: Id2127dd01cea65025f939e955d73d27e95d8687e
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2014-01-14 12:45:58 -08:00
William Roberts
21095d0cae fs_mgr: correct warning on unused function parameter
target thumb C: libfs_mgr <= system/core/fs_mgr/fs_mgr.c
system/core/fs_mgr/fs_mgr.c: In function 'fs_mgr_add_entry':
system/core/fs_mgr/fs_mgr.c:828:56: warning: unused parameter 'length' [-Wunused-parameter]
                      const char *blk_device, long long length)

Change-Id: Ide1bfa120c4f8d8e2f643929cb84c1be065e3310
2014-01-14 15:04:56 -05:00
Christopher Ferris
d9cb2964e2 am 91e2019f: Merge "Create a bare bones host libbacktrace on mac."
* commit '91e2019f81a839b71cfcff75129d1c1fdd552dcb':
  Create a bare bones host libbacktrace on mac.
2014-01-14 10:06:27 -08:00
Christopher Ferris
91e2019f81 Merge "Create a bare bones host libbacktrace on mac." 2014-01-14 18:03:10 +00:00
Christopher Ferris
f67c6410d1 Create a bare bones host libbacktrace on mac.
This allows the libbacktrace library to compile for host on mac.

Bug: 12474939
Change-Id: I32cbcf996e6fe9057e5065ba21f89086343704a0
2014-01-13 23:57:35 -08:00
Christopher Ferris
1f71e465ef am 68870199: Merge "Next phase of the move, reformat use C++ features."
* commit '688701990db1aef2d7dbe0ccdc4f12c2dd5f51a8':
  Next phase of the move, reformat use C++ features.
2014-01-13 17:24:13 -08:00
Christopher Ferris
688701990d Merge "Next phase of the move, reformat use C++ features." 2014-01-14 01:18:20 +00:00
Elliott Hughes
bb07b536f5 Don't set LD_LIBRARY_PATH globally.
On a 64-bit system, 64-bit processes will want one path, 32-bit processes
another. The dynamic linker already provides the correct defaults for
native code, and we've coupled the VM and dynamic linker so that
LD_LIBRARY_PATH will be set correctly in any VM during startup if it's not
being manually overridden.

Change-Id: Icbffc0d451dbc242cdfb9267413d8bcac434e108
2014-01-13 16:49:54 -08:00
Nick Kralevich
45f3ed05c9 am 105f6b66: Merge "restorecon_recursive("/sys") speed boot time"
* commit '105f6b6686ae1b2f6ae8ae81548cceb313fb2cee':
  restorecon_recursive("/sys") speed boot time
2014-01-13 16:27:24 -08:00
Nick Kralevich
105f6b6686 Merge "restorecon_recursive("/sys") speed boot time" 2014-01-14 00:19:53 +00:00
Christopher Ferris
20303f856f Next phase of the move, reformat use C++ features.
Use the libbacktrace C++ interface instead of the C interface in debuggerd.

Reformat the debuggerd code to be closer to Google C++ style.

Fix all debuggerd casts to be C++ casts.

Add a frame number to the frame data structure for ease of formatting and
add another FormatFrameData function.

Change the format_test to use the new FormatFrameData function.

Modify all of the backtrace_test to use the C++ interface.

Change-Id: I10e1610861acf7f4a3ad53276b74971cfbfda464
2014-01-13 14:21:52 -08:00
Colin Cross
e0e7595f3c am e76343ef: Merge "Emerson USB ID"
* commit 'e76343ef72458aff8fdc25c57f4e84407c05a2f2':
  Emerson USB ID
2014-01-11 23:09:48 -08:00
Colin Cross
e76343ef72 Merge "Emerson USB ID" 2014-01-12 07:05:04 +00:00
Jon Sawyer
6e39bace17 Emerson USB ID
Adds Emerson's USB id to the known USB Devices.

Change-Id: If6115c2551c1f30a5c190690f2aeaaf2adff7ee1
Signed-off-by: Jon Sawyer <jon@cunninglogic.com>
2014-01-11 22:59:18 -08:00
Nick Kralevich
a613819a96 restorecon_recursive("/sys") speed boot time
Currently, the restorecon_recursive("/sys") call in
init.c takes approx 2 seconds on hammerhead. This change
reduces the delay to 1.2 seconds.

1) Avoid double stat call when using nftw (time savings
of 0.3 seconds)
2) Avoid the repeated calls to is_selinux_enabled() (time
savings of 0.5 seconds)

Avoid calling lsetfilecon if the file is already properly
labeled. This doesn't speed up the restorecon on /sys,
but it should help when handling files on /data.

Bug: 11640230
Change-Id: Ie212ce4f4acade208c5676d60c1f03f50e2388a4
2014-01-10 19:49:14 -08:00
Christopher Ferris
a7083e0dd2 am 8387fc93: Merge "Move to C++ for debuggerd."
* commit '8387fc938e044a2bf2840139203af7f9b3884029':
  Move to C++ for debuggerd.
2014-01-10 16:23:39 -08:00
Christopher Ferris
8387fc938e Merge "Move to C++ for debuggerd." 2014-01-11 00:19:56 +00:00