aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-02-26Snap for 5335706 from 47e3eb9aeacca10d8f77dea2ac8c6e7aee36c338 to qt-releaseandroid-vts-10.0_r9android-vts-10.0_r8android-vts-10.0_r7android-vts-10.0_r6android-vts-10.0_r5android-vts-10.0_r4android-vts-10.0_r3android-vts-10.0_r2android-vts-10.0_r16android-vts-10.0_r15android-vts-10.0_r14android-vts-10.0_r13android-vts-10.0_r12android-vts-10.0_r11android-vts-10.0_r10android-vts-10.0_r1android-security-10.0.0_r75android-security-10.0.0_r74android-security-10.0.0_r73android-security-10.0.0_r72android-security-10.0.0_r71android-security-10.0.0_r70android-security-10.0.0_r69android-security-10.0.0_r68android-security-10.0.0_r67android-security-10.0.0_r66android-security-10.0.0_r65android-security-10.0.0_r64android-security-10.0.0_r63android-security-10.0.0_r62android-security-10.0.0_r61android-security-10.0.0_r60android-security-10.0.0_r59android-security-10.0.0_r58android-security-10.0.0_r57android-security-10.0.0_r56android-security-10.0.0_r55android-security-10.0.0_r54android-security-10.0.0_r53android-security-10.0.0_r52android-security-10.0.0_r51android-security-10.0.0_r50android-security-10.0.0_r49android-security-10.0.0_r48android-q-preview-6android-q-preview-5android-q-preview-4android-mainline-10.0.0_r3android-mainline-10.0.0_r2android-mainline-10.0.0_r1android-cts-10.0_r9android-cts-10.0_r8android-cts-10.0_r7android-cts-10.0_r6android-cts-10.0_r5android-cts-10.0_r4android-cts-10.0_r3android-cts-10.0_r2android-cts-10.0_r16android-cts-10.0_r15android-cts-10.0_r14android-cts-10.0_r13android-cts-10.0_r12android-cts-10.0_r11android-cts-10.0_r10android-cts-10.0_r1android-10.0.0_r6android-10.0.0_r5android-10.0.0_r47android-10.0.0_r46android-10.0.0_r4android-10.0.0_r3android-10.0.0_r2android-10.0.0_r17android-10.0.0_r11android-10.0.0_r10android-10.0.0_r1android10-tests-releaseandroid10-security-releaseandroid10-s3-releaseandroid10-s2-releaseandroid10-s1-releaseandroid10-releaseandroid10-mainline-releaseandroid10-mainline-a-releaseandroid10-gsiandroid-build-team Robot
Change-Id: Ic01769b9bcabdc77d6faeed47b1e49cedecbb444
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseXin Li
am: 25652b6114 Change-Id: I60678636d29766477181be18bcfd85bed349728a
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: I17ac30afe3f9e0fcfdbbf8eae9337ae18b0f6724
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: I077df68032c930d43b13f78958a160c88c49e50c
2019-02-14Snap for 5307677 from e84a27fb23151e4135171a021430a7e73026a404 to qt-releaseandroid-build-team Robot
Change-Id: I5c776ac82b45dba50d81f624a064b429a83c1eb4
2019-02-12Merge "misc: use scandir with alphasort instead of readdir for consistency" ↵Jiyong Park
am: bfe0f47fe1 am: 057af31198 am: 115cd42002 Change-Id: I30f1f478ea93baf566100dbfbc2112329fbcdf86
2019-02-12Merge "misc: use scandir with alphasort instead of readdir for consistency" ↵Jiyong Park
am: bfe0f47fe1 am: 057af31198 Change-Id: I089740b9f65abdadbb80087d95f8a449a64a0eca
2019-02-12Merge "misc: use scandir with alphasort instead of readdir for consistency"Jiyong Park
am: bfe0f47fe1 Change-Id: I273167e0eb579ed5590a4d97e21d564477a6a25a
2019-02-13Merge "misc: use scandir with alphasort instead of readdir for consistency"Jiyong Park
2019-02-13Snap for 5304721 from 656c22980a4feaab46e470df8b785b5135d9cc75 to qt-releaseandroid-build-team Robot
Change-Id: I5baaed79eb12d80eccd81d4fde6828f416ca61d5
2019-02-12Merge "Fix file offset overflow issue when file's size > 4G" am: 849299cdc8 ↵Chen Lin Z
am: 8c350c8f5b am: b0012be05f Change-Id: I2a21931a8194b3d75a811a589acc12a1dcea89aa
2019-02-12Merge "Fix file offset overflow issue when file's size > 4G" am: 849299cdc8Chen Lin Z
am: 8c350c8f5b Change-Id: Ie626f1f72f08ad812415ac6d0a8e99db2cbce747
2019-02-12Merge "Fix file offset overflow issue when file's size > 4G"Chen Lin Z
am: 849299cdc8 Change-Id: I474e306f008d45ff894b4198a3a79cad0f2f3995
2019-02-12Merge "Fix file offset overflow issue when file's size > 4G"Treehugger Robot
2019-02-12misc: use scandir with alphasort instead of readdir for consistencyYoshitaka Seto
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
2019-01-31Snap for 5271441 from fcc3123ad58aec7f4c9964991866bfc760bceb8c to qt-releaseandroid-build-team Robot
Change-Id: I75c337f4cd6d1ca2264318714cc1cb648b3d6ab1
2019-01-30Merge "E2fsprogs: fix ODR issue" am: 2073e2bf4d am: f1714a3335Andreas Gampe
am: 0a3189f2bd Change-Id: Icea10f40ae83800febc1d0e045e96abe790ba699
2019-01-30Merge "E2fsprogs: fix ODR issue" am: 2073e2bf4dAndreas Gampe
am: f1714a3335 Change-Id: I808cbcc3ca66c56df7c408845a678809e2197154
2019-01-30Merge "E2fsprogs: fix ODR issue"Andreas Gampe
am: 2073e2bf4d Change-Id: I346892b59a9c0c6928260e978f7aade8278abd3d
2019-01-30Merge "E2fsprogs: fix ODR issue"Treehugger Robot
2019-01-30Snap for 5268116 from f000c43073685972da48fe21a948607bcdf6529e to qt-releaseandroid-build-team Robot
Change-Id: I3f626a38eda036aaf1c5a755af56733413ef1814
2019-01-29E2fsprogs: fix ODR issueAndreas Gampe
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
2019-01-29Merge "e2fsdroid: Fix incorrect error value handling." am: 04351bfa18 am: ↵David Anderson
e8bb31c64b am: 212d5323e6 Change-Id: I3c581c2d44c03563bf68847ceae14eb7b8af8a88
2019-01-29Merge "e2fsdroid: Fix incorrect error value handling." am: 04351bfa18David Anderson
am: e8bb31c64b Change-Id: Iff63c318cdebdafb28ad9717b48fd88b27301ac8
2019-01-29Merge "e2fsdroid: Fix incorrect error value handling."David Anderson
am: 04351bfa18 Change-Id: I0b43fae7d72be8e8b5f2bb232fba92273f5b0e93
2019-01-29Merge "e2fsdroid: Fix incorrect error value handling."David Anderson
2019-01-24e2fsdroid: Fix incorrect error value handling.David Anderson
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
2019-01-10Fix file offset overflow issue when file's size > 4GChen Lin Z
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>
2019-01-03Snap for 5206983 from bbce2a18d841528917ad7075bb700c657a8ce21a to qt-releaseandroid-build-team Robot
Change-Id: I56054fb5c1d9a8fc15948bcfa10494587fb7990a
2019-01-02Merge "Build filefrag" am: 16ba4f877e am: 42c19abdd1Sandeep Patil
am: d988edb25f Change-Id: If0a377c8ba472639627bea9db53ea1a45fb94026
2019-01-02Merge "Build filefrag" am: 16ba4f877eSandeep Patil
am: 42c19abdd1 Change-Id: Ie4bdd1ea3f6508883c9043e640688e5f25230d4b
2019-01-02Merge "Build filefrag"Sandeep Patil
am: 16ba4f877e Change-Id: I8c92dacde8ff1a98054249a83a14d1cb1fad73f0
2019-01-02Merge "Build filefrag"Treehugger Robot
2018-12-26Build filefragSandeep Patil
Bug: 121211685 Test: mma -j with lunch aosp_blueline-userdebug Change-Id: If8cffae8168990a11e8228b9f00d2fee15924935 Signed-off-by: Sandeep Patil <sspatil@google.com>
2018-10-28Snap for 5096429 from 555ee139a6e6115f7a4a175a833e14fbd6307f87 to qt-releaseandroid-build-team Robot
Change-Id: Ie9d34344e2a99cb03fed6946d53fe33af5d9bc1b
2018-10-25Merge "ODR violation in tune2fs during host build" am: 73ee4372df am: 8162b23661Mark Salyzyn
am: b662c11033 Change-Id: I8010d776214b16dcf4ccbc4191f5194e6492ef73
2018-10-25Merge "ODR violation in tune2fs during host build" am: 73ee4372dfMark Salyzyn
am: 8162b23661 Change-Id: I7b97a56f8b77864044669c13c03d67e507225c2e
2018-10-25Merge "ODR violation in tune2fs during host build"Mark Salyzyn
am: 73ee4372df Change-Id: Ie34d106408083094999458002284c1a49877512c
2018-10-25Merge "ODR violation in tune2fs during host build"Mark Salyzyn
2018-10-25ODR violation in tune2fs during host buildMark Salyzyn
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
2018-10-25Snap for 5090430 from 251c6af099ea254b8e650b3bed48f746467b3803 to qt-releaseandroid-build-team Robot
Change-Id: Ib79a61738f054dc13a726d0a50874c723770a3d8
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: abe4126f4d -s ours am: 3dbf4945ff -s ours am: 4c9e6af4f8 -s ours Change-Id: Ic95887db450fea88312039622ecba8d53d909d93
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: abe4126f4d -s ours am: 3dbf4945ff -s ours Change-Id: I150fe7b48550a2d59f9d917b890f915e3a57b63c
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: abe4126f4d -s ours Change-Id: I50af6bd053487df230aee8a69cce7ea8e6370b1a
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
Change-Id: I79ec56c1f607eac264b220ab1ae50edac8fdf249
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 77c3894f65 -s ours am: dd4ce7a2e0 -s ours Change-Id: I91c2fb8a100f03300b850ac1f3d9072f5d47183e
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 77c3894f65 -s ours Change-Id: I80b978eccb9794c762b034a77f258e2e9bd2c887
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: I24087e9dc2a0d7b81fa0552ddc5df19e414545ea
2018-10-14Snap for 5067452 from 9925cdd8dc11ae4771023fd9f50f18fc5a171695 to qt-releaseandroid-build-team Robot
Change-Id: I40f3a24205d931bb46854c857505837a95b756ee
2018-10-12Merge "android/perms.c: clean up error handling" am: 26ab9ecf59 am: afa0fe5265Nick Kralevich
am: 377e6bf4d3 Change-Id: Idd12382684742c7ec5d2259da4bc39fd7d5831b1
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-18 17:33:48 +0000