aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-8.1.0_r43' into staging/lineage-15.1_merge-android-8.1.0_r43lineage-15.1Kevin F. Haggerty2018-08-081-1/+3
|\ | | | | | | | | | | | | | | | | Android 8.1.0 release 43 * tag 'android-8.1.0_r43': Ignore quotes in safe_print(). Change-Id: I06630f22718e53b6e951ee65740c2e863684eeae
| * Merge cherrypicks of [4586293, 4586294, 4586295, 4584365, 4584366, 4584367, ↵android-build-team Robot2018-07-201-1/+3
| |\ | | | | | | | | | | | | | | | 4584368, 4584369, 4584370, 4587544, 4584705, 4586296, 4587545, 4587546, 4586297, 4586298, 4586299, 4586300, 4584371, 4586301, 4584706, 4586302, 4586303, 4587584, 4587585, 4587586, 4587587, 4587588, 4587589, 4587590, 4587591, 4587644, 4587645, 4587646, 4587647, 4587648, 4587649, 4587650, 4587651, 4587652, 4587653, 4587654, 4587655, 4587656, 4587657, 4587658, 4587659, 4587660, 4587661, 4587662, 4584536, 4587547, 4587548, 4587549, 4584707, 4584708, 4587550, 4587551, 4587593, 4586516, 4584372, 4584373, 4584374, 4587595, 4584375, 4584376, 4587552, 4587596, 4587597, 4587598, 4587599, 4584414, 4584415, 4584416, 4584417, 4584418, 4584419, 4584420, 4584421, 4584422, 4584423, 4587804, 4587805, 4587806, 4587807, 4587808, 4587809, 4587810, 4587811, 4587812, 4587813, 4587814, 4587815, 4587816, 4587817, 4587818, 4587884, 4587885, 4587600, 4587601, 4587819, 4584709] into sparse-4749909-L91900000192339903 Change-Id: I307e8e820cac5b554c993db6dd87c57161e5772c
| | * Ignore quotes in safe_print().Jeff Sharkey2018-07-201-1/+3
| |/ | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * release-request-99856c15-b008-4977-9971-f86523a23c0a-for-git_oc-m2-release-4 ↵android-build-team Robot2017-09-293-1/+33
| |\ | | | | | | | | | | | | | | | 367109 snap-temp-L18300000107415568 Change-Id: I6d7977c4917b2ac88146e6bd8e8a9de4d8631ed1
* | | resize: Make a target for standalone resize2fs_static binaryBruno Martins2018-03-202-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Some devices still ship this static binary into the OTA in order to automatically resize system partition after OTA is installed. * This restores resize/Android.mk that had been removed in commit 7a9e1a9 and applies commit 0f37ade7. Apparently this is the only way to copy the executable to a path outside $OUT/system without messing with soong. Change-Id: Ied438c977d0920ef672dcce156ff62d5c658aa33
* | | e2fsprogs: Build libresize2fs for recoveryTom Marshall2018-03-195-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | * Add libresize2fs target. * Remove resource tracking stuff, it is not useful and conflicts with libe2fsck. Change-Id: I88cd83f0df21593ca4382cd7c7f8f086efa99d07
* | | Fix build warnings with '__bitwise' macro redefinedJin Qian2018-02-243-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | external/e2fsprogs/lib/blkid/blkid_types.h:30:9: warning: '__bitwise' macro redefined [-Wmacro-redefined] external/e2fsprogs/lib/ext2fs/ext2_types.h:30:9: warning: '__bitwise' macro redefined [-Wmacro-redefined] Bug: 67046543 Change-Id: Ic8a552f68e6e17be4bdca63e24b45f6c9a6dbcd7
* | | e2fsprogs: Build static libs for recoveryTom Marshall2017-12-053-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | * Add libe2fsck, libmke2fs. * Allow libext2_profile to build statically. Change-Id: If676329230db0dd868453c406392f584e3a24dbe
* | | e2fsprogs: Prepare for adding and using static libsTom Marshall2017-12-057-310/+302
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * Convert misc utils to inline. This needed to avoid duplicate symbols when linking multiple e2fsprogs libs into an executable. * Ensure macros are set properly in blkid_types.h. __bitwise and __force are defined in uapi headers, so we must ensure they are undefined in order to build against code that uses any libc or kernel headers. * Add BUILD_AS_LIB guards to main() and program_name where needed, following the existing style in misc/tune2fs.c. Change-Id: I1e82ccdce2cba86d79b454fa5810d99986012fcc
* | release-request-ca7a0f27-e01e-4493-95dc-73b265f88cc9-for-git_oc-mr1-release- ↵android-build-team Robot2017-09-283-1/+33
|\ \ | |/ |/| | | | | | | 4365318 snap-temp-L33600000106883904 Change-Id: Iac2f9e1faf3fb704287080a41ca250f9e4a01736
| * mke2fs, libext2fs: make filesystem image reproducibleJin Qian2017-09-273-1/+33
| | | | | | | | | | | | | | | | | | 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)
* | release-request-c924aaac-f0a2-4215-8dc4-e314f22460d9-for-git_oc-mr1-release- ↵android-build-team Robot2017-08-285-13/+13
|\| | | | | | | | | | | 4301796 snap-temp-L23200000097143969 Change-Id: I967f2b2d6de8a7bb102ce33e2d4c3d94eb9272d1
| * Add missing libdl dependenciesPavlin Radoslavov2017-08-245-13/+13
| | | | | | | | | | | | | | | | Bug: 62815515 Test: lunch full-eng; make checkbuild Merged-In: I1751669c4ed046c22587938e04eb76abe8553a8d Change-Id: I1751669c4ed046c22587938e04eb76abe8553a8d (cherry picked from commit a24084ceb74c84b0943c86deb5cb99a63d3c46d7)
* | release-request-9ff446ef-fe26-4f50-a0f0-c1d38619140f-for-git_oc-mr1-release- ↵android-build-team Robot2017-08-091-2/+7
|\| | | | | | | | | | | 4257899 snap-temp-L58400000090817127 Change-Id: Ifbed94aa5b023c2124fc9e8e977603104cadf398
| * e2fsck: fix ASAN error when using 128 byte inodesTheodore Ts'o2017-08-081-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | release-request-c8b8af6b-4899-402a-9ff7-72255ba5300b-for-git_oc-mr1-release- ↵android-build-team Robot2017-08-081-0/+13
|\| | | | | | | | | | | 4253898 snap-temp-L09600000090287887 Change-Id: I36339cda481449dbe3c95a712612b804d0be2887
| * e2fsdroid: print used/total inode and block countYang Jin2017-08-041-0/+13
| | | | | | | | | | | | Bug: 64272984 Change-Id: Idc727e556a3fa7fb85ff0f845b9452c8c033c22d (cherry picked from commit 131d29f6a826438aff0e5870fb3711358d2a0988)
* | release-request-ceffd4a6-d719-491c-b078-6ce33cda5fb8-for-git_oc-mr1-release- ↵android-build-team Robot2017-08-0227-24/+238
|\| | | | | | | | | | | 4237114 snap-temp-L83200000088245566 Change-Id: I46983f200c2018748a59738dcf12d8bbaa494ef5
| * build mke2fs for windows using android mingw libraryJin Qian2017-08-0124-18/+215
| |\ | | | | | | | | | | | | | | | am: 9f3b79acf7 Change-Id: I734f7038367cad46d9b712a17055c79098a3f8e3
| | * build mke2fs for windows using android mingw libraryJin Qian2017-08-0124-18/+215
| | | | | | | | | | | | | | | | | | Bug: 23686092 Change-Id: I4c7b0c69e3e3c48321d3a0a964ad65c87fc32bbd (cherry picked from commit 83da0276c3ff0a1c33f9042798b319542e254060)
| * | mke2fs, libext2fs: fix bugs on windowsJin Qian2017-08-014-6/+23
| |\| | | | | | | | | | | | | | | | am: bc237175f9 Change-Id: I7f15f1895d105a7bd8fa061b540231a56cd6201b
| | * mke2fs, libext2fs: fix bugs on windowsJin Qian2017-08-014-6/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * | build static version of mke2fs and e2fsdroid for hostJin Qian2017-08-010-0/+0
| |\| | | | | | | | | | | | | | | | am: 06bad82b60 Change-Id: I61e7a10eda490697f8cf21c9c6ae0c09ff76c38b
| | * build static version of mke2fs and e2fsdroid for hostJin Qian2017-08-012-19/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
* | | release-request-bd6aa7dd-7b02-4794-942c-14599bf61208-for-git_oc-mr1-release- ↵android-build-team Robot2017-07-192-19/+56
|\| | | | | | | | | | | | | | | | | 4193791 snap-temp-L98700000083613807 Change-Id: I0d3bb62bd600d03ff2f7a6eeb22d07362d10977f
| * | Merge "build static version of mke2fs and e2fsdroid for host"TreeHugger Robot2017-07-182-19/+56
| |\ \
| | * | build static version of mke2fs and e2fsdroid for hostJin Qian2017-07-172-19/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | release-request-5ee66a34-3e58-4de0-ba73-1f49074ee497-for-git_oc-mr1-release- ↵android-build-team Robot2017-07-111-2/+3
|\| | | | | | | | | | | | | | | | | | | | | | | 4169335 snap-temp-L20600000081126177 Change-Id: I004384f48e79b27ad86be04bf2bd30d909e6a8f9
| * | | Merge "blkid: Resolve to the exFAT uuid change on reboot." am: 6eac3894a6 ↵Jeff Sharkey2017-07-101-2/+3
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | am: 68acc00e57 am: 4ef0afa563 am: 9abc85f05b Change-Id: Iaf63db082453bebed08e364abe9c657bad7d4a41
| | * | Merge "blkid: Resolve to the exFAT uuid change on reboot." am: 6eac3894a6 ↵Jeff Sharkey2017-07-101-2/+3
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 68acc00e57 am: 4ef0afa563 Change-Id: Ibfaba811291cce3bed86a812d403cf1f598a1cf8
| | | * \ Merge "blkid: Resolve to the exFAT uuid change on reboot." am: 6eac3894a6Jeff Sharkey2017-07-101-2/+3
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 68acc00e57 Change-Id: Id7f4617e1695fc74f98da60d389adb747ab137d5
| | | | * | Merge "blkid: Resolve to the exFAT uuid change on reboot."Jeff Sharkey2017-07-101-2/+3
| | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6eac3894a6 Change-Id: Ie0d9db21e79dad3ab6904b8934ea7facfeab3eff
| | | | * | Merge "blkid: Resolve to the exFAT uuid change on reboot."Jeff Sharkey2017-07-101-2/+3
| | | | |\ \
| | | | | * | blkid: Resolve to the exFAT uuid change on reboot.liminghao2017-06-211-2/+3
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | | Merge "Merge changes from topic 'am-52eed220ada34c3aba959fcbb20dfeab' into ↵Android Build Merger (Role)2017-07-060-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | oc-dr1-dev-plus-aosp am: bedbcad1de -s ours"
| | * | | | | Merge changes from topic 'am-52eed220ada34c3aba959fcbb20dfeab' into ↵Jin Qian2017-07-060-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | oc-dr1-dev-plus-aosp am: bedbcad1de -s ours Change-Id: Ia04208edf12ab5c6f6af09357d8be4545125fad5
| * | | | | | Merge changes from topic 'am-52eed220ada34c3aba959fcbb20dfeab' into ↵Jin Qian2017-07-060-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | oc-dr1-dev-plus-aosp am: bedbcad1de -s ours Change-Id: I1c33bc2650c4122ea7b0cc963a5558257433c6aa
| | * | | | Merge changes from topic 'am-52eed220ada34c3aba959fcbb20dfeab' into ↵Android Build Merger (Role)2017-07-060-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | \ \ \ \ Merge "e2fsdroid: use libselinux function to read file context on device am: ↵Android Build Merger (Role)2017-07-060-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 2fff6fb036 am: 58dd122671 -s ours"
| | * \ \ \ \ \ e2fsdroid: use libselinux function to read file context on device am: 2fff6fb036Jin Qian2017-07-060-0/+0
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 58dd122671 -s ours Change-Id: I859d0897f1fadd9e4357d2d7bb9a9e55f3746a89
| | | * | | | | e2fsdroid: use libselinux function to read file context on deviceJin Qian2017-07-062-1/+10
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2fff6fb036 Change-Id: I2a698ff8aa6ae1684b9634deb082bf7e1d32f490
| | | * | | | | Require mke2fs.conf when building mke2fsJin Qian2017-07-061-0/+3
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 778eaa84a0 Change-Id: I945f211ccdf1bf111edab2717606c2379bd9c936
| * | | \ \ \ \ \ Merge changes from topic 'am-02585df899244ddfb0b2ea27e62c017d'Android Build Merger (Role)2017-07-060-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * | | | | | | e2fsdroid: use libselinux function to read file context on device am: 2fff6fb036Jin Qian2017-07-060-0/+0
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 3ac608fd1b -s ours Change-Id: Ia3759f195c9c9df03dc86362327c078aadea6c28
| | * | | | | | | Require mke2fs.conf when building mke2fs am: 778eaa84a0Jin Qian2017-07-060-0/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6243f2136f -s ours Change-Id: I1a1d30259e12ef267d8a26c092aa4ead12bfe7b2
| * | \ \ \ \ \ \ \ e2fsdroid: use libselinux function to read file context on device am: 2fff6fb036Jin Qian2017-07-060-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 3ac608fd1b -s ours Change-Id: Ia6535f6a8ba375bab3feea79342957e61503c677
| | * | | | | | | | e2fsdroid: use libselinux function to read file context on deviceJin Qian2017-07-062-1/+10
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | / / / | | | | |_|_|/ / / | | | |/| | | | | | | | | | | | | | am: 2fff6fb036 Change-Id: I2dd7351c28c20239e70796ce04eddf838587a08e
| | | * | | | | | e2fsdroid: use libselinux function to read file context on deviceJin Qian2017-06-262-1/+10
| | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Require mke2fs.conf when building mke2fs am: 778eaa84a0Jin Qian2017-07-060-0/+0
| |\| | | | | | | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | am: 6243f2136f -s ours Change-Id: I13166000fc980e1925c7f61bf9358128fbd1229d
| | * | | | | Require mke2fs.conf when building mke2fsJin Qian2017-07-061-0/+3
| | |\| | | | | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | am: 778eaa84a0 Change-Id: I579087da2b2ce0f41ccb1581ade77b55cc23a039
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-15 07:18:29 +0000