Commit graph

13105 commits

Author SHA1 Message Date
Elliott Hughes
2e671e1c00 am c1e0bf0d: am 5aa097c8: Merge "Remove obsolete files from fs_config\'s list."
* commit 'c1e0bf0df36d1cd00104a0761d9fa251ebe4865c':
  Remove obsolete files from fs_config's list.
2015-03-18 18:11:49 +00:00
Elliott Hughes
c1e0bf0df3 am 5aa097c8: Merge "Remove obsolete files from fs_config\'s list."
* commit '5aa097c8a7b9326e1add7a23bf4d31febd25127b':
  Remove obsolete files from fs_config's list.
2015-03-18 18:05:12 +00:00
Elliott Hughes
5aa097c8a7 Merge "Remove obsolete files from fs_config's list." 2015-03-18 17:52:09 +00:00
Elliott Hughes
3c292007c1 Remove obsolete files from fs_config's list.
Change-Id: I83716f48754de889d811d74074f9a32dc666c05e
2015-03-18 10:47:20 -07:00
Elliott Hughes
07d457c06c am 169d029c: am 789c99a4: Merge "Switch init over to _PATH_DEFPATH."
* commit '169d029c763a7e652e6d22ae42bb23707675541b':
  Switch init over to _PATH_DEFPATH.
2015-03-18 17:15:06 +00:00
Elliott Hughes
169d029c76 am 789c99a4: Merge "Switch init over to _PATH_DEFPATH."
* commit '789c99a48e185a1e74af5fe9f837944bf4bf6b57':
  Switch init over to _PATH_DEFPATH.
2015-03-18 17:08:43 +00:00
Elliott Hughes
789c99a48e Merge "Switch init over to _PATH_DEFPATH." 2015-03-18 16:53:48 +00:00
Christopher Ferris
1b60da7d53 am bf8557c8: am 26746a46: Merge "Print the build id of shared libraries if present."
* commit 'bf8557c895a21ed35ea90851242571a7a3661278':
  Print the build id of shared libraries if present.
2015-03-18 16:24:22 +00:00
Christopher Ferris
bf8557c895 am 26746a46: Merge "Print the build id of shared libraries if present."
* commit '26746a4621e91dbadaaec945025e1f87b959333b':
  Print the build id of shared libraries if present.
2015-03-18 16:18:31 +00:00
Christopher Ferris
26746a4621 Merge "Print the build id of shared libraries if present." 2015-03-18 16:05:49 +00:00
Dan Albert
1f61103ee5 am 19aa5add: am 2df0aac6: Merge "Fix file descriptor leakage in adbd"
* commit '19aa5addcfea0efafca1562e5fef51f8d00195ad':
  Fix file descriptor leakage in adbd
2015-03-18 10:58:04 +00:00
Christopher Ferris
4f1bb82b8a am 38f125b8: am 837a6739: Merge "Add variable length read to Backtrace."
* commit '38f125b8c4da6ccc95f19edb3867dfa09841207d':
  Add variable length read to Backtrace.
2015-03-18 10:57:38 +00:00
Elliott Hughes
cc86fb2b29 Switch init over to _PATH_DEFPATH.
Bug: 19564110
Change-Id: I343b4a360b10319dca13ab01f2d411ff940e9052
2015-03-17 20:01:13 -07:00
Dan Albert
19aa5addcf am 2df0aac6: Merge "Fix file descriptor leakage in adbd"
* commit '2df0aac657e1287930ce1cf699328a0fe7deacb1':
  Fix file descriptor leakage in adbd
2015-03-17 23:59:59 +00:00
Dan Albert
2df0aac657 Merge "Fix file descriptor leakage in adbd" 2015-03-17 23:52:24 +00:00
Christopher Ferris
38f125b8c4 am 837a6739: Merge "Add variable length read to Backtrace."
* commit '837a67393d8493cccb28f20e2e00c5fc1e3b0272':
  Add variable length read to Backtrace.
2015-03-17 22:24:39 +00:00
Christopher Ferris
a21bd93ef5 Print the build id of shared libraries if present.
For every map that has a name, and if it's a mapped in shared library,
print the build id.

Refactor the way dump_all_maps logs data.

Refactor the way stack segments are dumped.

Bug: 19371018
Change-Id: Ic08d05a4b13f128925743936fb84d8059f7cb56f
2015-03-17 15:13:35 -07:00
Christopher Ferris
837a67393d Merge "Add variable length read to Backtrace." 2015-03-17 22:10:42 +00:00
Christopher Ferris
2b4a63fc6a Add variable length read to Backtrace.
Included tests for this new feature.

Changed the NULLs to nullptr in backtrace_test.

Changed UniquePtr to std::unique_ptr in backtrace_test.

Change-Id: I92375465b8f8ba84589834cc162db5915bf1be81
2015-03-17 14:56:02 -07:00
Pavel Labath
64d9adcea8 Fix file descriptor leakage in adbd
adb_auth_init in adb_auth_client.cpp sets FD_CLOEXEC on the control
socket, which prevents the leakage. However if ro.adb.secure
property is unset (as it is on the emulator), adb_auth_init is not
invoked, which results in the control socket fd leaking into any
process started by the deamon (specifically, any command executed
through adb shell).

Split the fd cleanup into a separate function that is called
unconditionally.

Change-Id: I73ea84977542ddfc4ac20599593ecf3745ae9108
2015-03-17 11:24:34 -07:00
Dan Albert
de75c1b153 am b451c265: am 928cbdd2: Merge "Add common string utilities to libbase."
* commit 'b451c2659ad5990d52eed8e3401645ccc8e3c1e5':
  Add common string utilities to libbase.
2015-03-17 18:08:05 +00:00
Elliott Hughes
27406cc02f am 8d70646a: am a650e17f: Merge "Remove netcfg."
* commit '8d70646aae48cf78eb42cad06ff59866cc2453c9':
  Remove netcfg.
2015-03-17 18:08:02 +00:00
Dan Albert
b451c2659a am 928cbdd2: Merge "Add common string utilities to libbase."
* commit '928cbdd2c34cd5db9b344e593866f9e1e1e477e2':
  Add common string utilities to libbase.
2015-03-17 17:56:33 +00:00
Dan Albert
928cbdd2c3 Merge "Add common string utilities to libbase." 2015-03-17 17:41:34 +00:00
Elliott Hughes
8d70646aae am a650e17f: Merge "Remove netcfg."
* commit 'a650e17f33ac6943b699565250563cdb8f2c210d':
  Remove netcfg.
2015-03-17 17:34:59 +00:00
Elliott Hughes
a650e17f33 Merge "Remove netcfg." 2015-03-17 17:21:04 +00:00
Greg Hackmann
17f00f5f5d am 98ee23ed: am 92564d6e: Merge "pixelflinger: don\'t build static library"
* commit '98ee23ed68f1dd13a26671d53c7e52365deaeb00':
  pixelflinger: don't build static library
2015-03-17 16:58:19 +00:00
Greg Hackmann
98ee23ed68 am 92564d6e: Merge "pixelflinger: don\'t build static library"
* commit '92564d6e58b7a1a18cb5d7bf22393dba6dfe4356':
  pixelflinger: don't build static library
2015-03-17 16:51:17 +00:00
Greg Hackmann
92564d6e58 Merge "pixelflinger: don't build static library" 2015-03-17 16:43:21 +00:00
Elliott Hughes
4c9386521e am 966884bd: am 221fe803: Merge "sdcard doesn\'t need to explicitly ask for libc!"
* commit '966884bde1ddd1566663215548d7d484fdd0e64c':
  sdcard doesn't need to explicitly ask for libc!
2015-03-17 14:47:44 +00:00
Elliott Hughes
b9b9345d7f am b63f75be: am 18b5264b: Merge "Revert "Revert "adb: support /oem partition"""
* commit 'b63f75be6dad1a973a1b74fee39b159a456c8010':
  Revert "Revert "adb: support /oem partition""
2015-03-17 14:47:42 +00:00
Elliott Hughes
966884bde1 am 221fe803: Merge "sdcard doesn\'t need to explicitly ask for libc!"
* commit '221fe8037f9f4461854c56f9e05b44ce74435889':
  sdcard doesn't need to explicitly ask for libc!
2015-03-17 14:41:25 +00:00
Elliott Hughes
b63f75be6d am 18b5264b: Merge "Revert "Revert "adb: support /oem partition"""
* commit '18b5264b9db5a53407446c3ef9e2c35c77830980':
  Revert "Revert "adb: support /oem partition""
2015-03-17 14:41:24 +00:00
Elliott Hughes
19db38c101 Remove netcfg.
Change-Id: Ia76fcb45ddd09fdc2ba1fb986c65dc954b478284
2015-03-16 20:36:41 -07:00
Elliott Hughes
221fe8037f Merge "sdcard doesn't need to explicitly ask for libc!" 2015-03-17 03:14:50 +00:00
Elliott Hughes
f184f54466 sdcard doesn't need to explicitly ask for libc!
Change-Id: I110063f39b02da979f97d29e9cb4f5b295de0311
2015-03-16 20:12:58 -07:00
Elliott Hughes
18b5264b9d Merge "Revert "Revert "adb: support /oem partition""" 2015-03-17 03:11:21 +00:00
Elliott Hughes
ec7a667131 Revert "Revert "adb: support /oem partition""
This reverts commit 6084a0124f.

The original build breakage is fixed by (a) building the verity
code for eng builds as well as userdebug builds and (b) moving
the exported remount service functions into a new header file.

Change-Id: Ice0c4f97d4db38ab7eb333c7a6e56bbd11123f5b
2015-03-16 20:05:21 -07:00
Dan Albert
0f1e54491c Add common string utilities to libbase.
These are useful outside of ART. Nothing changed (aside from fixing
Trim to not segfault on empty strings), so ART should be able to move
to using these.

Change-Id: Id026ebffe8d31f784a91834786ab189680b13a0f
2015-03-16 20:03:03 -07:00
Elliott Hughes
446e5067ee am fd611b69: am aa9eca29: Merge "Remove obsolete smd tool."
* commit 'fd611b6948a90e756ac3c572f675a3ec1f64f0cc':
  Remove obsolete smd tool.
2015-03-16 22:40:11 +00:00
Dan Albert
9f45b963c7 am 43fe78a7: am 53667c41: Merge "Revert "adb: support /oem partition""
* commit '43fe78a7c645bde410f495bfa34d598f2f48efee':
  Revert "adb: support /oem partition"
2015-03-16 22:40:01 +00:00
Elliott Hughes
fd611b6948 am aa9eca29: Merge "Remove obsolete smd tool."
* commit 'aa9eca2955cebf7d7e6b049750ed088329e615ed':
  Remove obsolete smd tool.
2015-03-16 22:11:10 +00:00
Dan Albert
0a7055fc1e am 468fafda: am cfa966e3: Merge "Revert "Revert "Add commonly used C++ macros to libbase."""
* commit '468fafda2b4542935e6f607a7f0e2d7c40c9eb2c':
  Revert "Revert "Add commonly used C++ macros to libbase.""
2015-03-16 22:06:04 +00:00
Dan Albert
5db36151bf Merge "resolved conflicts for merge of d485f974 to master" 2015-03-16 22:03:03 +00:00
Dan Albert
d851b65dec resolved conflicts for merge of d485f974 to master
Change-Id: I9d945014384e7192aa501c139e46702fc884a09b
2015-03-16 15:01:55 -07:00
Elliott Hughes
212afde3c4 am fe08676c: am e4681f22: Merge "adb: support /oem partition"
* commit 'fe08676cd3effdc6fdc644ee36b360f4c3f6f376':
  adb: support /oem partition
2015-03-16 21:58:42 +00:00
Elliott Hughes
aa9eca2955 Merge "Remove obsolete smd tool." 2015-03-16 21:56:45 +00:00
Dan Albert
43fe78a7c6 am 53667c41: Merge "Revert "adb: support /oem partition""
* commit '53667c41d8986a6f02eb53e488334ad62d73d26a':
  Revert "adb: support /oem partition"
2015-03-16 21:49:08 +00:00
Dan Albert
53667c41d8 Merge "Revert "adb: support /oem partition"" 2015-03-16 21:38:51 +00:00
Dan Albert
6084a0124f Revert "adb: support /oem partition"
This is broken on userdebug builds, and it isn't completely clear why. The declaration for make_block-device_writable in adb.h wasn't updated to match the definition (which uses a std::string instead of a char*). adb.h is currently extern "C", and it isn't clear why this is only broken for userdebug, so I'd like to revert while we investigate.

This reverts commit 81416fdb18.

Change-Id: I47f321574f9f21052e2c7332e8b0f6ef9ab98277
2015-03-16 21:35:53 +00:00