Greg Hackmann
3f13e2fa3e
am 021efd1b: Merge "pixelflinger: make self-contained"
...
* commit '021efd1bd46fc6668c4321529025de128025d6de':
pixelflinger: make self-contained
2015-03-16 17:59:21 +00:00
Greg Hackmann
021efd1bd4
Merge "pixelflinger: make self-contained"
2015-03-16 17:46:31 +00:00
Narayan Kamath
c5cb001412
am b750efcc: Merge "Fix a wonkily named function."
...
* commit 'b750efcc302f2cb50abe1eb20dc92414636cb5d2':
Fix a wonkily named function.
2015-03-16 14:03:36 +00:00
Narayan Kamath
b750efcc30
Merge "Fix a wonkily named function."
2015-03-16 13:51:38 +00:00
Nicolas Geoffray
90a968f0e3
am dd581695: Merge "Revert "Create libbase.""
...
* commit 'dd5816953de6aebc51aa4cc6f69945fbb9cd4b2a':
Revert "Create libbase."
2015-03-16 11:19:49 +00:00
Nicolas Geoffray
601ea30c0b
am acf0a8b3: Merge "Revert "Add commonly used C++ macros to libbase.""
...
* commit 'acf0a8b3f632fe90132b9ce457a2237160f8cb9a':
Revert "Add commonly used C++ macros to libbase."
2015-03-16 11:19:48 +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
b14d61b36d
am 8f18daf1: Merge "Remove chdir from init."
...
* commit '8f18daf1296c94bb6dedacb91deccf65fe8eb63d':
Remove chdir from init.
2015-03-15 21:21:17 +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
33d848742e
am c353c912: Merge "Document mkdir behavioural change"
...
* commit 'c353c912a7ed29d53305412b1450136a25f922bd':
Document mkdir behavioural change
2015-03-15 17:10:01 +00:00
Elliott Hughes
c353c912a7
Merge "Document mkdir behavioural change"
2015-03-15 16:55:46 +00:00
Elliott Hughes
5e088596dc
am 285c2ae0: Merge "Document the mount option string in the readme.txt"
...
* commit '285c2ae04aaf77e6036d4bbf784e8395c6f07347':
Document the mount option string in the readme.txt
2015-03-15 16:52:40 +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
8ee047369e
am 4a0027fd: Merge "Add commonly used C++ macros to libbase."
...
* commit '4a0027fdf01672eb02cd33e82f3884232d2c5214':
Add commonly used C++ macros to libbase.
2015-03-15 15:40:40 +00:00
Dan Albert
517f65daef
am a68c8148: Merge "Create libbase."
...
* commit 'a68c814898b31b76ca2729a50fbc1a821bd0af70':
Create libbase.
2015-03-15 15:40:39 +00:00
Elliott Hughes
c8d5e2307b
am f1c2ba49: Merge "Remove unused header file."
...
* commit 'f1c2ba490ef979b3d347f08535ab8b817e917e62':
Remove unused header file.
2015-03-15 15:40:38 +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
24b1c2da7a
am 6fadf9e9: Merge "Remove obsolete setkey."
...
* commit '6fadf9e93913314f2aea3418539f998d47b40d13':
Remove obsolete setkey.
2015-03-14 02:35:22 +00: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
2f73d73640
am 821b8570: Merge "Switch liblog to sysv-only hash style"
...
* commit '821b8570c72adb73003cd3b8149ce9b034f44b9d':
Switch liblog to sysv-only hash style
2015-03-13 21:16:47 +00:00
Mark Salyzyn
e810c7296e
am 97c10907: Merge "logd: report reinit"
...
* commit '97c10907b5a034b8500aadcdf7f8829099b4b5f0':
logd: report reinit
2015-03-13 21:16:46 +00: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
8c09e148fa
am 0f6286d7: Merge "Remove getsebool/setsebool from init and toolbox."
...
* commit '0f6286d7052a2e7b3d82595b2d217b4df2dfb7f8':
Remove getsebool/setsebool from init and toolbox.
2015-03-13 18:16:47 +00: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
7f0564bab8
am 48f25fa9: Merge "adb doesn\'t actually use libzipfile."
...
* commit '48f25fa974b6ac620d62a54764294acb4aed10a3':
adb doesn't actually use libzipfile.
2015-03-13 17:03:32 +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
dc5f1db8e0
am 43b89c8e: Merge "Allocate buffers on the heap"
...
* commit '43b89c8e950479ac1164d95ddf478206e7f52568':
Allocate buffers on the heap
2015-03-12 22:59:04 +00: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
6025a2bc49
am bd518bce: Merge changes I3187aa34,Iadac58e6
...
* commit 'bd518bce07094ccc2e91df67e072de94ca7db442':
init.rc: logd --reinit on changes to persistent properties
logd: add reinit command
2015-03-12 21:39:11 +00:00
Mark Salyzyn
76d59f3d10
am 54c22e5b: Merge "logcat: test: logcat.logrotate fails"
...
* commit '54c22e5b0af8b8799a7c473c7a76e44ca018742c':
logcat: test: logcat.logrotate fails
2015-03-12 21:39:10 +00:00
Mark Salyzyn
77b87b5b86
am ecd993d7: Merge "logcat: fortify help on filterspec"
...
* commit 'ecd993d74fafd762dad69cee97b3d84ce5806074':
logcat: fortify help on filterspec
2015-03-12 21:39:08 +00:00
Mark Salyzyn
ccbadc6be0
logd: report reinit
...
Bug: 19681572
Change-Id: I343b9d108f064f87df79512a0fdf1b35513c3136
2015-03-12 20:38:53 +00:00