aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Ignore -Wno-pointer-sign warningslineage-17.0Michael Bestas2019-11-191-1/+1
| | | | Change-Id: I2f209d99345ca9915d07ececb982b7c81a46c49d
* resize: Make a target for standalone resize2fs_static binaryBruno Martins2019-11-183-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Author: Bruno Martins <bgcngm@gmail.com> Date: Tue Mar 20 00:28:54 2018 +0000 resize: Make a target for standalone resize2fs_static binary * 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 Author: Tom Marshall <tdm.code@gmail.com> Date: Fri Jan 18 09:41:18 2019 -0800 e2fsprogs: Fix resize2fs_static build Change "resize: Make a target for standalone resize2fs_static binary" added a top level Android.mk which broke e2fsdroid_static because the macro all-sudbir-makefiles only looks one level deep. Fix this by adding an Android.mk to contrib, so that the build system sees contrib/android/Android.mk. Change-Id: I91e673dd207af3f6c7176370b3598a5eefd952b2 Change-Id: I62229325f0ee9efb65aa61c3f903f41ca7c978b8
* Snap for 5335706 from 47e3eb9aeacca10d8f77dea2ac8c6e7aee36c338 to qt-releaseandroid-build-team Robot2019-02-260-0/+0
|\ | | | | | | Change-Id: Ic01769b9bcabdc77d6faeed47b1e49cedecbb444
| * Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
| |\ | | | | | | | | | | | | | | | am: 25652b6114 Change-Id: I60678636d29766477181be18bcfd85bed349728a
| | * Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
| | |\ | | | | | | | | | | | | | | | | Bug: 126125118 Change-Id: I17ac30afe3f9e0fcfdbbf8eae9337ae18b0f6724
| | | * DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li2019-02-200-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | Bug: 120848293 Change-Id: I077df68032c930d43b13f78958a160c88c49e50c
* | | | | Snap for 5307677 from e84a27fb23151e4135171a021430a7e73026a404 to qt-releaseandroid-build-team Robot2019-02-141-12/+77
|\| | | | | | | | | | | | | | | | | | | Change-Id: I5c776ac82b45dba50d81f624a064b429a83c1eb4
| * | | | Merge "misc: use scandir with alphasort instead of readdir for consistency" ↵Jiyong Park2019-02-121-12/+77
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: bfe0f47fe1 am: 057af31198 am: 115cd42002 Change-Id: I30f1f478ea93baf566100dbfbc2112329fbcdf86
| | * | | Merge "misc: use scandir with alphasort instead of readdir for consistency" ↵Jiyong Park2019-02-121-12/+77
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: bfe0f47fe1 am: 057af31198 Change-Id: I089740b9f65abdadbb80087d95f8a449a64a0eca
| | | * | Merge "misc: use scandir with alphasort instead of readdir for consistency"Jiyong Park2019-02-121-12/+77
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: bfe0f47fe1 Change-Id: I273167e0eb579ed5590a4d97e21d564477a6a25a
| | | | * \ Merge "misc: use scandir with alphasort instead of readdir for consistency"Jiyong Park2019-02-131-12/+77
| | | | |\ \
| | | | | * | misc: use scandir with alphasort instead of readdir for consistencyYoshitaka Seto2019-02-121-12/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During the image generation, When using the e2fsdroid with src_dir, then dir files are listed with readdir, which will not guarantee the order across the machines/fielsystems. So instead using the scandir with alphasort option to list the files in sorted order. Reported-by: Yasuhiro Kubota <yasuhiro.1.kubota@sony.com> Signed-off-by: Vikram Dattu Thota <vikram.dattu@sony.com> Signed-off-by: Takuya Ogawa <takuya.ogawa@sony.com> Signed-off-by: Yoshitaka Seto <yoshitaka.seto@sony.com> Tested-by: Yasuhiro Kubota <yasuhiro.1.kubota@sony.com> Bug: 122874817 Change-Id: I4b946c737319252b82c74a0e10360843503862a1
* | | | | | | Snap for 5304721 from 656c22980a4feaab46e470df8b785b5135d9cc75 to qt-releaseandroid-build-team Robot2019-02-131-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5baaed79eb12d80eccd81d4fde6828f416ca61d5
| * | | | | | Merge "Fix file offset overflow issue when file's size > 4G" am: 849299cdc8 ↵Chen Lin Z2019-02-121-4/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8c350c8f5b am: b0012be05f Change-Id: I2a21931a8194b3d75a811a589acc12a1dcea89aa
| | * | | | | Merge "Fix file offset overflow issue when file's size > 4G" am: 849299cdc8Chen Lin Z2019-02-121-4/+4
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8c350c8f5b Change-Id: Ie626f1f72f08ad812415ac6d0a8e99db2cbce747
| | | * | | | Merge "Fix file offset overflow issue when file's size > 4G"Chen Lin Z2019-02-121-4/+4
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 849299cdc8 Change-Id: I474e306f008d45ff894b4198a3a79cad0f2f3995
| | | | * | | Merge "Fix file offset overflow issue when file's size > 4G"Treehugger Robot2019-02-121-4/+4
| | | | |\ \ \ | | | | | |/ / | | | | |/| |
| | | | | * | Fix file offset overflow issue when file's size > 4GChen Lin Z2019-01-101-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fs->blocksize is int(4 bytes), while data is off_t(8 bytes), 'data_blk = data & ~(fs->blocksize - 1)' will cause data_blk lose high 4 bytes of data if data > 4G and it'll cause file inconsistent when using -d option to populate ext4 image file. Signed-off-by: Chen Lin Z <lin.z.chen@intel.com>
* | | | | | | Snap for 5271441 from fcc3123ad58aec7f4c9964991866bfc760bceb8c to qt-releaseandroid-build-team Robot2019-01-315-13/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I75c337f4cd6d1ca2264318714cc1cb648b3d6ab1
| * | | | | | Merge "E2fsprogs: fix ODR issue" am: 2073e2bf4d am: f1714a3335Andreas Gampe2019-01-305-13/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0a3189f2bd Change-Id: Icea10f40ae83800febc1d0e045e96abe790ba699
| | * | | | | Merge "E2fsprogs: fix ODR issue" am: 2073e2bf4dAndreas Gampe2019-01-305-13/+8
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f1714a3335 Change-Id: I808cbcc3ca66c56df7c408845a678809e2197154
| | | * | | | Merge "E2fsprogs: fix ODR issue"Andreas Gampe2019-01-305-13/+8
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2073e2bf4d Change-Id: I346892b59a9c0c6928260e978f7aade8278abd3d
| | | | * | | Merge "E2fsprogs: fix ODR issue"Treehugger Robot2019-01-305-13/+8
| | | | |\ \ \
| | | | | * | | E2fsprogs: fix ODR issueAndreas Gampe2019-01-295-13/+8
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not use whole_static_libs and shared_libs at the same time. Fix up clients. Bug: 123590866 Test: mmma external/e2fsprogs Change-Id: I36d184dd878de2beacbb17c306e47076b44d68bb
* | | | | | | Snap for 5268116 from f000c43073685972da48fe21a948607bcdf6529e to qt-releaseandroid-build-team Robot2019-01-301-7/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3f626a38eda036aaf1c5a755af56733413ef1814
| * | | | | | Merge "e2fsdroid: Fix incorrect error value handling." am: 04351bfa18 am: ↵David Anderson2019-01-291-7/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e8bb31c64b am: 212d5323e6 Change-Id: I3c581c2d44c03563bf68847ceae14eb7b8af8a88
| | * | | | | Merge "e2fsdroid: Fix incorrect error value handling." am: 04351bfa18David Anderson2019-01-291-7/+9
| | |\| | | | | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | am: e8bb31c64b Change-Id: Iff63c318cdebdafb28ad9717b48fd88b27301ac8
| | | * | | Merge "e2fsdroid: Fix incorrect error value handling."David Anderson2019-01-291-7/+9
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 04351bfa18 Change-Id: I0b43fae7d72be8e8b5f2bb232fba92273f5b0e93
| | | | * | Merge "e2fsdroid: Fix incorrect error value handling."David Anderson2019-01-291-7/+9
| | | | |\ \ | | | | | |/ | | | | |/|
| | | | | * e2fsdroid: Fix incorrect error value handling.David Anderson2019-01-241-7/+9
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Methods returning 0 or -1 should not pass their return value to com_err. Also, errno values should not be negated when passed to com_err or through errcode_t. Bug: N/A Test: manual test Change-Id: I5e25cf2deeee72668bf0ab58337ee582bf14bbc1
* | | | | Snap for 5206983 from bbce2a18d841528917ad7075bb700c657a8ce21a to qt-releaseandroid-build-team Robot2019-01-031-0/+15
|\| | | | | | | | | | | | | | | | | | | Change-Id: I56054fb5c1d9a8fc15948bcfa10494587fb7990a
| * | | | Merge "Build filefrag" am: 16ba4f877e am: 42c19abdd1Sandeep Patil2019-01-021-0/+15
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d988edb25f Change-Id: If0a377c8ba472639627bea9db53ea1a45fb94026
| | * | | Merge "Build filefrag" am: 16ba4f877eSandeep Patil2019-01-021-0/+15
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 42c19abdd1 Change-Id: Ie4bdd1ea3f6508883c9043e640688e5f25230d4b
| | | * | Merge "Build filefrag"Sandeep Patil2019-01-021-0/+15
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | am: 16ba4f877e Change-Id: I8c92dacde8ff1a98054249a83a14d1cb1fad73f0
| | | | * Merge "Build filefrag"Treehugger Robot2019-01-021-0/+15
| | | | |\
| | | | | * Build filefragSandeep Patil2018-12-261-0/+15
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 121211685 Test: mma -j with lunch aosp_blueline-userdebug Change-Id: If8cffae8168990a11e8228b9f00d2fee15924935 Signed-off-by: Sandeep Patil <sspatil@google.com>
* | | | | Snap for 5096429 from 555ee139a6e6115f7a4a175a833e14fbd6307f87 to qt-releaseandroid-build-team Robot2018-10-281-1/+0
|\| | | | | | | | | | | | | | | | | | | Change-Id: Ie9d34344e2a99cb03fed6946d53fe33af5d9bc1b
| * | | | Merge "ODR violation in tune2fs during host build" am: 73ee4372df am: 8162b23661Mark Salyzyn2018-10-251-1/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b662c11033 Change-Id: I8010d776214b16dcf4ccbc4191f5194e6492ef73
| | * | | Merge "ODR violation in tune2fs during host build" am: 73ee4372dfMark Salyzyn2018-10-251-1/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8162b23661 Change-Id: I7b97a56f8b77864044669c13c03d67e507225c2e
| | | * | Merge "ODR violation in tune2fs during host build"Mark Salyzyn2018-10-251-1/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | am: 73ee4372df Change-Id: Ie34d106408083094999458002284c1a49877512c
| | | | * Merge "ODR violation in tune2fs during host build"Mark Salyzyn2018-10-251-1/+0
| | | | |\
| | | | | * ODR violation in tune2fs during host buildMark Salyzyn2018-10-251-1/+0
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port of commit 3271c69c97f486914fea833a36eaf5d86938c76d as applied to e2fsck, but to tune2fs. Bug: 112062612 Bug: 111302946 Test: $ m SANITIZE_HOST=address out/host/linux-x86/bin/tune2fs $ out/host/linux-x86/bin/tune2fs --help Change-Id: If49d367d96b7bfd0b8b79c6bde23c0ded52ca683
| * | | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: abe4126f4d -s ours am: 3dbf4945ff -s ours am: 4c9e6af4f8 -s ours Change-Id: Ic95887db450fea88312039622ecba8d53d909d93
| | * | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: abe4126f4d -s ours am: 3dbf4945ff -s ours Change-Id: I150fe7b48550a2d59f9d917b890f915e3a57b63c
| | | * | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | am: abe4126f4d -s ours Change-Id: I50af6bd053487df230aee8a69cce7ea8e6370b1a
| | | | * Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| | | | |\ | | | | | | | | | | | | | | | | | | Change-Id: I79ec56c1f607eac264b220ab1ae50edac8fdf249
* | | | | | Snap for 5090430 from 251c6af099ea254b8e650b3bed48f746467b3803 to qt-releaseandroid-build-team Robot2018-10-250-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib79a61738f054dc13a726d0a50874c723770a3d8
| * | | | | [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: 77c3894f65 -s ours am: dd4ce7a2e0 -s ours Change-Id: I91c2fb8a100f03300b850ac1f3d9072f5d47183e
| | * | | | [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: 77c3894f65 -s ours Change-Id: I80b978eccb9794c762b034a77f258e2e9bd2c887
| | | * | | Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| | | |\ \ \ | | | | |/ / | | | |/| / | | | | |/ Change-Id: I24087e9dc2a0d7b81fa0552ddc5df19e414545ea
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-28 13:24:45 +0000