Commit graph

12229 commits

Author SHA1 Message Date
Sami Tolvanen
fcd14f13a1 am 9fabbbfb: Merge "Do not call libcutils property_set in init through libfs_mgr"
* commit '9fabbbfb03a877e13936b8829e4641cf1b9aebb7':
  Do not call libcutils property_set in init through libfs_mgr
2015-03-11 09:27:15 +00:00
Sami Tolvanen
9fabbbfb03 Merge "Do not call libcutils property_set in init through libfs_mgr" 2015-03-11 09:14:55 +00:00
Greg Hackmann
469c34e78f am 54352700: Merge "libadf: enable -Werror"
* commit '54352700c706294a404143b641a56462f671b762':
  libadf: enable -Werror
2015-03-11 03:19:23 +00:00
Greg Hackmann
399dcb7e9d am bf36cc57: Merge "libadf: tests: fix signed/unsigned comparison warnings"
* commit 'bf36cc57c32c9f0054803e8b2f8e03acd0a25a06':
  libadf: tests: fix signed/unsigned comparison warnings
2015-03-11 03:19:22 +00:00
Greg Hackmann
54352700c7 Merge "libadf: enable -Werror" 2015-03-11 00:00:34 +00:00
Greg Hackmann
bf36cc57c3 Merge "libadf: tests: fix signed/unsigned comparison warnings" 2015-03-10 23:59:45 +00:00
Greg Hackmann
e6b793c7b0 libadf: enable -Werror
Bug: 19606869

Change-Id: If2ea55732e71e8288641b6b34d229b367fd3fb3b
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2015-03-10 15:14:38 -07:00
Greg Hackmann
39b0c1c67d libadf: tests: fix signed/unsigned comparison warnings
Bug: 19606869

Change-Id: I29cfa363b6640cc13973c1023d2f4ea1a97e3af2
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2015-03-10 15:14:38 -07:00
Dimitry Ivanov
44ad0f9b1f am ddd97caf: am b27bd948: Merge "Generate gnu hash for arm only"
* commit 'ddd97cafb8d8383d341e609089013e7720f16f15':
  Generate gnu hash for arm only
2015-03-10 17:00:48 +00:00
Dimitry Ivanov
ddd97cafb8 am b27bd948: Merge "Generate gnu hash for arm only"
* commit 'b27bd94896dcfd94940e65a2438dc6a337c03038':
  Generate gnu hash for arm only
2015-03-10 16:56:42 +00:00
Dimitry Ivanov
b27bd94896 Merge "Generate gnu hash for arm only" 2015-03-10 16:51:37 +00:00
Goran Jakovljevic
3947d5da3f Generate gnu hash for arm only
Fixes mips build failure caused by:
https://android-review.googlesource.com/#/c/139580/

As previously discussed [1], MIPS does not support GNU-style ELF hashes.

[1] https://android-review.googlesource.com/#/c/49282/2/tests/Android.mk

Change-Id: I757fef1d47663da3e414f5771dfc580ea7aa3732
2015-03-10 09:47:23 -07:00
Elliott Hughes
6a8ed4b6c0 am d3e877f8: am ad571cdd: Merge "Add backtrace support for mips64."
* commit 'd3e877f81a28771b3e8ac338e5433e1bc1a1f678':
  Add backtrace support for mips64.
2015-03-10 15:12:22 +00:00
Elliott Hughes
dccf65ef02 am 1f909334: am ed5b81c9: Merge "Fix LP32 build."
* commit '1f909334507e6f4c0db20a71a4fceb0397c6ee7d':
  Fix LP32 build.
2015-03-10 15:12:21 +00:00
Elliott Hughes
264157d97e am 8576aa05: am 9cce837d: Merge "Increase output width for wchan and pc on 64 bit targets."
* commit '8576aa055ca9278d454ef5261032ecfd542badd4':
  Increase output width for wchan and pc on 64 bit targets.
2015-03-10 15:12:20 +00:00
Dmitriy Ivanov
682b646061 am 4c37448f: am 19833d24: Merge "Generate sysv hash for liblog"
* commit '4c37448f79ec0dba9634ef037a7217bd60799766':
  Generate sysv hash for liblog
2015-03-10 15:12:19 +00:00
Dan Albert
f741fc0037 am ee3e49cf: am ad5ed361: Merge "Fix build from -Werror=maybe-uninitialized."
* commit 'ee3e49cf733238625c11ff481b009413d8c30c6d':
  Fix build from -Werror=maybe-uninitialized.
2015-03-10 15:12:17 +00:00
Dan Albert
a4b8819e16 am 3f411357: am 5f2ccb0e: Merge "Move adb to C++."
* commit '3f4113571f89dc52b06314e8126ba5e252e9caaf':
  Move adb to C++.
2015-03-10 15:07:42 +00:00
Elliott Hughes
d3e877f81a am ad571cdd: Merge "Add backtrace support for mips64."
* commit 'ad571cdd2ce8c85f92ed87e021c94569b24fc7c1':
  Add backtrace support for mips64.
2015-03-10 15:03:41 +00:00
Elliott Hughes
1f90933450 am ed5b81c9: Merge "Fix LP32 build."
* commit 'ed5b81c9e59c0a6c618f43964a4a2639448c0686':
  Fix LP32 build.
2015-03-10 15:03:41 +00:00
Elliott Hughes
8576aa055c am 9cce837d: Merge "Increase output width for wchan and pc on 64 bit targets."
* commit '9cce837d025d05a07a3b91cf23337a7b688c3eb9':
  Increase output width for wchan and pc on 64 bit targets.
2015-03-10 15:03:40 +00:00
Dmitriy Ivanov
4c37448f79 am 19833d24: Merge "Generate sysv hash for liblog"
* commit '19833d24887164fdfa7313bda533283f47acd205':
  Generate sysv hash for liblog
2015-03-10 15:03:39 +00:00
Dan Albert
ee3e49cf73 am ad5ed361: Merge "Fix build from -Werror=maybe-uninitialized."
* commit 'ad5ed361a757494c0b308ec43cddc80ed9d8843f':
  Fix build from -Werror=maybe-uninitialized.
2015-03-10 15:03:38 +00:00
Elliott Hughes
ad571cdd2c Merge "Add backtrace support for mips64." 2015-03-10 04:26:33 +00:00
Elliott Hughes
ed5b81c9e5 Merge "Fix LP32 build." 2015-03-10 04:11:22 +00:00
Elliott Hughes
8ac94d3a54 Fix LP32 build.
Change-Id: I66e084330e7a32eac639d06187e780ffa0ad7b14
2015-03-09 21:10:10 -07:00
Elliott Hughes
9cce837d02 Merge "Increase output width for wchan and pc on 64 bit targets." 2015-03-10 03:33:53 +00:00
Chris Dearman
08b3466bc2 Increase output width for wchan and pc on 64 bit targets.
Also switch wchan to the textual form, since most of us
don't know kernel addresses off by heart.

Change-Id: I8e28d910034d8171c5b994189b16114f80f38d2f
2015-03-09 20:26:10 -07:00
Dmitriy Ivanov
19833d2488 Merge "Generate sysv hash for liblog" 2015-03-10 02:44:20 +00:00
Dan Albert
3f4113571f am 5f2ccb0e: Merge "Move adb to C++."
* commit '5f2ccb0efd1331f0137e294bed7a076c472f0ed6':
  Move adb to C++.
2015-03-10 02:10:00 +00:00
Douglas Leung
2ea9a32434 Add backtrace support for mips64.
Change-Id: I12ea2fcbe6780bb596f51988eae1ceafcec858df
2015-03-09 18:43:10 -07:00
Dan Albert
ad5ed361a7 Merge "Fix build from -Werror=maybe-uninitialized." 2015-03-10 01:32:00 +00:00
Dmitriy Ivanov
692c0e41e1 Generate sysv hash for liblog
Bug: 19059885
Change-Id: I6fff4372504e3ca0d870c5cafe6f19d412787923
2015-03-09 18:30:54 -07:00
Dan Albert
83ca56ac98 Fix build from -Werror=maybe-uninitialized.
This won't actually ever be uninitialized because the code will take a
failure path if the code that initializes it fails. The goto seems to
thwart this check though.

Not sure why this is only firing on userdebug builds yet. I'll look in
to it tomorrow.

Change-Id: Ie9d837d6baea255d2a4d169355b53dfd775eacce
2015-03-09 18:29:07 -07:00
Dan Albert
5f2ccb0efd Merge "Move adb to C++." 2015-03-10 00:58:06 +00:00
Dan Albert
bac3474a82 Move adb to C++.
I keep trying to clean things up and needing std::strings. Might as
well just do this now.

usb_linux_client.c is going to stay as C because GCC isn't smart
enough to deal with the designated initializers it uses (though for
some reason it is in C mode).

The Darwin files are staying as C because I don't have a way to test
that they build.

The Windows files are staying as C because while I can actually build
for them, it's slow and painful.

Change-Id: I75367d29205a9049d34460032b3bb36384f43941
2015-03-09 14:06:11 -07:00
Dan Albert
8414ce2ace am ea998e0e: am 9b1fd969: Merge "Fix a writex transcription error."
* commit 'ea998e0ef975dbea2034ae4a7208c36c37eedfa7':
  Fix a writex transcription error.
2015-03-09 20:42:42 +00:00
Dan Albert
ea998e0ef9 am 9b1fd969: Merge "Fix a writex transcription error."
* commit '9b1fd969a7b7f1c6f1ed19719f21d57001d3c461':
  Fix a writex transcription error.
2015-03-09 20:35:54 +00:00
Dan Albert
9b1fd969a7 Merge "Fix a writex transcription error." 2015-03-09 20:29:07 +00:00
Dan Albert
f3519a8747 Fix a writex transcription error.
Change-Id: I71b11127d41ebac6caf68926089c5a3b99d8c21e
2015-03-09 13:22:02 -07:00
Dan Albert
756cc39739 am 8b09c276: am 332c2881: Merge "Make the root/unroot test more robust."
* commit '8b09c2761523dfb05eb9c220f680cf2bef9c940e':
  Make the root/unroot test more robust.
2015-03-09 18:26:52 +00:00
Dan Albert
8b09c27615 am 332c2881: Merge "Make the root/unroot test more robust."
* commit '332c2881305549450b162d854b139611d7bdc42f':
  Make the root/unroot test more robust.
2015-03-09 18:20:44 +00:00
Dan Albert
332c288130 Merge "Make the root/unroot test more robust." 2015-03-09 18:15:05 +00:00
Mark Salyzyn
5dbffeda03 am 296bb2af: am c50f767e: Merge "logd: build cleanup"
* commit '296bb2afeccab13841a42cc5f3941d4528be383a':
  logd: build cleanup
2015-03-09 17:53:07 +00:00
Dan Albert
857d7db69d Make the root/unroot test more robust.
* Check the current adb user to choose the order of root/unroot.
* Re-root the device when finished.

Change-Id: I47a14b89e2c405bd63722e4d2043fcc629fb5e58
2015-03-09 10:45:50 -07:00
Mark Salyzyn
296bb2afec am c50f767e: Merge "logd: build cleanup"
* commit 'c50f767e7ea83fbf3d7dc8477292bccc413427dc':
  logd: build cleanup
2015-03-09 17:44:35 +00:00
Mark Salyzyn
c50f767e7e Merge "logd: build cleanup" 2015-03-09 17:20:08 +00:00
Mark Salyzyn
95b467888c logd: build cleanup
- Hard code the "auditd" event tag

Change-Id: I5f76fd286628be5c0ca819e8ed775648c0d2fa44
2015-03-09 10:02:51 -07:00
Elliott Hughes
b7b0eaff58 am 1d9f784f: am 0ffaa2b7: Merge "Fix __android_log_assert to abort."
* commit '1d9f784f35a330f0b43dcd31574000d5ae5b5bd7':
  Fix __android_log_assert to abort.
2015-03-09 15:27:42 +00:00
Elliott Hughes
1d9f784f35 am 0ffaa2b7: Merge "Fix __android_log_assert to abort."
* commit '0ffaa2b75acde02b0ea0e7985dd957c6bc3a2370':
  Fix __android_log_assert to abort.
2015-03-09 15:21:46 +00:00