OSDN Git Service
Chih-Wei Huang [Fri, 25 Jan 2019 09:22:43 +0000 (17:22 +0800)]
Android: avoid the second check_mntent_file()
It's usually used to check /etc/mtab but Android doesn't have the file.
The second check is unnecessary.
Chih-Wei Huang [Tue, 9 Oct 2018 09:56:31 +0000 (17:56 +0800)]
Merge tag 'android-8.1.0_r48' into oreo-x86
Android 8.1.0 release 48
Chih-Wei Huang [Mon, 10 Sep 2018 15:53:08 +0000 (23:53 +0800)]
Merge tag 'android-8.1.0_r46' into oreo-x86
Android 8.1.0 Release 46 (OPM6.171019.030.K1)
android-build-team Robot [Fri, 10 Aug 2018 20:33:07 +0000 (20:33 +0000)]
Merge cherrypicks of [
4741663,
4741664,
4741665,
4741666,
4743080,
4743081,
4743082,
4743083,
4741262,
4741263,
4741264,
4741265,
4741266,
4741667,
4743084,
4741242,
4741243,
4741741,
4741742,
4741743,
4741744,
4741822,
4743085,
4741668,
4741338,
4743055,
4743056,
4743070,
4743073,
4743075,
4743076,
4743078,
4743079,
4743161,
4743162,
4743164,
4743165,
4743167,
4743168,
4743169,
4743170,
4741681,
4741682,
4741683,
4741684,
4741685,
4741686,
4741687,
4741688,
4741689,
4741690,
4741691,
4741692,
4741693,
4741694,
4741695,
4741696,
4741697,
4741698,
4741699,
4743240,
4743241,
4743242,
4743243,
4741745,
4741823,
4741824,
4741825,
4741267,
4741268,
4743244,
4743280,
4743281,
4743224,
4743203,
4743204,
4743205,
4741746,
4741747,
4743245,
4741826,
4741827,
4741828,
4741829,
4741748,
4741749,
4741750,
4743233,
4743282,
4741244,
4741245,
4741246,
4741247,
4743206,
4743207,
4743208,
4743209,
4743210,
4743211,
4743212,
4743213,
4743214,
4743215,
4743216,
4743217,
4743218,
4743219,
4743360,
4743361,
4743362,
4743363,
4743364,
4743365,
4743366,
4743367,
4743368,
4743369,
4743370,
4743371,
4743372,
4743373,
4743374,
4743375,
4743376,
4743377,
4743283,
4743284,
4741830,
4742501,
4743246,
4743086,
4743087,
4743378,
4743379,
4741751] into sparse-
4749909-L04200000199131547
Change-Id: I77b8558b6721f516ae7042b60155ef2eca6ff3b5
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)
android-build-team Robot [Fri, 3 Aug 2018 19:21:42 +0000 (19:21 +0000)]
Merge cherrypicks of [
4691111,
4689862,
4690575,
4690576,
4690577,
4690578,
4689866,
4689868,
4689869,
4689870,
4691132,
4689456,
4689963,
4691133,
4691134,
4691156,
4691157,
4691159,
4691161,
4690581,
4689964,
4689460,
4691112,
4690582,
4690583,
4691165,
4691166,
4691167,
4691168,
4691169,
4691170,
4691211,
4691212,
4691213,
4691214,
4691215,
4691216,
4691217,
4691218,
4691219,
4691232,
4691233,
4691234,
4691235,
4691236,
4691237,
4691238,
4691239,
4691240,
4691241,
4691243,
4691245,
4691247,
4691249,
4691250,
4691291,
4691292,
4691293,
4691294,
4691295,
4691296,
4691255,
4689476,
4689477,
4689478,
4691223,
4691224,
4691136,
4689479,
4689480,
4691137,
4691225,
4691226,
4691227,
4691371,
4691228,
4691328,
4689967,
4691138,
4691139,
4691140,
4691433,
4689968,
4689969,
4691395,
4691230,
4691297,
4691298,
4691299,
4691300,
4691396,
4691397,
4691398,
4691399,
4691400,
4691401,
4691402,
4691403,
4691404,
4691405,
4691406,
4691407,
4691408,
4691409,
4691410,
4691471,
4691472,
4691473,
4691474,
4691475,
4691476,
4691477,
4691478,
4691479,
4691480,
4691481,
4691482,
4691483,
4691484,
4691485,
4691486,
4691487,
4691488,
4691143,
4691144,
4691511,
4691113,
4689482,
4691533,
4691145,
4691146,
4691147,
4691148,
4691536] into sparse-
4732991-L01200000196794104
Change-Id: I4b82052f3e30465076d19f671f5b89b2b9f6751c
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 [Fri, 25 May 2018 09:22:47 +0000 (17:22 +0800)]
Merge tag 'android-8.1.0_r29' into oreo-x86
Android 8.1.0 Release 29 (OPM4.171019.016.C1)
Chih-Wei Huang [Thu, 26 Apr 2018 08:27:37 +0000 (16:27 +0800)]
Add e2label
The tune2fs provides e2label function. Enable it by a symlink.
android-build-team Robot [Wed, 21 Mar 2018 21:29:41 +0000 (21:29 +0000)]
Snap for
4657601 from
0c52721929b2d9d610b20e1a2ad099688947c781 to oc-m4-release
Change-Id: I367cf9c0f7dbdd0be9e73a991afeb6d060f6b621
android-build-team Robot [Tue, 28 Nov 2017 23:28:33 +0000 (23:28 +0000)]
Snap for
4448085 from
cc14070d645fb56fe909989fb6c4c719ecc68a8f to oc-m3-release
Change-Id: I65ce8f57b92bea4d421fa16c622e1825ba683d48
android-build-team Robot [Fri, 29 Sep 2017 20:00:54 +0000 (20:00 +0000)]
release-request-
99856c15-b008-4977-9971-
f86523a23c0a-for-git_oc-m2-release-
4367109 snap-temp-L18300000107415568
Change-Id: I6d7977c4917b2ac88146e6bd8e8a9de4d8631ed1
android-build-team Robot [Thu, 28 Sep 2017 07:31:06 +0000 (07:31 +0000)]
release-request-
ca7a0f27-e01e-4493-95dc-
73b265f88cc9-for-git_oc-mr1-release-
4365318 snap-temp-L33600000106883904
Change-Id: Iac2f9e1faf3fb704287080a41ca250f9e4a01736
Jin Qian [Mon, 28 Aug 2017 21:44:14 +0000 (14:44 -0700)]
mke2fs, libext2fs: make filesystem image reproducible
Override fs->now with env E2FSPROGS_FAKE_TIME
Override hash seed with -E hash_seed=<uuid>
Bug:
64994964
Change-Id: If1af7e990b5bf2939a7d5f2a9986406e12c294e9
(cherry picked from commit
3164c7644fd096a1ed88cdbe888fca0702ef7415)
android-build-team Robot [Mon, 28 Aug 2017 07:35:40 +0000 (07:35 +0000)]
release-request-
c924aaac-f0a2-4215-8dc4-
e314f22460d9-for-git_oc-mr1-release-
4301796 snap-temp-L23200000097143969
Change-Id: I967f2b2d6de8a7bb102ce33e2d4c3d94eb9272d1
Pavlin Radoslavov [Wed, 23 Aug 2017 22:02:55 +0000 (15:02 -0700)]
Add missing libdl dependencies
Bug:
62815515
Test: lunch full-eng; make checkbuild
Merged-In: I1751669c4ed046c22587938e04eb76abe8553a8d
Change-Id: I1751669c4ed046c22587938e04eb76abe8553a8d
(cherry picked from commit
a24084ceb74c84b0943c86deb5cb99a63d3c46d7)
android-build-team Robot [Wed, 9 Aug 2017 07:30:58 +0000 (07:30 +0000)]
release-request-
9ff446ef-fe26-4f50-a0f0-
c1d38619140f-for-git_oc-mr1-release-
4257899 snap-temp-L58400000090817127
Change-Id: Ifbed94aa5b023c2124fc9e8e977603104cadf398
Theodore Ts'o [Sat, 15 Apr 2017 14:33:53 +0000 (10:33 -0400)]
e2fsck: fix ASAN error when using 128 byte inodes
Due to the inode table buffering, it's actually hard to overrun the
end of allocated memory, so the ASAN error doesn't trigger all the
time.
Google-Bug-Id:
37326362
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
(cherry picked from commit
e251f3585902919e809414a4bd17d6bfdbdaaad1)
Change-Id: I54667f781587aebd4ee94b4d09c56c6fb44b6513
android-build-team Robot [Tue, 8 Aug 2017 07:25:16 +0000 (07:25 +0000)]
release-request-
c8b8af6b-4899-402a-9ff7-
72255ba5300b-for-git_oc-mr1-release-
4253898 snap-temp-L09600000090287887
Change-Id: I36339cda481449dbe3c95a712612b804d0be2887
Yang Jin [Thu, 3 Aug 2017 23:46:48 +0000 (16:46 -0700)]
e2fsdroid: print used/total inode and block count
Bug:
64272984
Change-Id: Idc727e556a3fa7fb85ff0f845b9452c8c033c22d
(cherry picked from commit
131d29f6a826438aff0e5870fb3711358d2a0988)
android-build-team Robot [Wed, 2 Aug 2017 07:31:58 +0000 (07:31 +0000)]
release-request-
ceffd4a6-d719-491c-b078-
6ce33cda5fb8-for-git_oc-mr1-release-
4237114 snap-temp-L83200000088245566
Change-Id: I46983f200c2018748a59738dcf12d8bbaa494ef5
Jin Qian [Tue, 1 Aug 2017 22:54:10 +0000 (22:54 +0000)]
build mke2fs for windows using android mingw library
am:
9f3b79acf7
Change-Id: I734f7038367cad46d9b712a17055c79098a3f8e3
Jin Qian [Tue, 1 Aug 2017 22:54:09 +0000 (22:54 +0000)]
mke2fs, libext2fs: fix bugs on windows
am:
bc237175f9
Change-Id: I7f15f1895d105a7bd8fa061b540231a56cd6201b
Jin Qian [Tue, 1 Aug 2017 22:54:01 +0000 (22:54 +0000)]
build static version of mke2fs and e2fsdroid for host
am:
06bad82b60
Change-Id: I61e7a10eda490697f8cf21c9c6ae0c09ff76c38b
Jin Qian [Wed, 12 Jul 2017 22:18:33 +0000 (15:18 -0700)]
build mke2fs for windows using android mingw library
Bug:
23686092
Change-Id: I4c7b0c69e3e3c48321d3a0a964ad65c87fc32bbd
(cherry picked from commit
83da0276c3ff0a1c33f9042798b319542e254060)
Jin Qian [Mon, 24 Jul 2017 21:18:16 +0000 (14:18 -0700)]
mke2fs, libext2fs: fix bugs on windows
Added O_BINARY to open output files on windows, otherwise they're
written as text files and have invalid data.
Use '(filename):block_count:block_size' for sparse file name because
windows file name can contain ':', e.g. 'c:\output_file'.
Bug:
23686092
Change-Id: I731c13e5df0be8c831464c431b8949d33438fb24
(cherry picked from commit
0dcf8ec6a429ce4f024fe7838fee2d5636e8ba4d)
Jin Qian [Wed, 12 Jul 2017 20:29:38 +0000 (13:29 -0700)]
build static version of mke2fs and e2fsdroid for host
Statically link those two binaries for host build so that we can
package them with fastboot without including other library files.
Bug:
35219933
Change-Id: Ic4762ba5eda8ac61723a2c4137690d12a0aa57f2
(cherry picked from commit
42297fb01aa2a49ead938c1d24868941a39fd434)
(cherry picked from commit
2967b43fd18e5db50a93bb0a290141c66351427c)
android-build-team Robot [Wed, 19 Jul 2017 07:25:44 +0000 (07:25 +0000)]
release-request-
bd6aa7dd-7b02-4794-942c-
14599bf61208-for-git_oc-mr1-release-
4193791 snap-temp-L98700000083613807
Change-Id: I0d3bb62bd600d03ff2f7a6eeb22d07362d10977f
TreeHugger Robot [Tue, 18 Jul 2017 20:36:26 +0000 (20:36 +0000)]
Merge "build static version of mke2fs and e2fsdroid for host"
Jin Qian [Wed, 12 Jul 2017 20:29:38 +0000 (13:29 -0700)]
build static version of mke2fs and e2fsdroid for host
Statically link those two binaries for host build so that we can
package them with fastboot without including other library files.
Bug:
35219933
Change-Id: Ic4762ba5eda8ac61723a2c4137690d12a0aa57f2
android-build-team Robot [Tue, 11 Jul 2017 07:28:12 +0000 (07:28 +0000)]
release-request-
5ee66a34-3e58-4de0-ba73-
1f49074ee497-for-git_oc-mr1-release-
4169335 snap-temp-L20600000081126177
Change-Id: I004384f48e79b27ad86be04bf2bd30d909e6a8f9
Jeff Sharkey [Mon, 10 Jul 2017 19:55:58 +0000 (19:55 +0000)]
Merge "blkid: Resolve to the exFAT uuid change on reboot." am:
6eac3894a6 am:
68acc00e57 am:
4ef0afa563
am:
9abc85f05b
Change-Id: Iaf63db082453bebed08e364abe9c657bad7d4a41
Jeff Sharkey [Mon, 10 Jul 2017 19:51:58 +0000 (19:51 +0000)]
Merge "blkid: Resolve to the exFAT uuid change on reboot." am:
6eac3894a6 am:
68acc00e57
am:
4ef0afa563
Change-Id: Ibfaba811291cce3bed86a812d403cf1f598a1cf8
Jeff Sharkey [Mon, 10 Jul 2017 19:47:57 +0000 (19:47 +0000)]
Merge "blkid: Resolve to the exFAT uuid change on reboot." am:
6eac3894a6
am:
68acc00e57
Change-Id: Id7f4617e1695fc74f98da60d389adb747ab137d5
Jeff Sharkey [Mon, 10 Jul 2017 19:43:59 +0000 (19:43 +0000)]
Merge "blkid: Resolve to the exFAT uuid change on reboot."
am:
6eac3894a6
Change-Id: Ie0d9db21e79dad3ab6904b8934ea7facfeab3eff
Jeff Sharkey [Mon, 10 Jul 2017 19:34:11 +0000 (19:34 +0000)]
Merge "blkid: Resolve to the exFAT uuid change on reboot."
Android Build Merger (Role) [Thu, 6 Jul 2017 16:33:28 +0000 (16:33 +0000)]
Merge "Merge changes from topic 'am-
52eed220ada34c3aba959fcbb20dfeab' into oc-dr1-dev-plus-aosp am:
bedbcad1de -s ours"
Jin Qian [Thu, 6 Jul 2017 16:33:14 +0000 (16:33 +0000)]
Merge changes from topic 'am-
52eed220ada34c3aba959fcbb20dfeab' into oc-dr1-dev-plus-aosp
am:
bedbcad1de -s ours
Change-Id: Ia04208edf12ab5c6f6af09357d8be4545125fad5
Jin Qian [Thu, 6 Jul 2017 16:32:47 +0000 (16:32 +0000)]
Merge changes from topic 'am-
52eed220ada34c3aba959fcbb20dfeab' into oc-dr1-dev-plus-aosp
am:
bedbcad1de -s ours
Change-Id: I1c33bc2650c4122ea7b0cc963a5558257433c6aa
Android Build Merger (Role) [Thu, 6 Jul 2017 16:15:43 +0000 (16:15 +0000)]
Merge "e2fsdroid: use libselinux function to read file context on device am:
2fff6fb036 am:
58dd122671 -s ours"
Android Build Merger (Role) [Thu, 6 Jul 2017 16:15:38 +0000 (16:15 +0000)]
Merge changes from topic 'am-
02585df899244ddfb0b2ea27e62c017d'
* changes:
e2fsdroid: use libselinux function to read file context on device am:
2fff6fb036 am:
3ac608fd1b -s ours
Require mke2fs.conf when building mke2fs am:
778eaa84a0 am:
6243f2136f -s ours
Jin Qian [Thu, 6 Jul 2017 16:14:11 +0000 (16:14 +0000)]
e2fsdroid: use libselinux function to read file context on device am:
2fff6fb036
am:
58dd122671 -s ours
Change-Id: I859d0897f1fadd9e4357d2d7bb9a9e55f3746a89
Jin Qian [Thu, 6 Jul 2017 16:13:55 +0000 (16:13 +0000)]
e2fsdroid: use libselinux function to read file context on device am:
2fff6fb036
am:
3ac608fd1b -s ours
Change-Id: Ia3759f195c9c9df03dc86362327c078aadea6c28
Jin Qian [Thu, 6 Jul 2017 16:13:51 +0000 (16:13 +0000)]
Require mke2fs.conf when building mke2fs am:
778eaa84a0
am:
6243f2136f -s ours
Change-Id: I1a1d30259e12ef267d8a26c092aa4ead12bfe7b2
Jin Qian [Thu, 6 Jul 2017 16:12:04 +0000 (16:12 +0000)]
e2fsdroid: use libselinux function to read file context on device am:
2fff6fb036
am:
3ac608fd1b -s ours
Change-Id: Ia6535f6a8ba375bab3feea79342957e61503c677
Jin Qian [Thu, 6 Jul 2017 16:12:01 +0000 (16:12 +0000)]
Require mke2fs.conf when building mke2fs am:
778eaa84a0
am:
6243f2136f -s ours
Change-Id: I13166000fc980e1925c7f61bf9358128fbd1229d
Android Build Merger (Role) [Thu, 6 Jul 2017 16:07:54 +0000 (16:07 +0000)]
Merge changes from topic 'am-
52eed220ada34c3aba959fcbb20dfeab' into oc-dr1-dev-plus-aosp
* changes:
e2fsdroid: use libselinux function to read file context on device am:
2fff6fb036
Require mke2fs.conf when building mke2fs am:
778eaa84a0
Jin Qian [Thu, 6 Jul 2017 16:06:28 +0000 (16:06 +0000)]
e2fsdroid: use libselinux function to read file context on device
am:
2fff6fb036
Change-Id: I2a698ff8aa6ae1684b9634deb082bf7e1d32f490
Jin Qian [Thu, 6 Jul 2017 16:06:24 +0000 (16:06 +0000)]
Require mke2fs.conf when building mke2fs
am:
778eaa84a0
Change-Id: I945f211ccdf1bf111edab2717606c2379bd9c936
Jin Qian [Thu, 6 Jul 2017 16:06:07 +0000 (16:06 +0000)]
e2fsdroid: use libselinux function to read file context on device
am:
2fff6fb036
Change-Id: I2dd7351c28c20239e70796ce04eddf838587a08e
Jin Qian [Thu, 6 Jul 2017 16:06:02 +0000 (16:06 +0000)]
Require mke2fs.conf when building mke2fs
am:
778eaa84a0
Change-Id: I579087da2b2ce0f41ccb1581ade77b55cc23a039
Jin Qian [Wed, 5 Jul 2017 22:47:29 +0000 (22:47 +0000)]
Merge "build mke2fs and e2fsdroid as static executables for recovery mode am:
05a31e2c5d" into oc-dr1-dev-plus-aosp
am:
1d718f1426 -s ours
Change-Id: I5733477e77b216072c1d38bea82578da7ecadcec
Android Build Merger (Role) [Wed, 5 Jul 2017 22:46:57 +0000 (22:46 +0000)]
Merge "build mke2fs and e2fsdroid as static executables for recovery mode am:
05a31e2c5d am:
82f83c86fa -s ours"
Android Build Merger (Role) [Wed, 5 Jul 2017 22:46:51 +0000 (22:46 +0000)]
Merge "build mke2fs and e2fsdroid as static executables for recovery mode am:
05a31e2c5d am:
82f83c86fa -s ours"
Jin Qian [Wed, 5 Jul 2017 22:45:43 +0000 (22:45 +0000)]
build mke2fs and e2fsdroid as static executables for recovery mode am:
05a31e2c5d
am:
82f83c86fa -s ours
Change-Id: Iea72db3a67695ddb1b82b45c897e21190d974476
Jin Qian [Wed, 5 Jul 2017 22:45:37 +0000 (22:45 +0000)]
build mke2fs and e2fsdroid as static executables for recovery mode am:
05a31e2c5d
am:
82f83c86fa -s ours
Change-Id: I81e457f78d718523fd83bb37e87f99c3b39e6d0e
Android Build Merger (Role) [Wed, 5 Jul 2017 22:45:11 +0000 (22:45 +0000)]
Merge "build mke2fs and e2fsdroid as static executables for recovery mode am:
05a31e2c5d am:
6ba274bec2 -s ours"
Jin Qian [Wed, 5 Jul 2017 22:44:05 +0000 (22:44 +0000)]
build mke2fs and e2fsdroid as static executables for recovery mode am:
05a31e2c5d
am:
6ba274bec2 -s ours
Change-Id: I07609c788549125c39060f48c88738ccdddcecd6
Jin Qian [Wed, 5 Jul 2017 22:43:58 +0000 (22:43 +0000)]
build mke2fs and e2fsdroid as static executables for recovery mode am:
05a31e2c5d
am:
6ba274bec2 -s ours
Change-Id: I76200dfbff8b4a3d826636360ff22943298c2654
Android Build Merger (Role) [Wed, 5 Jul 2017 22:41:55 +0000 (22:41 +0000)]
Merge "build mke2fs and e2fsdroid as static executables for recovery mode am:
05a31e2c5d" into oc-dr1-dev-plus-aosp
Jin Qian [Wed, 5 Jul 2017 22:40:48 +0000 (22:40 +0000)]
build mke2fs and e2fsdroid as static executables for recovery mode
am:
05a31e2c5d
Change-Id: I25be6080b9d75f6205e69f14c87a98ab8bc11732
Jin Qian [Wed, 5 Jul 2017 22:40:29 +0000 (22:40 +0000)]
build mke2fs and e2fsdroid as static executables for recovery mode
am:
05a31e2c5d
Change-Id: I0f233278ba6f45003b77a0bb040a0c208ff4dd09
Jin Qian [Tue, 20 Jun 2017 20:49:53 +0000 (13:49 -0700)]
e2fsdroid: use libselinux function to read file context on device
When e2fsdroid runs on device, location of selinux file contexts
should be determined by libselinux instead of using arbitrary paths.
Bug:
35219933
Change-Id: I413b198422eddb212599498b532ba2c4d8bb36c6
Merged-In: I413b198422eddb212599498b532ba2c4d8bb36c6
Jin Qian [Wed, 7 Jun 2017 19:39:18 +0000 (12:39 -0700)]
Require mke2fs.conf when building mke2fs
make sure mke2fs.conf is copied to /etc so that mke2fs can find it
when running on device.
Bug:
35219933
Change-Id: I400cd21ea3b643469e89bb9bb6cd1536a090598a
Merged-In: I400cd21ea3b643469e89bb9bb6cd1536a090598a
Jin Qian [Fri, 9 Jun 2017 19:37:27 +0000 (12:37 -0700)]
build mke2fs and e2fsdroid as static executables for recovery mode
Bug:
35219933
Change-Id: I84f105cafc57c513d83d9e4d26e9e67ef805e33e
Merged-In: I84f105cafc57c513d83d9e4d26e9e67ef805e33e
android-build-team Robot [Thu, 22 Jun 2017 07:39:18 +0000 (07:39 +0000)]
release-request-
36fe639f-9404-4c33-86fb-
47bc4ab2221f-for-git_oc-mr1-release-
4124666 snap-temp-L64200000076596327
Change-Id: I8405e98009685323aee405809d0ecddad371eb4e
liminghao [Mon, 10 Apr 2017 01:48:51 +0000 (09:48 +0800)]
blkid: Resolve to the exFAT uuid change on reboot.
The volume_serial into exFAT super block is uuid but
not standard uuid, it's just volume serial number.
Change-Id: I376ed9fe1ba1b7f3d367d78cc5e2bb8ea9cc2d13
Signed-off-by: liminghao <liminghao@xiaomi.com>
Chih-Hung Hsieh [Wed, 21 Jun 2017 07:56:02 +0000 (07:56 +0000)]
Merge "Add OWNERS in external/e2fsprogs" am:
7975672f63 am:
22a19631dd am:
6e2cbd8ecd
am:
a7f19f9fa8
Change-Id: Ibc1455a417bcf4c81b8185502507a2667fdaaf8d
Chih-Hung Hsieh [Wed, 21 Jun 2017 07:54:00 +0000 (07:54 +0000)]
Merge "Add OWNERS in external/e2fsprogs" am:
7975672f63 am:
22a19631dd
am:
6e2cbd8ecd
Change-Id: Ib9a8d1f77f88262be6f2623484f278cb2526062f
Chih-Hung Hsieh [Wed, 21 Jun 2017 07:51:29 +0000 (07:51 +0000)]
Merge "Add OWNERS in external/e2fsprogs" am:
7975672f63
am:
22a19631dd
Change-Id: Iad9e424fd98270330d33edac17eddbdb9b42ffad
Chih-Hung Hsieh [Wed, 21 Jun 2017 07:49:00 +0000 (07:49 +0000)]
Merge "Add OWNERS in external/e2fsprogs"
am:
7975672f63
Change-Id: I7bc8a819f7ab8c153c37b38b31019e09363c6080
Treehugger Robot [Wed, 21 Jun 2017 07:43:36 +0000 (07:43 +0000)]
Merge "Add OWNERS in external/e2fsprogs"
android-build-team Robot [Wed, 21 Jun 2017 07:37:19 +0000 (07:37 +0000)]
release-request-
d1418208-3b0b-4ef9-a2f0-
a8f8ac6c24e8-for-git_oc-mr1-release-
4120176 snap-temp-L55000000076156472
Change-Id: I2d2ce869905eb7cbfb17f8e5a4202d3604d331a3
TreeHugger Robot [Wed, 21 Jun 2017 04:36:48 +0000 (04:36 +0000)]
Merge changes from topic 'e2fs_fsmgr'
* changes:
e2fsdroid: use libselinux function to read file context on device
Require mke2fs.conf when building mke2fs
Jin Qian [Tue, 20 Jun 2017 20:49:53 +0000 (13:49 -0700)]
e2fsdroid: use libselinux function to read file context on device
When e2fsdroid runs on device, location of selinux file contexts
should be determined by libselinux instead of using arbitrary paths.
Bug:
35219933
Change-Id: I413b198422eddb212599498b532ba2c4d8bb36c6
android-build-team Robot [Tue, 20 Jun 2017 07:30:28 +0000 (07:30 +0000)]
release-request-
f3bcfb00-8080-4b95-b497-
7457f544b4f6-for-git_oc-mr1-release-
4116097 snap-temp-L44400000075746008
Change-Id: Ibf9448e0b37b28c8d7f69d46fcbd10e172f4eb6f
Martijn Coenen [Tue, 20 Jun 2017 02:22:40 +0000 (02:22 +0000)]
Merge "Revert "Mark e2fs libs vendor_available."" am:
c91060c119 am:
877324d98b am:
97b32319c0
am:
4df6170ff2
Change-Id: Ib16d92d1baa03e2e350e1e1dc6a6539fe839f8cf
Martijn Coenen [Tue, 20 Jun 2017 02:19:39 +0000 (02:19 +0000)]
Merge "Revert "Mark e2fs libs vendor_available."" am:
c91060c119 am:
877324d98b
am:
97b32319c0
Change-Id: I6e464baf2dec2c360f7195d53bb389da3fd9a963
Martijn Coenen [Tue, 20 Jun 2017 02:16:39 +0000 (02:16 +0000)]
Merge "Revert "Mark e2fs libs vendor_available."" am:
c91060c119
am:
877324d98b
Change-Id: I873ac41fd7e2b964b8cdf5cab83acbe377df5681
Martijn Coenen [Tue, 20 Jun 2017 02:15:09 +0000 (02:15 +0000)]
Merge "Revert "Mark e2fs libs vendor_available.""
am:
c91060c119
Change-Id: I887d4f8f9f476373d07f4846fb3945c00aa076e6
Treehugger Robot [Tue, 20 Jun 2017 02:12:12 +0000 (02:12 +0000)]
Merge "Revert "Mark e2fs libs vendor_available.""
Martijn Coenen [Tue, 20 Jun 2017 00:18:32 +0000 (00:18 +0000)]
Revert "Mark e2fs libs vendor_available." am:
43eff9d5fe
am:
88a3b953a2
Change-Id: I23d5e408b5f102e23673ff8448753682b38c8ebf
Martijn Coenen [Tue, 20 Jun 2017 00:12:14 +0000 (00:12 +0000)]
Revert "Mark e2fs libs vendor_available."
am:
43eff9d5fe
Change-Id: I9da9eec6b55aa00fe3d9fa84beffa09db9675127
Martijn Coenen [Wed, 7 Jun 2017 22:02:40 +0000 (15:02 -0700)]
Revert "Mark e2fs libs vendor_available."
Test: builds
Bug:
38244611
This reverts commit
611bef8fda6b295e20fa1a6649ddd427160b3491.
Merged-In: I9e4e31805323ca682b999ed7c2fc4aeed1ea58a0
Change-Id: I00bcba565f3b8a67cac1d82ade7e5fa474613c0b
Jin Qian [Wed, 7 Jun 2017 19:39:18 +0000 (12:39 -0700)]
Require mke2fs.conf when building mke2fs
make sure mke2fs.conf is copied to /etc so that mke2fs can find it
when running on device.
Bug:
35219933
Change-Id: I400cd21ea3b643469e89bb9bb6cd1536a090598a
Jin Qian [Fri, 9 Jun 2017 19:37:27 +0000 (12:37 -0700)]
build mke2fs and e2fsdroid as static executables for recovery mode
Bug:
35219933
Change-Id: I84f105cafc57c513d83d9e4d26e9e67ef805e33e
Chih-Hung Hsieh [Fri, 16 Jun 2017 22:55:14 +0000 (15:55 -0700)]
Add OWNERS in external/e2fsprogs
* Owners are selected from top CL approvals or owners.
They will be suggested to review/approve future CLs.
* OWNERS files are recognized by the new find-owners plugin, see .md files in
https://gerrit.googlesource.com/plugins/find-owners/+/master/src/main/resources/Documentation/
Test: build/make/tools/checkowners.py -c -v OWNERS
Change-Id: I9dd4696970b36c2b55fcfc2ec22431cb6aa46e5b
Martijn Coenen [Thu, 8 Jun 2017 00:18:44 +0000 (17:18 -0700)]
Revert "Mark e2fs libs vendor_available."
This reverts commit
611bef8fda6b295e20fa1a6649ddd427160b3491.
Test: mma -j32
android-build-team Robot [Sun, 28 May 2017 07:38:27 +0000 (07:38 +0000)]
release-request-
80d7cd88-53c4-4e65-952a-
f34bc86a0841-for-git_oc-mr1-release-
4050000 snap-temp-L22200000068540971
Change-Id: Id10fb1d6ec35431408cfedae3e19c8ea1cfe38a6
Jayant Chowdhary [Thu, 25 May 2017 17:37:16 +0000 (17:37 +0000)]
Merge "Mark e2fs libs vendor_available." am:
e653ff4eaf am:
88cef96f45 am:
1d79e6fd74
am:
5e3717a438
Change-Id: Ic055fa473bb01c0c6ce59b0931b19c9bc57700c1
Jayant Chowdhary [Thu, 25 May 2017 17:28:17 +0000 (17:28 +0000)]
Merge "Mark e2fs libs vendor_available." am:
e653ff4eaf am:
88cef96f45
am:
1d79e6fd74
Change-Id: I8cfb004b3a0bbac80af26d8dcac6e2801b1bd709
Jayant Chowdhary [Thu, 25 May 2017 17:22:44 +0000 (17:22 +0000)]
Merge "Mark e2fs libs vendor_available." am:
e653ff4eaf
am:
88cef96f45
Change-Id: Iecd2b721cbe30f2a756ca8d3a98cfde7a55ac222
Jayant Chowdhary [Thu, 25 May 2017 17:16:51 +0000 (17:16 +0000)]
Merge "Mark e2fs libs vendor_available."
am:
e653ff4eaf
Change-Id: I3c679d7306e5709ca7b72ee4c5ecb68f17977cd2
Jayant Chowdhary [Thu, 25 May 2017 17:08:38 +0000 (17:08 +0000)]
Merge "Mark e2fs libs vendor_available."
Jayant Chowdhary [Wed, 17 May 2017 20:49:26 +0000 (13:49 -0700)]
Mark e2fs libs vendor_available.
libext2_blkid, libext2_com_err, libext2_e2p, libext2_uuid are libraries which
belong to vndk-cap. Mark them vendor_available to enable vndk abi stability
checks on them.
Details: https://android-review.googlesource.com/368372
Test: mm -j64
Bug:
38244611
Change-Id: I1931063b88b845a9a9d06188555c34f1fbc3e369
android-build-team Robot [Wed, 24 May 2017 20:01:56 +0000 (20:01 +0000)]
release-request-
e81235f1-b2b4-4de1-b974-
255760176f06-for-git_oc-mr1-release-
4040405 snap-temp-L68200000067456736
Change-Id: Iec550e1952c48c580131d3c24a0c70df76750af1
Elliott Hughes [Wed, 24 May 2017 00:35:47 +0000 (00:35 +0000)]
Merge "Define HAVE_SYS_SYSMACROS_H for Android." am:
9b9a786601 am:
656008e0d4 am:
4f8e794825
am:
e58dc46380
Change-Id: I08d292ece8442f05749adce9b765fe2a1853ac7e
Elliott Hughes [Wed, 24 May 2017 00:33:47 +0000 (00:33 +0000)]
Merge "Define HAVE_SYS_SYSMACROS_H for Android." am:
9b9a786601 am:
656008e0d4
am:
4f8e794825
Change-Id: I789466536d74d319b31549baafae0e06c798731e
Elliott Hughes [Wed, 24 May 2017 00:30:46 +0000 (00:30 +0000)]
Merge "Define HAVE_SYS_SYSMACROS_H for Android." am:
9b9a786601
am:
656008e0d4
Change-Id: I9a3993b3ac793479410132d0e3bd17d14804248f
Elliott Hughes [Wed, 24 May 2017 00:28:47 +0000 (00:28 +0000)]
Merge "Define HAVE_SYS_SYSMACROS_H for Android."
am:
9b9a786601
Change-Id: If88a981783f2e1ce7a6714a19738a585dafda5b6
OSDN Git Service
