Commit Graph

12209 Commits

Author SHA1 Message Date
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
Elliott Hughes aa9eca2955 Merge "Remove obsolete smd tool." 2015-03-16 21:56:45 +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
Dan Albert cfa966e3bf Merge "Revert "Revert "Add commonly used C++ macros to libbase.""" 2015-03-16 21:02:22 +00:00
Dan Albert 55f79138ee Merge "Revert "Revert "Create libbase.""" 2015-03-16 21:02:04 +00:00
Elliott Hughes 1b9cc5b2e1 Remove obsolete smd tool.
It's basically "echo" with a redirect, and it hasn't been touched since
cupcake. Could be replaced with a shell script if need be.

Change-Id: I75b663ea4be3d7cd9581faa6ef3979de28e68dfb
2015-03-16 13:47:14 -07:00
Elliott Hughes e4681f22fb Merge "adb: support /oem partition" 2015-03-16 20:39:48 +00:00
Greg Hackmann 41287f1727 Merge "Revert "pixelflinger: make self-contained"" 2015-03-16 19:02:46 +00:00
Paul Eastham cc255b4873 Revert "pixelflinger: make self-contained"
This reverts commit 56350fe387.

Change-Id: I4cda5773f39abd3b24df65d7bd9daaef92314b52
2015-03-16 19:01:38 +00:00
Mårten Kongstad 81416fdb18 adb: support /oem partition
Add support for /oem partition in commands 'adb remount' and 'adb sync'.

Change-Id: I5defc74ccaa37feaef74b9268e22b4075f98a59f
2015-03-16 11:17:13 -07:00
Greg Hackmann 021efd1bd4 Merge "pixelflinger: make self-contained" 2015-03-16 17:46:31 +00:00
Dan Albert 76d9cad62c Revert "Revert "Add commonly used C++ macros to libbase.""
This reverts commit 0722bae789.
2015-03-16 10:09:07 -07:00
Dan Albert c007bc3856 Revert "Revert "Create libbase.""
This reverts commit a7870d8816.
2015-03-16 10:08:46 -07:00
Narayan Kamath b750efcc30 Merge "Fix a wonkily named function." 2015-03-16 13:51:38 +00:00
Nicolas Geoffray dd5816953d Merge "Revert "Create libbase."" 2015-03-16 11:08:29 +00:00
Nicolas Geoffray a7870d8816 Revert "Create libbase."
Breaks internal master.

This reverts commit 98ff77204c.

Change-Id: I18dc6021cb43efff8aa88486c2d980dc2b8eedba
2015-03-16 11:07:29 +00:00
Nicolas Geoffray acf0a8b3f6 Merge "Revert "Add commonly used C++ macros to libbase."" 2015-03-16 11:07:11 +00:00
Nicolas Geoffray 0722bae789 Revert "Add commonly used C++ macros to libbase."
Breaks master build.

This reverts commit 7fbdaddfac.

Change-Id: I53d090f7dee8ed30fc49d908939153996cdb2298
2015-03-16 10:46:43 +00:00
Elliott Hughes 8f18daf129 Merge "Remove chdir from init." 2015-03-15 21:09:59 +00:00
Elliott Hughes 641d3e8ea0 Remove chdir from init.
Change-Id: Ib2880c6cb18db613deac04ee3b06b9719f5248b9
2015-03-15 10:52:20 -07:00
Elliott Hughes c353c912a7 Merge "Document mkdir behavioural change" 2015-03-15 16:55:46 +00:00
Johan Redestig 0b42ba24ac Document mkdir behavioural change
Since 27164dc mkdir will update mode, owner and group even
if the directory exists already

Change-Id: Ic37975d118a87afded5bfade775cb3d0d3b19892
2015-03-15 17:47:36 +01:00
Elliott Hughes 285c2ae04a Merge "Document the mount option string in the readme.txt" 2015-03-15 16:39:56 +00:00
Niklas Tibbling bc3f69f190 Document the mount option string in the readme.txt
also make a distinction between flag and option.

Change-Id: Ia872bc8dc98b3459f9c1e992d096c115699357af
2015-03-15 16:20:44 +00:00
Dan Albert 4a0027fdf0 Merge "Add commonly used C++ macros to libbase." 2015-03-14 23:58:04 +00:00
Dan Albert a68c814898 Merge "Create libbase." 2015-03-14 23:46:11 +00:00
Dan Albert 7fbdaddfac Add commonly used C++ macros to libbase.
Change-Id: I74f5dbfc4d99f7e78212a72540e538c1a737e224
2015-03-14 16:36:18 -07:00
Dan Albert 98ff77204c Create libbase.
Move StringPrintf and the string based file I/O from libutils to
libbase.

Change-Id: I0297a6063874b9d92100e0dd5123fddfbda932fe
2015-03-14 16:36:18 -07:00
Elliott Hughes f1c2ba490e Merge "Remove unused header file." 2015-03-14 17:44:47 +00:00
Elliott Hughes c2f0ed64ce Remove unused header file.
This library no longer exists.

Change-Id: I5582b41b70691171b1ac5f2bffd623f2b2fc10e5
2015-03-14 09:28:49 -07:00
Elliott Hughes 6fadf9e939 Merge "Remove obsolete setkey." 2015-03-14 02:26:10 +00:00
Elliott Hughes 5878aa92cd Remove obsolete setkey.
It's undocumented and unused.

Change-Id: I685dc900adbc14f2e8b4eeebb1e4d111782f141d
2015-03-13 15:37:54 -07:00
Dmitriy Ivanov 821b8570c7 Merge "Switch liblog to sysv-only hash style" 2015-03-13 21:06:01 +00:00
Mark Salyzyn 97c10907b5 Merge "logd: report reinit" 2015-03-13 21:02:17 +00:00
Dmitriy Ivanov 28a3b7cae0 Switch liblog to sysv-only hash style
Bug: 19059885
Change-Id: I5519a4e19716303692d4117bc24988f21d5a829e
2015-03-13 12:51:02 -07:00
Elliott Hughes 0f6286d705 Merge "Remove getsebool/setsebool from init and toolbox." 2015-03-13 17:52:11 +00:00
Stephen Smalley d4b2d8923f Remove getsebool/setsebool from init and toolbox.
These were leftovers from the SELinux boolean support that
was originally merged.  Since Android prohibits SELinux policy
booleans, we can just drop it.

Change-Id: I02f646a7d8db65e153702205b082b87a73f60d73
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2015-03-13 14:01:58 -04:00
Narayan Kamath b188cd76f8 Fix a wonkily named function.
I'm going to delete this shortly, but this name has confused
me in the past.

Change-Id: I5e5af7f9f61c3df273bada0808cf647daeaa4e62
2015-03-13 17:11:39 +00:00
Elliott Hughes 48f25fa974 Merge "adb doesn't actually use libzipfile." 2015-03-13 16:49:13 +00:00
Elliott Hughes 46270d233a adb doesn't actually use libzipfile.
Change-Id: Ia7d22214bc8422c88edaaf9bb716d7e12e0bb381
2015-03-13 09:40:45 -07:00
Dmitriy Ivanov 43b89c8e95 Merge "Allocate buffers on the heap" 2015-03-12 22:42:13 +00:00
Dmitriy Ivanov edbabfe9fe Allocate buffers on the heap
Change-Id: I96c8a50e8987e8ea77d0766ccf3c619f60377864
2015-03-12 14:47:52 -07:00
Mark Salyzyn ccbadc6be0 logd: report reinit
Bug: 19681572
Change-Id: I343b9d108f064f87df79512a0fdf1b35513c3136
2015-03-12 20:38:53 +00:00
Mark Salyzyn bd518bce07 Merge changes I3187aa34,Iadac58e6
* changes:
  init.rc: logd --reinit on changes to persistent properties
  logd: add reinit command
2015-03-12 20:34:01 +00:00
Mark Salyzyn 54c22e5b0a Merge "logcat: test: logcat.logrotate fails" 2015-03-12 20:15:17 +00:00
Mark Salyzyn 9c51243d8b logcat: test: logcat.logrotate fails
Test did not handle all possible multiples of block sizes.

Bug: 19604106
Change-Id: I693358be9598926389631baf21c5883e0f2fd735
2015-03-12 20:11:36 +00:00
Mark Salyzyn ecd993d74f Merge "logcat: fortify help on filterspec" 2015-03-12 20:10:18 +00:00
Greg Hackmann 56350fe387 pixelflinger: make self-contained
pixelflinger should not be used for new projects and should be moved out
of system/core at some point.  As the first step, move all its headers
under system/core/libpixelflinger/include and update its Android.mk
files so they're not referring to the absolute system/core path anymore.

Change-Id: I7acc3ef5b2e21d8ba6fe939ea8d3ec4c41959591
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2015-03-12 13:02:38 -07:00
Mark Salyzyn 48d06069a8 init.rc: logd --reinit on changes to persistent properties
Bug: 19681572
Change-Id: I3187aa348dae79fa5822ffb7ee9566919a7a04e6
2015-03-12 12:24:53 -07:00