Christopher Ferris
758c8636c6
am 6ecdff5b: am f7adcfc8: am 17b9c827: Merge "Add PROT_* constants not found on windows."
...
* commit '6ecdff5baeb8102438c7f91cd2297b8feaaa5081':
Add PROT_* constants not found on windows.
2014-01-17 19:26:16 +00:00
Christopher Ferris
47fa90641e
am 0cf5d96c: am 237fdb4a: am eb8d73b6: Merge "Rewrite libbacktrace to be all C++."
...
* commit '0cf5d96c43a11e150941202961bcedcbce9bb294':
Rewrite libbacktrace to be all C++.
2014-01-17 19:26:16 +00:00
Christopher Ferris
6ecdff5bae
am f7adcfc8: am 17b9c827: Merge "Add PROT_* constants not found on windows."
...
* commit 'f7adcfc8bdd855e424b9970da444843920d8dde5':
Add PROT_* constants not found on windows.
2014-01-17 19:22:59 +00:00
Christopher Ferris
0cf5d96c43
am 237fdb4a: am eb8d73b6: Merge "Rewrite libbacktrace to be all C++."
...
* commit '237fdb4a95aeb94ad040a737c6fa22d84d05d633':
Rewrite libbacktrace to be all C++.
2014-01-17 19:22:58 +00:00
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
b1091958bd
am 320f2940: am e20b5f71: am 524b3a0c: Merge "Remove obsolete \'setconsole\' command."
...
* commit '320f2940239c405889baa3c5184beb1d8971837d':
Remove obsolete 'setconsole' command.
2014-01-17 00:06:11 +00:00
Elliott Hughes
320f294023
am e20b5f71: am 524b3a0c: Merge "Remove obsolete \'setconsole\' command."
...
* commit 'e20b5f71c01d912a5ce6aa4140e6e35edae8f4df':
Remove obsolete 'setconsole' command.
2014-01-17 00:03:26 +00: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
ec9e5891ac
am 8940c0a0: am 97373bbc: am 7cd15614: Merge "system/core 64-bit cleanup."
...
* commit '8940c0a07f8d6682712e2d2ee387e78096602f99':
system/core 64-bit cleanup.
2014-01-16 22:11:49 +00:00
Elliott Hughes
8940c0a07f
am 97373bbc: am 7cd15614: Merge "system/core 64-bit cleanup."
...
* commit '97373bbc713c52c43e0fa48d0f16466e0a450178':
system/core 64-bit cleanup.
2014-01-16 22:07:32 +00: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
325a99fb63
am bdea585e: am a6b65eee: am 7580661d: Merge "fs_mgr: increase verboseness on mount errors"
...
* commit 'bdea585e68a054552a26272ec9321afaad9ac915':
fs_mgr: increase verboseness on mount errors
2014-01-16 19:23:05 +00:00
Nick Kralevich
bdea585e68
am a6b65eee: am 7580661d: Merge "fs_mgr: increase verboseness on mount errors"
...
* commit 'a6b65eeef1280bbd38172d0b36b3493888e94b4b':
fs_mgr: increase verboseness on mount errors
2014-01-16 19:21:08 +00: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
11190d0ccb
am 4552987e: am c93904b4: am e847f429: Merge "restorecon /data/misc/media."
...
* commit '4552987e6a1338dac26f13f0851657335d998ffb':
restorecon /data/misc/media.
2014-01-15 20:19:31 +00:00
Nick Kralevich
4552987e6a
am c93904b4: am e847f429: Merge "restorecon /data/misc/media."
...
* commit 'c93904b445830cd17fd9dd6d4fe236987577a478':
restorecon /data/misc/media.
2014-01-15 20:15:56 +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
7a2c2e8048
am aa25204f: am 93557002: am 37fd839f: Merge "Revert "fs_mgr: correct warning on unused function parameter""
...
* commit 'aa25204f43421fe363238176d74e68eb8cdb5b01':
Revert "fs_mgr: correct warning on unused function parameter"
2014-01-15 06:32:54 +00:00
Nick Kralevich
aa25204f43
am 93557002: am 37fd839f: Merge "Revert "fs_mgr: correct warning on unused function parameter""
...
* commit '93557002e17dbda49650d198c11e78ff413c8ad4':
Revert "fs_mgr: correct warning on unused function parameter"
2014-01-15 06:29:49 +00: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
f607052884
am eca8ea82: am e220e9e0: am 7169b230: Merge "fs_mgr: correct warning on unused function parameter"
...
* commit 'eca8ea823b38661dce0aa0bd88b94a32381d779b':
fs_mgr: correct warning on unused function parameter
2014-01-15 06:06:54 +00:00
Nick Kralevich
eca8ea823b
am e220e9e0: am 7169b230: Merge "fs_mgr: correct warning on unused function parameter"
...
* commit 'e220e9e06d8a09fc1e18d19b758636dd14c13821':
fs_mgr: correct warning on unused function parameter
2014-01-15 06:04:59 +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
Nick Kralevich
42acb5314c
Merge "Remove obsolete vdc call." into klp-modular-dev
2014-01-15 03:18:57 +00:00
Elliott Hughes
7dee721eb3
am 42e82f80: am 4a8996fb: am 3352c503: Merge "Copy the bionic -fstack-protector hack into libbacktrace."
...
* commit '42e82f80fef7b1f13c9c3ab184cea065f4f4edbc':
Copy the bionic -fstack-protector hack into libbacktrace.
2014-01-15 00:57:41 +00:00
Elliott Hughes
42e82f80fe
am 4a8996fb: am 3352c503: Merge "Copy the bionic -fstack-protector hack into libbacktrace."
...
* commit '4a8996fb42d2114fee344b75acb23d5b0e9c548d':
Copy the bionic -fstack-protector hack into libbacktrace.
2014-01-15 00:55:00 +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
Nick Kralevich
225459a5da
Remove obsolete vdc call.
...
Since ca8e66a8b0
, init has
been handling reboots and filesystem unmounts. Remove obsolete
call to vdc.
Bug: 12504045
Change-Id: If8704ca042cb3a68857743b9973e48c52e7eb881
2014-01-14 16:38:45 -08:00
Elliott Hughes
b6e70fce53
am 57f22625: am ea8dcdcf: am 21ecc30c: Merge "Fix fastbootd build for 64-bit."
...
* commit '57f226256659eca3cf06233d74761ca9c37d51b2':
Fix fastbootd build for 64-bit.
2014-01-15 00:36:28 +00:00
Elliott Hughes
57f2262566
am ea8dcdcf: am 21ecc30c: Merge "Fix fastbootd build for 64-bit."
...
* commit 'ea8dcdcf64781ae83574bdad9e55cd78ea0e5d1d':
Fix fastbootd build for 64-bit.
2014-01-15 00:33:28 +00: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