OSDN Git Service
Chih-Wei Huang [Wed, 16 Oct 2019 09:44:27 +0000 (17:44 +0800)]
Merge tag 'android-7.1.2_r39' into nougat-x86
Android 7.1.2 Release 39 (
5787804)
Jeff Sharkey [Fri, 1 Jun 2018 16:49:40 +0000 (10:49 -0600)]
Ignore quotes in safe_print().
If the value being printed has embedded quotes ("), then printing
those quotes could confuse other tools when parsing the value.
This is the simplest CL to fix the security issue, and we can circle
back to think about more robust escaping in a future CL.
Bug:
80436257
Test: manual
Change-Id: Ica17f2c5701573bceafe34f20110d230a3925483
(cherry picked from commit
efe90c297a8df591c051fdbfacb92b5283390bba)
Chih-Wei Huang [Thu, 26 Apr 2018 08:18:33 +0000 (16:18 +0800)]
Add e2label
The tune2fs provides e2label function. Enable it by a symlink.
Brandon McAnsh [Thu, 25 Aug 2016 17:17:50 +0000 (13:17 -0400)]
e2fsprogs: Fix mke2fs and tune2fs compilation
Change-Id: I7371b74e7c4ebacbccedac6576786ecd06194215
Signed-off-by: Brandon McAnsh <brandon.mcansh@gmail.com>
Steve Kondik [Tue, 10 Nov 2015 13:16:20 +0000 (14:16 +0100)]
e2fsprogs: Rework build configuration
Change-Id: I8d6137a9c22b165e79e19ab3997cabf182bba363
Steve Kondik [Fri, 16 Oct 2015 13:35:23 +0000 (06:35 -0700)]
e2fsprogs: Disable relocation packing for static binaries
Change-Id: I85b35222c825e5d6cb72ac543c49c78e99ad64b7
Steve Kondik [Sat, 6 Jul 2013 10:07:31 +0000 (03:07 -0700)]
blkid: Add support for probing exFAT
* e2fsprogs can't currently detect exFAT filesystems.
* Apply patch from GoogleTV to add support.
Change-Id: Ib08bdb1d13e995d133a62539e3bfa0e3a22eeead
Austen Dicken [Wed, 23 Nov 2011 07:03:46 +0000 (01:03 -0600)]
build static e2fsprogs
change makefies to build static mke2fs and tune2fs and place them in
$(PRODUCT_OUT)/utilities
Change-Id: I0139b3dcfe64a4031db7719ddd71120d174d1990
static e2fsck, tune2fs, and mke2fs for recovery
Change-Id: I8725cc296be8967265261e92da743c149e9ec45b
resize: allow static build
Change-Id: Id5dabaf87de775bb7461f83a9e7ae9ca754a1635
e2fsprogs: Clean up makefiles
* Remove duplicate modules
Change-Id: If68c5685a76943bc6bfdcb630c15c2f9ac59effd
Alex Deymo [Fri, 11 Dec 2015 17:28:20 +0000 (09:28 -0800)]
Merge "Replace _host suffix with more standard -host suffix." am:
f020dde748
am:
dc0f76dbd1
* commit '
dc0f76dbd13f758ee7065ec1b7dbc7e6732de9be':
Replace _host suffix with more standard -host suffix.
Alex Deymo [Thu, 10 Dec 2015 02:15:25 +0000 (18:15 -0800)]
Replace _host suffix with more standard -host suffix.
Most libraries use the "-host" suffix when building for the host. This
patch renames all the libraries to use -host instead of _host.
Bug:
24619596
TEST=make dist
(cherry picked from commit
138ce082579ac8b93befa1bc5a2ea12fa6da6b1e)
Change-Id: I399a661246422e8387f65f0ab47f1185975ea400
Alex Deymo [Thu, 10 Dec 2015 22:28:40 +0000 (14:28 -0800)]
Merge "Replace _host suffix with more standard -host suffix."
am:
f020dde748
* commit '
f020dde748812993692311aa91e3fe39141f56ee':
Replace _host suffix with more standard -host suffix.
Alex Deymo [Thu, 10 Dec 2015 22:18:33 +0000 (22:18 +0000)]
Merge "Replace _host suffix with more standard -host suffix."
Alex Deymo [Thu, 10 Dec 2015 02:15:25 +0000 (18:15 -0800)]
Replace _host suffix with more standard -host suffix.
Most libraries use the "-host" suffix when building for the host. This
patch renames all the libraries to use -host instead of _host.
Bug:
24619596
TEST=make dist
Change-Id: I761aa4165ebd3d23590daad6034a4b543ed279b2
Mohamad Ayyash [Tue, 8 Dec 2015 01:10:15 +0000 (01:10 +0000)]
Merge "e2fsck: update encryption support to match upstream"
Alex Deymo [Fri, 20 Nov 2015 00:15:46 +0000 (00:15 +0000)]
Merge changes from topic \'update_engine_deps\' into mnc-dr2-dev am:
b5368bf2b0
am:
9a4a69d59e
* commit '
9a4a69d59eac52e710e7f8d01af9b1b64684c04e':
Sync libext2fs sources in Android.mk with Makefile.in
libext2fs: Export the library include path.
package version metadata for external/
Wrap tune2fs.h to be C++ compatible.
Alex Deymo [Thu, 19 Nov 2015 23:00:59 +0000 (23:00 +0000)]
Merge changes from topic \'update_engine_deps\' into mnc-dr2-dev
am:
b5368bf2b0
* commit '
b5368bf2b0ac58a071356b27d4c2acc26aded8d8':
Sync libext2fs sources in Android.mk with Makefile.in
libext2fs: Export the library include path.
package version metadata for external/
Wrap tune2fs.h to be C++ compatible.
Tao Bao [Thu, 19 Nov 2015 22:01:54 +0000 (22:01 +0000)]
Wrap tune2fs.h to be C++ compatible. am:
c312f665be
am:
decdd4da7f
* commit '
decdd4da7fb8e9c43f03b451252c3fe0520caaf5':
Wrap tune2fs.h to be C++ compatible.
Tao Bao [Thu, 19 Nov 2015 21:54:40 +0000 (21:54 +0000)]
Wrap tune2fs.h to be C++ compatible.
am:
c312f665be
* commit '
c312f665be18021f944285bc8daaafa123db3488':
Wrap tune2fs.h to be C++ compatible.
Alex Deymo [Mon, 16 Nov 2015 23:57:40 +0000 (23:57 +0000)]
Merge changes from topic 'update_engine_deps' into mnc-dr2-dev
* changes:
Sync libext2fs sources in Android.mk with Makefile.in
libext2fs: Export the library include path.
package version metadata for external/
Wrap tune2fs.h to be C++ compatible.
Tao Bao [Tue, 14 Jul 2015 00:14:21 +0000 (17:14 -0700)]
Wrap tune2fs.h to be C++ compatible.
Change-Id: If189342477e4d5072ca4ed067090935f9ba2971c
(cherry picked from commit
b0af72276f654c4d5f9bd0756802115a83437b82)
Alex Deymo [Wed, 9 Sep 2015 04:18:58 +0000 (21:18 -0700)]
Sync libext2fs sources in Android.mk with Makefile.in
The Makefile.in lists all the objects included in the libext2fs library
by default and includes some additional objects based on the configure
time flags. This patch syncs the list of source files in Android.mk
with the list of object files in Makefile.in with the addition of
dumpfs.c (included when configured with --enable-resizer) and leaving
out crc32c.c since it relies on generated tables that depend on the
endianness of the target.
Bug:
23084776
Change-Id: Ie228900250f1a4965d622c5f85fd86afb8360585
Test: mmma external/e2fsprogs; mmma system/update_engine
(cherry picked from commit
62296a90db05af4abab0031b60287bafcb1db0ff)
Alex Deymo [Thu, 3 Sep 2015 02:07:46 +0000 (19:07 -0700)]
libext2fs: Export the library include path.
When adding 'libext2fs' as a library dependency from any other binary,
the binary needs to find the library headers. Users of this library
should not hard-code the include path themselves. This patch exports the
library headers on all three version of the libext2fs library and
removes the redundant include path from executables in e2fsprogs.
Bug: b/
23084776
TEST=mma
Change-Id: Idfbfcd2b671a9cddd08c322bc916a5efcc3cffe1
(cherry picked from commit
941ca9e47429b8e0ee86b7b72ca0a107ddc09d22)
Damien Miller [Wed, 3 Jun 2015 04:03:49 +0000 (21:03 -0700)]
package version metadata for external/
This will be used for automated notification of external vulnerability
reports.
Change-Id: Ia0fd8cf39ffc69072c5503cf8bedde4d9c413f64
(cherry picked from commit
ecb2a1e0c5b6cc6d8c974f3fc1629bf68b3a9693)
Tao Bao [Tue, 14 Jul 2015 00:14:21 +0000 (17:14 -0700)]
Wrap tune2fs.h to be C++ compatible.
(cherry picked from commit
b0af72276f654c4d5f9bd0756802115a83437b82)
Change-Id: I42c72c04e95b82530ec889f956980034a0b52953
Theodore Ts'o [Mon, 26 Oct 2015 02:19:04 +0000 (22:19 -0400)]
e2fsck: update encryption support to match upstream
Update the android branch's e2fsck encryption support to fix corrupted
encrypted directories and to support the encryption file system feature
being set in the superblock.
Change-Id: I61949ee58df938c018e9ebc278593ce9332f6f50
Signed-off-by: "Theodore Ts'o" <tytso@google.com>
Bill Yi [Sun, 11 Oct 2015 11:06:31 +0000 (11:06 +0000)]
am
f62f1898: am
a636e882: am
e9e81278: Merge "e2fsprogs: export uuid/uuid.h"
* commit '
f62f189890200bf605a303350b3b3204837e19a6':
e2fsprogs: export uuid/uuid.h
Mark Salyzyn [Fri, 18 Sep 2015 19:46:51 +0000 (12:46 -0700)]
e2fsprogs: export uuid/uuid.h
(cherry pick from commit
2284fabee1c592b89f87202ac6076e5b33703a1c)
Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug:
23181629
Bug:
24133481
Change-Id: I045323f3bc8970b061db23fb5a4acd219ffad977
Bill Yi [Fri, 18 Sep 2015 20:41:46 +0000 (20:41 +0000)]
am
a636e882: am
e9e81278: Merge "e2fsprogs: export uuid/uuid.h"
* commit '
a636e882b4572f5cf0d1bb68f04cddb213dbac18':
e2fsprogs: export uuid/uuid.h
Bill Yi [Fri, 18 Sep 2015 20:31:53 +0000 (20:31 +0000)]
am
e9e81278: Merge "e2fsprogs: export uuid/uuid.h"
* commit '
e9e8127834104866e25673768a9f278bfca1c5cc':
e2fsprogs: export uuid/uuid.h
Bill Yi [Fri, 18 Sep 2015 20:24:05 +0000 (20:24 +0000)]
Merge "e2fsprogs: export uuid/uuid.h"
Mark Salyzyn [Fri, 18 Sep 2015 19:46:51 +0000 (12:46 -0700)]
e2fsprogs: export uuid/uuid.h
Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug:
23181629
Bug:
24133481
Change-Id: I045323f3bc8970b061db23fb5a4acd219ffad977
Alex Deymo [Thu, 10 Sep 2015 21:01:35 +0000 (21:01 +0000)]
am
ee0f31db: am
eaa2aa7d: am
5dc7c070: Merge "Sync libext2fs sources in Android.mk with Makefile.in"
* commit '
ee0f31db10cf8da86f1d8a510e9d603f2f708fc5':
Sync libext2fs sources in Android.mk with Makefile.in
Alex Deymo [Thu, 10 Sep 2015 20:56:08 +0000 (20:56 +0000)]
am
eaa2aa7d: am
5dc7c070: Merge "Sync libext2fs sources in Android.mk with Makefile.in"
* commit '
eaa2aa7dc47e7b4554078756671b6fa6517b92f4':
Sync libext2fs sources in Android.mk with Makefile.in
Alex Deymo [Thu, 10 Sep 2015 20:27:36 +0000 (20:27 +0000)]
am
5dc7c070: Merge "Sync libext2fs sources in Android.mk with Makefile.in"
* commit '
5dc7c070f778b8ea5033d441dedf58abb5e3d444':
Sync libext2fs sources in Android.mk with Makefile.in
Alex Deymo [Thu, 10 Sep 2015 20:20:04 +0000 (20:20 +0000)]
Merge "Sync libext2fs sources in Android.mk with Makefile.in"
Alex Deymo [Wed, 9 Sep 2015 04:18:58 +0000 (21:18 -0700)]
Sync libext2fs sources in Android.mk with Makefile.in
The Makefile.in lists all the objects included in the libext2fs library
by default and includes some additional objects based on the configure
time flags. This patch syncs the list of source files in Android.mk
with the list of object files in Makefile.in with the addition of
dumpfs.c (included when configured with --enable-resizer) and leaving
out crc32c.c since it relies on generated tables that depend on the
endianness of the target.
Bug:
23084776
Change-Id: If2cce9749932eae6ec63a6ae5565255b00f9611d
Test: mmma external/e2fsprogs; mmma system/update_engine
Alex Deymo [Fri, 4 Sep 2015 14:28:58 +0000 (14:28 +0000)]
am
18923bdf: am
f803ed09: am
edd6f7f0: Merge "libext2fs: Export the library include path."
* commit '
18923bdfeb34170d6b0e256138a5e49bc727282f':
libext2fs: Export the library include path.
Alex Deymo [Fri, 4 Sep 2015 05:40:23 +0000 (05:40 +0000)]
am
f803ed09: am
edd6f7f0: Merge "libext2fs: Export the library include path."
* commit '
f803ed099b40b596ade9351ea61fbb9a1838f7e0':
libext2fs: Export the library include path.
Alex Deymo [Fri, 4 Sep 2015 05:31:41 +0000 (05:31 +0000)]
am
edd6f7f0: Merge "libext2fs: Export the library include path."
* commit '
edd6f7f06f05d972b52486a7bb1bec90a0f06d78':
libext2fs: Export the library include path.
Alex Deymo [Fri, 4 Sep 2015 05:23:39 +0000 (05:23 +0000)]
Merge "libext2fs: Export the library include path."
Alex Deymo [Thu, 3 Sep 2015 02:07:46 +0000 (19:07 -0700)]
libext2fs: Export the library include path.
When adding 'libext2fs' as a library dependency from any other binary,
the binary needs to find the library headers. Users of this library
should not hard-code the include path themselves. This patch exports the
library headers on all three version of the libext2fs library and
removes the redundant include path from executables in e2fsprogs.
Bug: b/
23084776
TEST=mma
Change-Id: I652a71fafed6705cfa3ab3c6c5a89082087ef055
Mohamad Ayyash [Thu, 27 Aug 2015 14:08:15 +0000 (14:08 +0000)]
am
19324304: am
d7da78a6: (-s ours) am
f65354a9: Merge "Add bare-bones encryption support to e2fsck"
* commit '
19324304f363a55ccdb962e7b95a4e8bb693968d':
Tao Bao [Thu, 27 Aug 2015 14:08:14 +0000 (14:08 +0000)]
am
88b0df1e: am
f589444e: (-s ours) am
5841da45: Merge "Wrap tune2fs.h to be C++ compatible."
* commit '
88b0df1efca70e9906a8f49c1074ccf319e11ff1':
Mohamad Ayyash [Thu, 27 Aug 2015 05:06:34 +0000 (05:06 +0000)]
am
d7da78a6: (-s ours) am
f65354a9: Merge "Add bare-bones encryption support to e2fsck"
* commit '
d7da78a6e99e85783d5965cd947e9cc7338e9e37':
Tao Bao [Thu, 27 Aug 2015 05:06:34 +0000 (05:06 +0000)]
am
f589444e: (-s ours) am
5841da45: Merge "Wrap tune2fs.h to be C++ compatible."
* commit '
f589444efd60b90e11a60a548c0dc1b3787bc4e1':
Bill Napier [Thu, 30 Jul 2015 19:27:45 +0000 (19:27 +0000)]
Merge "package version metadata for external/"
Theodore Ts'o [Sun, 19 Jul 2015 03:13:33 +0000 (03:13 +0000)]
am
b4f13eab: am
07a7be75: Add bare-bones encryption support to e2fsck
* commit '
b4f13eabf683df9d00bb5593b76f4585fda2247f':
Add bare-bones encryption support to e2fsck
Theodore Ts'o [Sun, 19 Jul 2015 03:01:05 +0000 (03:01 +0000)]
am
07a7be75: Add bare-bones encryption support to e2fsck
* commit '
07a7be75a7442ef6c6e84f12492382a4d8aeb735':
Add bare-bones encryption support to e2fsck
Theodore Ts'o [Wed, 15 Jul 2015 02:50:51 +0000 (22:50 -0400)]
Add bare-bones encryption support to e2fsck
Bug:
22483407
Change-Id: I4e9c4e4c855454c7458c85afba47b01eb0111b20
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Mohamad Ayyash [Thu, 16 Jul 2015 19:49:33 +0000 (19:49 +0000)]
am
ae2fb8b7: am
f65354a9: Merge "Add bare-bones encryption support to e2fsck"
* commit '
ae2fb8b71d5dcee8da6444cf6a430c6d4c57ec8a':
Add bare-bones encryption support to e2fsck
Mohamad Ayyash [Thu, 16 Jul 2015 19:36:10 +0000 (19:36 +0000)]
am
f65354a9: Merge "Add bare-bones encryption support to e2fsck"
* commit '
f65354a9736d5ac4ed2b2676715a9298f4b2eb1b':
Add bare-bones encryption support to e2fsck
Mohamad Ayyash [Thu, 16 Jul 2015 19:35:17 +0000 (19:35 +0000)]
am
f65354a9: Merge "Add bare-bones encryption support to e2fsck"
* commit '
f65354a9736d5ac4ed2b2676715a9298f4b2eb1b':
Add bare-bones encryption support to e2fsck
Mohamad Ayyash [Thu, 16 Jul 2015 19:07:04 +0000 (19:07 +0000)]
Merge "Add bare-bones encryption support to e2fsck"
Theodore Ts'o [Wed, 15 Jul 2015 02:50:51 +0000 (22:50 -0400)]
Add bare-bones encryption support to e2fsck
Bug:
22483407
Change-Id: I4e9c4e4c855454c7458c85afba47b01eb0111b20
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Tao Bao [Tue, 14 Jul 2015 22:52:26 +0000 (22:52 +0000)]
am
5841da45: Merge "Wrap tune2fs.h to be C++ compatible."
* commit '
5841da45b9274ff2934ebce99c59e87fea05cc21':
Wrap tune2fs.h to be C++ compatible.
Tao Bao [Tue, 14 Jul 2015 20:41:40 +0000 (20:41 +0000)]
am
6ed4b2e9: am
5841da45: Merge "Wrap tune2fs.h to be C++ compatible."
* commit '
6ed4b2e9266a1ce327d7d3f65242df1e25f6d675':
Wrap tune2fs.h to be C++ compatible.
Tao Bao [Tue, 14 Jul 2015 20:26:48 +0000 (20:26 +0000)]
am
5841da45: Merge "Wrap tune2fs.h to be C++ compatible."
* commit '
5841da45b9274ff2934ebce99c59e87fea05cc21':
Wrap tune2fs.h to be C++ compatible.
Tao Bao [Tue, 14 Jul 2015 00:14:21 +0000 (17:14 -0700)]
Wrap tune2fs.h to be C++ compatible.
Change-Id: I5d1bf4913ebe8f072ac8d31149ba97e876c8a595
(cherry picked from commit
b0af72276f654c4d5f9bd0756802115a83437b82)
Tao Bao [Tue, 14 Jul 2015 00:58:04 +0000 (00:58 +0000)]
Merge "Wrap tune2fs.h to be C++ compatible."
Tao Bao [Tue, 14 Jul 2015 00:14:21 +0000 (17:14 -0700)]
Wrap tune2fs.h to be C++ compatible.
Change-Id: I14dc12797f1aac89b3422a4fbfcecfa7ac9dee09
Damien Miller [Wed, 3 Jun 2015 04:03:49 +0000 (21:03 -0700)]
package version metadata for external/
This will be used for automated notification of external vulnerability
reports.
Change-Id: Id368c32685c92d11ff5666d0419622e3e4abd37a
Jeff Sharkey [Thu, 28 May 2015 22:34:45 +0000 (22:34 +0000)]
am
b2cc45fe: Add f2fs to blkid.
* commit '
b2cc45fe711dc42c8c0444584b2513ac59b3ad3b':
Add f2fs to blkid.
Jeff Sharkey [Sun, 24 May 2015 03:36:50 +0000 (20:36 -0700)]
Add f2fs to blkid.
We can now identify f2fs filesystems and extract the UUID.
Bug:
20275581
Change-Id: I55f7b8aa6647913bd45f02a8e9eea18ca3c53939
Colin Cross [Tue, 28 Apr 2015 22:39:10 +0000 (22:39 +0000)]
am
443a5631: Merge "Export include details from libuuid."
* commit '
443a5631f34b4ad4e4f47a0f260655e5a39be870':
Export include details from libuuid.
Colin Cross [Tue, 28 Apr 2015 22:13:47 +0000 (22:13 +0000)]
Merge "Export include details from libuuid."
Jeff Sharkey [Fri, 20 Feb 2015 22:45:03 +0000 (14:45 -0800)]
Export include details from libuuid.
(cherry-picked from
ce5b6554b9d44e081e7c1f80d430188c23d86835)
Change-Id: I682e38c9710dcd91b20b8cba3bb2e32b2dbc61c4
Jeff Sharkey [Fri, 20 Feb 2015 22:45:03 +0000 (14:45 -0800)]
Export include details from libuuid.
Change-Id: I682e38c9710dcd91b20b8cba3bb2e32b2dbc61c4
Ying Wang [Tue, 16 Dec 2014 23:17:02 +0000 (15:17 -0800)]
Cleanup Obsolete LOCAL_PRELINK_MODULE.
Bug:
18675947
Change-Id: I7d2db77f410d50bc6feed5f1a79c0bfef88c7cab
Ying Wang [Tue, 16 Dec 2014 21:50:08 +0000 (21:50 +0000)]
am
5faf22b5: am
a72d7e9d: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."
* commit '
5faf22b50d92805553d373da1a24b71c695df177':
Cleanup Obsolete LOCAL_PRELINK_MODULE.
Ying Wang [Tue, 16 Dec 2014 21:06:01 +0000 (21:06 +0000)]
am
a72d7e9d: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."
* commit '
a72d7e9db1144749931eeb42d1455285992dbadd':
Cleanup Obsolete LOCAL_PRELINK_MODULE.
Ying Wang [Tue, 16 Dec 2014 20:50:32 +0000 (20:50 +0000)]
Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."
Ying Wang [Tue, 16 Dec 2014 20:31:57 +0000 (12:31 -0800)]
Cleanup Obsolete LOCAL_PRELINK_MODULE.
Bug:
18675947
Change-Id: I3a39de092dad5f608dbcac3f495011775169a536
JP Abgrall [Mon, 24 Nov 2014 18:18:17 +0000 (18:18 +0000)]
am
e59f7c7c: am
d25948b9: tune2fs: Allow building it as a static lib
* commit '
e59f7c7cedb1e07eb4dbbb66e115c14faea19f19':
tune2fs: Allow building it as a static lib
JP Abgrall [Mon, 24 Nov 2014 18:06:32 +0000 (18:06 +0000)]
am
d25948b9: tune2fs: Allow building it as a static lib
* commit '
d25948b9b4a9e361ef071dc8175df0407f60b7e0':
tune2fs: Allow building it as a static lib
JP Abgrall [Fri, 21 Nov 2014 07:19:25 +0000 (23:19 -0800)]
tune2fs: Allow building it as a static lib
This allows getting all of tune2fs as a static library.
The entry point is
int tune2fs_main(int argc, char **argv).
It requires passing argv[0]="tune2fs" to get tune2fs behavior.
Bug:
18430740
Change-Id: I7bf8d96c53066a4da37778c0d67383b0b820e2ff
JP Abgrall [Fri, 21 Nov 2014 07:19:25 +0000 (23:19 -0800)]
tune2fs: Allow building it as a static lib
This allows getting all of tune2fs as a static library.
The entry point is
int tune2fs_main(int argc, char **argv).
It requires passing argv[0]="tune2fs" to get tune2fs behavior.
Bug:
18430740
Change-Id: I7bf8d96c53066a4da37778c0d67383b0b820e2ff
Yabin Cui [Tue, 18 Nov 2014 03:46:34 +0000 (03:46 +0000)]
am
2ca3c659: Merge "kill HAVE_TERMIO_H"
* commit '
2ca3c65991609bb5b48004ec3c7a66f6b417beed':
kill HAVE_TERMIO_H
Yabin Cui [Tue, 18 Nov 2014 03:40:15 +0000 (03:40 +0000)]
Merge "kill HAVE_TERMIO_H"
Yabin Cui [Tue, 18 Nov 2014 02:17:30 +0000 (18:17 -0800)]
kill HAVE_TERMIO_H
Bug:
18398307
Change-Id: I72bd78c845cc7d052ca1c3f44fe69f49de9c5c3e
Conley Owens [Sun, 26 Oct 2014 22:48:08 +0000 (22:48 +0000)]
am
9652dd65: am
e64b8318: Merge "Add MODULE_LICENSE and NOTICE files"
* commit '
9652dd6589d10675573c9a0acc90f6df5ac33397':
Conley Owens [Wed, 15 Oct 2014 23:34:22 +0000 (23:34 +0000)]
am
e64b8318: Merge "Add MODULE_LICENSE and NOTICE files"
* commit '
e64b83185148d359b9b6cc1310172a3c213a61fb':
Add MODULE_LICENSE and NOTICE files
Conley Owens [Wed, 15 Oct 2014 23:33:58 +0000 (23:33 +0000)]
am
e64b8318: Merge "Add MODULE_LICENSE and NOTICE files"
* commit '
e64b83185148d359b9b6cc1310172a3c213a61fb':
Add MODULE_LICENSE and NOTICE files
Conley Owens [Wed, 15 Oct 2014 23:20:28 +0000 (23:20 +0000)]
Merge "Add MODULE_LICENSE and NOTICE files"
Conley Owens [Fri, 10 Oct 2014 18:23:55 +0000 (11:23 -0700)]
Add MODULE_LICENSE and NOTICE files
Change-Id: I9208ca656b344cb46afc9cf832b4c30e42b947cf
JP Abgrall [Mon, 30 Jun 2014 21:13:49 +0000 (21:13 +0000)]
am
24c386ed: lib/uuid: make a static library also (fix build)
* commit '
24c386ed46cd767edc2fd0e5e2e2b8a4790d109d':
lib/uuid: make a static library also (fix build)
JP Abgrall [Thu, 12 Jun 2014 05:37:12 +0000 (22:37 -0700)]
lib/uuid: make a static library also (fix build)
Change-Id: Idb36204f2d8cadb9564db445d5301f705ce4d043
Signed-off-by: JP Abgrall <jpa@google.com>
(cherry picked from commit
a9e24fdeb275a2afc964f511583795052801ad65)
JP Abgrall [Wed, 25 Jun 2014 18:46:57 +0000 (18:46 +0000)]
am
721f3bc5: Merge "lib/uuid: make a static library also"
* commit '
721f3bc56989b5f4101e646a02d598ddb4a7ff6e':
lib/uuid: make a static library also
JP Abgrall [Wed, 25 Jun 2014 16:36:41 +0000 (16:36 +0000)]
Merge "lib/uuid: make a static library also"
JP Abgrall [Thu, 12 Jun 2014 05:37:12 +0000 (22:37 -0700)]
lib/uuid: make a static library also
Change-Id: Idb36204f2d8cadb9564db445d5301f705ce4d043
Signed-off-by: JP Abgrall <jpa@google.com>
JP Abgrall [Thu, 12 Jun 2014 05:37:12 +0000 (22:37 -0700)]
lib/uuid: make a static library also
Change-Id: Idb36204f2d8cadb9564db445d5301f705ce4d043
Signed-off-by: JP Abgrall <jpa@google.com>
The Android Automerger [Thu, 22 May 2014 14:21:49 +0000 (07:21 -0700)]
merge in master-release history after reset to
2079d768f79f636223d89b988a30209adf8dddbe
The Android Automerger [Thu, 22 May 2014 12:49:59 +0000 (05:49 -0700)]
merge in master-release history after reset to
2079d768f79f636223d89b988a30209adf8dddbe
The Android Automerger [Wed, 21 May 2014 12:49:50 +0000 (05:49 -0700)]
merge in master-release history after reset to
2079d768f79f636223d89b988a30209adf8dddbe
The Android Automerger [Tue, 20 May 2014 12:49:49 +0000 (05:49 -0700)]
merge in master-release history after reset to
2079d768f79f636223d89b988a30209adf8dddbe
The Android Automerger [Mon, 19 May 2014 12:49:37 +0000 (05:49 -0700)]
merge in master-release history after reset to
2079d768f79f636223d89b988a30209adf8dddbe
The Android Automerger [Sun, 18 May 2014 12:49:40 +0000 (05:49 -0700)]
merge in master-release history after reset to
2079d768f79f636223d89b988a30209adf8dddbe
The Android Automerger [Sat, 17 May 2014 12:50:20 +0000 (05:50 -0700)]
merge in master-release history after reset to
2079d768f79f636223d89b988a30209adf8dddbe
The Android Automerger [Thu, 15 May 2014 12:50:21 +0000 (05:50 -0700)]
merge in master-release history after reset to
2079d768f79f636223d89b988a30209adf8dddbe
The Android Automerger [Wed, 14 May 2014 12:50:13 +0000 (05:50 -0700)]
merge in master-release history after reset to
2079d768f79f636223d89b988a30209adf8dddbe
The Android Automerger [Tue, 13 May 2014 12:49:54 +0000 (05:49 -0700)]
merge in master-release history after reset to
2079d768f79f636223d89b988a30209adf8dddbe