Commit graph

12234 commits

Author SHA1 Message Date
Mark Salyzyn
cd7ef90e62 am f0cc42f5: am 4730328d: Merge "logd: create private/android_logger.h"
* commit 'f0cc42f525c237431aa560ff42a3e8548bfbd3f4':
  logd: create private/android_logger.h
2015-01-24 16:57:48 +00:00
Chih-Hung Hsieh
70a613ffd7 am 8e65c371: am 2c7f05d8: Merge "Remove unused -ldl to link true statically."
* commit '8e65c3712fbacd7d2f7e58975a1a2f1fa290f1b5':
  Remove unused -ldl to link true statically.
2015-01-24 16:57:42 +00:00
Mark Salyzyn
f0cc42f525 am 4730328d: Merge "logd: create private/android_logger.h"
* commit '4730328da72ef9b7aeaefc120358155fdfd8dde8':
  logd: create private/android_logger.h
2015-01-23 23:59:43 +00:00
Zhijun He
7be3af0a7a Merge "camera: add external camera facing enum" 2015-01-23 23:57:59 +00:00
Chih-Hung Hsieh
8e65c3712f am 2c7f05d8: Merge "Remove unused -ldl to link true statically."
* commit '2c7f05d88c3d59eea5ce82a4762cf3c6477565c7':
  Remove unused -ldl to link true statically.
2015-01-23 23:33:13 +00:00
Mark Salyzyn
4730328da7 Merge "logd: create private/android_logger.h" 2015-01-23 23:32:23 +00:00
Mark Salyzyn
b5f6e45d6b logd: create private/android_logger.h
- create a structure to depict the private header
  expected at logd end of socket.
- utilize this new structure instead of unscalable
  byte stream technique used to unpack in logd.

Change-Id: I2d0e5c3531c279f2dc1fbd74807210ff8d804de0
2015-01-23 23:32:11 +00:00
Chih-Hung Hsieh
2c7f05d88c Merge "Remove unused -ldl to link true statically." 2015-01-23 23:20:58 +00:00
Chih-Hung Hsieh
87997bf8e7 Remove unused -ldl to link true statically.
LOCAL_FORCE_STATIC_EXECUTABLE=true failed with -ldl.

Change-Id: Id42031ba8e86279b5229ed11cd82e86a5f833ff9
2015-01-23 14:39:54 -08:00
Elliott Hughes
9f36a37c24 am 0944e305: am 4e0bdd10: Merge "fs_mgr: Support filesystem labels in fstab"
* commit '0944e305ff0a04fd1be8c1d5d157e68d11936802':
  fs_mgr: Support filesystem labels in fstab
2015-01-23 19:56:50 +00:00
David 'Digit' Turner
a80fc8399a am 320ead2a: am 1bc38a4c: Merge "adb: Fix \'adb forward --no-rebind\'."
* commit '320ead2ac37fbce69d84a39da28ce873b4a816d7':
  adb: Fix 'adb forward --no-rebind'.
2015-01-23 19:56:05 +00:00
Elliott Hughes
0944e305ff am 4e0bdd10: Merge "fs_mgr: Support filesystem labels in fstab"
* commit '4e0bdd1034ffcf55f4ebcbd547cf4aad59c05f03':
  fs_mgr: Support filesystem labels in fstab
2015-01-23 18:20:50 +00:00
Elliott Hughes
4e0bdd1034 Merge "fs_mgr: Support filesystem labels in fstab" 2015-01-23 18:11:26 +00:00
Christoffer Dall
8298234847 fs_mgr: Support filesystem labels in fstab
When mounting fstab entries it is practical to be able to specify
for example LABEL=data instead of a specific block device.

This is particularly important for the new Android Emulator code base,
which uses virtio block devices for the various partitions
(system,data,cache), because there is no defined ordering between the
way the filesystems are specified to the emulator and how they are
enumerated by the android kernel as /dev/vdX.

Change-Id: I7aef95f12e8f7b02ac2e33804ba7897fdcb9ad7f
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
2015-01-23 17:47:39 +00:00
David 'Digit' Turner
320ead2ac3 am 1bc38a4c: Merge "adb: Fix \'adb forward --no-rebind\'."
* commit '1bc38a4cdc74f477b99185125089f20411baf431':
  adb: Fix 'adb forward --no-rebind'.
2015-01-23 16:55:37 +00:00
David 'Digit' Turner
1bc38a4cdc Merge "adb: Fix 'adb forward --no-rebind'." 2015-01-23 16:45:46 +00:00
David 'Digit' Turner
f0e0c2e458 adb: Fix 'adb forward --no-rebind'.
Due to a typo, the --no-rebind option never worked (it always failed).
The root of the problem was that the client was sending on the wire
a command like:

  host:forward:norebind::tcp:<port>;tcp:<port>
                       ^^
Instead of:

  host:forward:norebind:tcp:<port>;tcp:<port>
                       ^

Note the erroneous double-column.

The fix is local to the adb client and thus doesn't require a new
version of the server or guest adbd on the device-side.

This also fixes 'adb reverse --no-rebind'.

See https://code.google.com/p/chromium/issues/detail?id=451109

Change-Id: I680fd432b5470072f6a9968ca32a7f90c600ac68
2015-01-23 10:02:58 +01:00
Elliott Hughes
f0ff493d4b am 1fdd4dc0: am 4083ed7d: Merge "Revert "fs_mgr: Support filesystem labels in fstab""
* commit '1fdd4dc0bc44af0dbbd458b44a84db9e775ebe7d':
  Revert "fs_mgr: Support filesystem labels in fstab"
2015-01-23 03:11:23 +00:00
JP Abgrall
2e4bcade9b am 253b9cfb: am f9e23395: Merge "fs_mgr: Support filesystem labels in fstab"
* commit '253b9cfba53d3f45e908856d311e28de9e5c1017':
  fs_mgr: Support filesystem labels in fstab
2015-01-23 03:11:21 +00:00
Elliott Hughes
1fdd4dc0bc am 4083ed7d: Merge "Revert "fs_mgr: Support filesystem labels in fstab""
* commit '4083ed7dff6e1dd8e20bec04f9451061951394f5':
  Revert "fs_mgr: Support filesystem labels in fstab"
2015-01-23 00:50:46 +00:00
JP Abgrall
253b9cfba5 am f9e23395: Merge "fs_mgr: Support filesystem labels in fstab"
* commit 'f9e2339553f70aebdd170e96ab9332b28c3851b4':
  fs_mgr: Support filesystem labels in fstab
2015-01-23 00:50:36 +00:00
Elliott Hughes
4083ed7dff Merge "Revert "fs_mgr: Support filesystem labels in fstab"" 2015-01-23 00:34:08 +00:00
Elliott Hughes
572226c25c Revert "fs_mgr: Support filesystem labels in fstab"
This reverts commit 69407ccb02.

Change-Id: I537a3b4257b7bc2a69f1f4d62b4e18e91f2dc713
2015-01-23 00:33:43 +00:00
JP Abgrall
f9e2339553 Merge "fs_mgr: Support filesystem labels in fstab" 2015-01-22 23:59:05 +00:00
Zhijun He
46e0a589d5 camera: add external camera facing enum
This is to enable the external camera support.

Change-Id: Id8329e31ad0622bdc06c60e87e97c742a9719b3b
2015-01-22 13:43:09 -08:00
Mark Salyzyn
ed5a716817 am 6f355d2c: am 045be135: Merge "liblog: logcat color output corrupted on 32-bit"
* commit '6f355d2c8f661caa3ec6e814c5be7c3ec077de3e':
  liblog: logcat color output corrupted on 32-bit
2015-01-22 19:58:06 +00:00
Christopher Ferris
c02312c119 am bd3bbff6: am d426a4e7: Merge "Move 32 bit/64 bit check into debuggerd."
* commit 'bd3bbff6743432564325d4acf7ddecb7ad65f7bc':
  Move 32 bit/64 bit check into debuggerd.
2015-01-22 19:58:06 +00:00
Mark Salyzyn
6f355d2c8f am 045be135: Merge "liblog: logcat color output corrupted on 32-bit"
* commit '045be135de5acee7a2d0fd7e303dc15ded2d69fa':
  liblog: logcat color output corrupted on 32-bit
2015-01-22 19:08:27 +00:00
Mark Salyzyn
045be135de Merge "liblog: logcat color output corrupted on 32-bit" 2015-01-22 18:12:14 +00:00
Mark Salyzyn
e2428429e0 liblog: logcat color output corrupted on 32-bit
sizeof(suffixBuf), not sizeof(suffixLen)!

Change-Id: I6e085089237585bb8b406372639b644556747699
2015-01-22 10:00:04 -08:00
Christopher Ferris
bd3bbff674 am d426a4e7: Merge "Move 32 bit/64 bit check into debuggerd."
* commit 'd426a4e7b62c18124827868ddbf8987aa433451b':
  Move 32 bit/64 bit check into debuggerd.
2015-01-22 00:13:01 +00:00
Christopher Ferris
d426a4e7b6 Merge "Move 32 bit/64 bit check into debuggerd." 2015-01-21 18:39:49 +00:00
Christopher Ferris
9774df6134 Move 32 bit/64 bit check into debuggerd.
On 64 bit systems, calls to dump_backtrace_to_file or dump_tombstone
try and directly contact the correct debuggerd (32 bit vs 64 bit)
by reading the elf information for the executable.
Unfortunately, system_server makes a call to dump_backtrace_to_file
and it doesn't have permissions to read the executable data, so it
defaults to always contacting the 64 bit debuggerd.
This CL changes the code so that all dump requests go to the 64 bit
debuggerd, which reads the elf information and redirects requests for
32 bit processes to the 32 bit debuggerd.

Testing:

- Forced the watchdog code in system_server to dump stacks and
  verified that all native stacks are dumped correctly.
- Verified that dumpstate and bugreport still properly dump the native
  processes on a 64 bit and 32 bit system.
- Intentionally forced the 64 bit to 32 bit redirect to write only a
  byte at a time and verified there are no errors, and no dropped data.
- Used debuggerd and debuggerd64 to dump 32 bit and 64 bit processes
  seemlessly.
- Used debuggerd on a 32 bit system to dump native stacks.

Bug: https://code.google.com/p/android/issues/detail?id=97024
Change-Id: Ie01945153bdc1c4ded696c7334b61d58575314d1
2015-01-20 17:22:07 -08:00
Christoffer Dall
69407ccb02 fs_mgr: Support filesystem labels in fstab
When mounting fstab entries it is practical to be able to specify
for example LABEL=data instead of a specific block device.

This is particularly important for the new Android Emulator code base,
which uses virtio block devices for the various partitions
(system,data,cache), because there is no defined ordering between the
way the filesystems are specified to the emulator and how they are
enumerated by the android kernel as /dev/vdX.

Change-Id: I12c3db0ba6a515dc8e917e0349afd257888d3aef
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
2015-01-17 21:05:39 +01:00
Elliott Hughes
42470ffd61 am f8eac2ff: am ce34551c: Merge "Lose id to toybox."
* commit 'f8eac2ffc62cb83cc3160f4e0425455e6be01212':
  Lose id to toybox.
2015-01-17 03:56:15 +00:00
Elliott Hughes
f8eac2ffc6 am ce34551c: Merge "Lose id to toybox."
* commit 'ce34551ce6559fe97043a26e3df65396c91bdffc':
  Lose id to toybox.
2015-01-17 03:50:05 +00:00
Elliott Hughes
ce34551ce6 Merge "Lose id to toybox." 2015-01-17 03:38:31 +00:00
Elliott Hughes
1bf5054342 Lose id to toybox.
Change-Id: I0b92482d06055207e133112e74c58964c7ef0362
2015-01-16 19:24:26 -08:00
Elliott Hughes
08d10a789b am bb604524: am 45c4c06f: Merge "Remove unused cruft from libcutils."
* commit 'bb604524fb6d72e7ab9d32c705156561e8c7d251':
  Remove unused cruft from libcutils.
2015-01-16 16:08:43 +00:00
Elliott Hughes
bb604524fb am 45c4c06f: Merge "Remove unused cruft from libcutils."
* commit '45c4c06ffe6f38e0f77f37f488e07f2537eddd45':
  Remove unused cruft from libcutils.
2015-01-16 16:02:24 +00:00
Elliott Hughes
45c4c06ffe Merge "Remove unused cruft from libcutils." 2015-01-16 15:52:17 +00:00
Jeff Sharkey
cde47235b3 am 7c42c7f8: am 9f72ef89: Merge "Extend to receive NFLOG packets."
* commit '7c42c7f84f2ff9997a5990986e6f450d7e07496a':
  Extend to receive NFLOG packets.
2015-01-16 06:14:32 +00:00
Jeff Sharkey
7c42c7f84f am 9f72ef89: Merge "Extend to receive NFLOG packets."
* commit '9f72ef8944a93bd333c6c7f87c7f7d79207ae663':
  Extend to receive NFLOG packets.
2015-01-16 06:07:29 +00:00
Elliott Hughes
f21717cd87 Remove unused cruft from libcutils.
Change-Id: I316d39e8e0a9aa385d8e1f37678b8bf2c03441eb
2015-01-15 21:16:03 -08:00
Jeff Sharkey
9f72ef8944 Merge "Extend to receive NFLOG packets." 2015-01-16 01:11:02 +00:00
Elliott Hughes
67204dda4f am f5a6c6bb: am 17e2f436: Merge "Lose cmp to toybox."
* commit 'f5a6c6bbb5e83824161356106876baeb80d8a986':
  Lose cmp to toybox.
2015-01-16 00:06:38 +00:00
Christopher Ferris
5962935e16 am f4f4d109: am 791a6905: Merge "Add timed versions of stack dumping functions."
* commit 'f4f4d10950a016283a160718a6ba4b19bfbf27e4':
  Add timed versions of stack dumping functions.
2015-01-16 00:06:37 +00:00
Elliott Hughes
897f8f8afa am d5c46b63: am 3d7951d4: Merge "Lose chown to toybox."
* commit 'd5c46b63700a9f4aae77bc1902799a6d7d82b430':
  Lose chown to toybox.
2015-01-16 00:05:56 +00:00
Dmitry Shmidt
42e3cdc2b3 am 2901b30a: am 70f6dea9: Merge "android_filesystem: Remove setuid bits from tcpdump" into lmp-mr1-dev
* commit '2901b30a58a6a7f708bb3e5df8b483cf8035c740':
  android_filesystem: Remove setuid bits from tcpdump
2015-01-16 00:05:14 +00:00
Elliott Hughes
f5a6c6bbb5 am 17e2f436: Merge "Lose cmp to toybox."
* commit '17e2f436f0da70673498482921a642c8917677aa':
  Lose cmp to toybox.
2015-01-15 23:55:45 +00:00