aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-21Snap for 7160059 from 06631d02578a288fdde551ad97ec9fb105e9e47f to sc-d1-releaseandroid-12.0.0_r7android-12.0.0_r6android-12.0.0_r5android-12.0.0_r4android-12.0.0_r15android-12.0.0_r14android-12.0.0_r13android-12.0.0_r12android12-d1-s6-releaseandroid12-d1-s5-releaseandroid12-d1-s4-releaseandroid12-d1-s3-releaseandroid12-d1-s2-releaseandroid12-d1-s1-releaseandroid12-d1-releaseandroid-build-team Robot
Change-Id: Ib30bc9b182c0c8140f146b4d92d21b00962e9945
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 573989abdc -s ↵android-s-qpr3-beta-1android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseandroid-s-qpr3-beta-1Xin Li
ours am: e188b606b4 -s ours am skip reason: Change-Id Icd82b8879d3d37fd9218c0a0fb4125d433b5f76a with SHA-1 4071936079 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie030056b73a0c812c36e9ce604d7617634e583d8
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 573989abdc -s oursXin Li
am skip reason: Change-Id Icd82b8879d3d37fd9218c0a0fb4125d433b5f76a with SHA-1 4071936079 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icf335bd7244d44967afc189390bf52817ed7cca6
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-2android-s-beta-1Xin Li
Bug: 180401296 Merged-In: Icd82b8879d3d37fd9218c0a0fb4125d433b5f76a Change-Id: I77f5388d02c3315659cf993ef05915ebb7292877
2021-02-17Snap for 7149879 from b81ff3ffb37b10aa8d565e6ff8d5d8357ffc63de to sc-d1-releaseandroid-build-team Robot
Change-Id: Ib2f12567e076cc1fe490bbacd2e0f1cb021cb094
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/e2fsprogs" am: 6b0a975886 ↵Bob Badour
am: e588bdb491 am: a61b4333f8 Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/1588936 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icc30589ad22a5f4b6f87861f136f66893ae3e4c0
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/e2fsprogs" am: 6b0a975886 ↵Bob Badour
am: e588bdb491 Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/1588936 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I00fe007da7ea1e778892283f8c8c477adb8a9da0
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/e2fsprogs" am: 6b0a975886Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/1588936 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icb341c2e21b11cb4782aa66ad8e6d246291b58d1
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/e2fsprogs"android-s-preview-1Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/e2fsprogsBob Badour
Added SPDX-license-identifier-0BSD SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-LGPL SPDX-license-identifier-LGPL-2.0 SPDX-license-identifier-LGPL-2.1 SPDX-license-identifier-LGPL-3.0 SPDX-license-identifier-MIT legacy_notice legacy_unencumbered to: Android.bp Added SPDX-license-identifier-0BSD SPDX-license-identifier-BSD SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-LGPL SPDX-license-identifier-LGPL-2.1 SPDX-license-identifier-LGPL-3.0 SPDX-license-identifier-MIT legacy_unencumbered to: lib/Android.bp Added SPDX-license-identifier-0BSD SPDX-license-identifier-BSD SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-MIT to: lib/et/Android.bp Added SPDX-license-identifier-0BSD SPDX-license-identifier-MIT to: lib/ss/Android.bp Added SPDX-license-identifier-Apache-2.0 to: contrib/android/Android.bp Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-GPL to: contrib/Android.bp Added SPDX-license-identifier-BSD to: lib/uuid/Android.bp Added SPDX-license-identifier-GPL to: resize/Android.bp Added SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0 to: debugfs/Android.bp Added SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-LGPL to: e2fsck/Android.bp Added SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-LGPL SPDX-license-identifier-LGPL-2.1 SPDX-license-identifier-LGPL-3.0 legacy_unencumbered to: lib/ext2fs/Android.bp Added SPDX-license-identifier-GPL SPDX-license-identifier-LGPL to: lib/e2p/Android.bp Added SPDX-license-identifier-GPL SPDX-license-identifier-LGPL SPDX-license-identifier-LGPL-2.1 SPDX-license-identifier-LGPL-3.0 to: lib/blkid/Android.bp misc/Android.bp Added SPDX-license-identifier-GPL SPDX-license-identifier-MIT to: lib/support/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I239a04a83f12ba051be911d18f6df4ae77fb3368
2021-01-07Snap for 7066998 from 09311a8b10d64b9bd06043fad47118f5333b4344 to sc-d1-releaseandroid-build-team Robot
Change-Id: I90d833587a4b9c3b7fe3dda4e6691b9bfdd812f3
2021-01-06Merge "Add assemble_cvd to com.android.virt" am: 9dce0711d7 am: 3063c071d0 ↵Treehugger Robot
am: 2f41d1bd10 Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/1538730 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I345765229b6272424b4a592d0492af9c1eae1a89
2021-01-06Merge "Add assemble_cvd to com.android.virt" am: 9dce0711d7 am: 3063c071d0Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/1538730 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If5e9384fb3e97f25eba278942f16bab2e9164d96
2021-01-06Merge "Add assemble_cvd to com.android.virt" am: 9dce0711d7Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/1538730 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib119a84c0d6fc3431fed6c1caad99a1ec6f8af09
2021-01-06Merge "Add assemble_cvd to com.android.virt"Treehugger Robot
2021-01-05Add assemble_cvd to com.android.virtJiyong Park
assemble_cvd directly or indirectly depends on these modules. To add assemble_cvd to the com.anroid.virt APEX, these modules are marked as being available to the APEX. Bug: 174639526 Test: m com.android.virt Change-Id: Ibc28d24abd358fb1f8608b3f3d6d06c2746f2d72
2020-11-25Snap for 6993940 from 28b4dac4f7d7ba88205e1269f198aa76d7e9d04b to sc-d1-releaseandroid-build-team Robot
Change-Id: Id5eadf6cf0f5906e579d6d98866801b9d19928f4
2020-11-24Merge "Mark ab/6881855 as merged" into stage-aosp-master am: 2960e8aa06 am: ↵TreeHugger Robot
4071936079 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/13112551 Change-Id: I4a23a1bb51bb9a634594ff7ea0bedec046e20ac0
2020-11-24Snap for 6991517 from 8aac4324b5f3d0e8797e9f1272d5517a90967ed7 to sc-d1-releaseandroid-build-team Robot
Change-Id: Ia07485dab5a59ce1341b16abc177e662e9c3c871
2020-11-24Merge "Mark ab/6881855 as merged" into stage-aosp-master am: 2960e8aa06TreeHugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/13112551 Change-Id: Icd82b8879d3d37fd9218c0a0fb4125d433b5f76a
2020-11-24Merge "Mark ab/6881855 as merged" into stage-aosp-masterTreeHugger Robot
2020-11-23Merge "Make libext2_uuid and e2fsprogs headers vendor_ramdisk_available." ↵David Anderson
am: 1cae243180 am: 08907af071 am: ea138ca840 Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/1500598 Change-Id: I3362f125c6bbc3be24f7a9039138615cbdbdc6c0
2020-11-23Merge "Make libext2_uuid and e2fsprogs headers vendor_ramdisk_available." ↵David Anderson
am: 1cae243180 am: 08907af071 Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/1500598 Change-Id: I64fae976c1f4080d47a8b255189c099e22a18a0a
2020-11-23Merge "Make libext2_uuid and e2fsprogs headers vendor_ramdisk_available." ↵David Anderson
am: 1cae243180 Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/1500598 Change-Id: Idb9700914bcd180106facd1aaabb56ae7f1fcc5d
2020-11-23Merge "Make libext2_uuid and e2fsprogs headers vendor_ramdisk_available."David Anderson
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I213c3aa991ec33d4fb6e37eca390ae72df676d1a
2020-11-21Snap for 6987319 from 48459acea8089266536cfa79a80d465c333c7173 to sc-d1-releaseandroid-build-team Robot
Change-Id: I14844429035ad42ca9cfcb37ec1ebd36b4b4c2d7
2020-11-20Merge "tune2fs/resize2fs: make vendor_ramdisk_available." am: f99e90447c am: ↵Yifan Hong
3eee439066 am: 1cf7769875 Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/1504158 Change-Id: I0399929d97f5a8d0a7cf149665f48cc4bed69666
2020-11-20Merge "tune2fs/resize2fs: make vendor_ramdisk_available." am: f99e90447c am: ↵Yifan Hong
3eee439066 Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/1504158 Change-Id: Ib1d013c9ccaa494efac1d44d531812a754ec78dd
2020-11-20Merge "tune2fs/resize2fs: make vendor_ramdisk_available." am: f99e90447cYifan Hong
Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/1504158 Change-Id: I071f3c6f64facc383bacc263a46ee41f9d58eb1a
2020-11-20Merge "tune2fs/resize2fs: make vendor_ramdisk_available."Yifan Hong
2020-11-18tune2fs/resize2fs: make vendor_ramdisk_available.Yifan Hong
The vendor_ramdisk variant is dynamic, unlike the ramdisk variant. Test: builds Bug: 173425293 Change-Id: I45547b5ea99aae98727121c038129844b7930ed6
2020-11-16Make libext2_uuid and e2fsprogs headers vendor_ramdisk_available.David Anderson
This is needed to build snapuserd into the vendor ramdisk. Bug: 173463595 Test: snapuserd builds Change-Id: I05d85357ebf47abd0d82e9c6211e854bdf0d5ae9
2020-11-12Snap for 6967590 from 613751c5e3eef613df33b3e83bee0ca813835578 to sc-d1-releaseandroid-build-team Robot
Change-Id: Ie8995d26d1aff08b104a196f619a31119814f182
2020-11-12Merge "Add "product_available" to product available modules" am: f514b177a1 ↵Treehugger Robot
am: d525d68467 am: ae671af84b am: 01e2297f38 Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/1495266 Change-Id: I9463cfbf5069d06be1f78771712984b20c5ab67b
2020-11-12Merge "Add "product_available" to product available modules" am: f514b177a1 ↵Treehugger Robot
am: d525d68467 am: ae671af84b Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/1495266 Change-Id: I559be593b9faad651a7619c8ef43cfb3988ba782
2020-11-12Merge "Add "product_available" to product available modules" am: f514b177a1 ↵Treehugger Robot
am: d525d68467 Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/1495266 Change-Id: I59576f9bde5fa358a5910f59ed948693945d8cef
2020-11-12Merge "Add "product_available" to product available modules" am: f514b177a1Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/1495266 Change-Id: I41a8b31f66b837d6528af0d5d4d1070633b3e300
2020-11-11Merge "Add "product_available" to product available modules"Treehugger Robot
2020-11-11Add "product_available" to product available modulesJustin Yun
"vendor_available" modules were available to product modules. However, not all "vendor_available" modules are required to be available to product modules. Some modules want to be available only to product modules but not vendor modules. To cover the requirement, we separate "product_available" from "vendor_available". "vendor_available" will not provide product available module. Bug: 150902910 Test: build Change-Id: I316da0d24bde8b6231114aa80841c59547691152
2020-10-11Snap for 6897674 from 63d088c15ed62f54fc1104d1c516bd7faed861b1 to sc-d1-releaseandroid-build-team Robot
Change-Id: I8d5f8cb1152c6508cadb7f7fb7a7e2d68306671d
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 9c933c337a -s ours am: ↵Xin Li
4db92f6029 -s ours am: 757788fdb7 -s ours am: 8691a0afba -s ours am skip reason: Change-Id If521539e4207b2c9ebe3836c2726d14f15eed325 with SHA-1 b274191b1a is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/12796483 Change-Id: Ic5858c1bb141d2e5d132a3474722f9bf443c73bb
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 9c933c337a -s ours am: ↵Xin Li
4db92f6029 -s ours am: 757788fdb7 -s ours am skip reason: Change-Id If521539e4207b2c9ebe3836c2726d14f15eed325 with SHA-1 b274191b1a is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/12796483 Change-Id: I0f04c9ce6261ead4c4e8d710c752acfaf3abf397
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 9c933c337a -s ours am: ↵Xin Li
4db92f6029 -s ours am skip reason: Change-Id If521539e4207b2c9ebe3836c2726d14f15eed325 with SHA-1 b274191b1a is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/12796483 Change-Id: I1bf03adc7dad52c2213a33cbe80c972f2222cf1b
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 9c933c337a -s oursXin Li
am skip reason: Change-Id If521539e4207b2c9ebe3836c2726d14f15eed325 with SHA-1 b274191b1a is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/12796483 Change-Id: Ic5b74054e4c31db23c586793966b08e032925e5c
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: If521539e4207b2c9ebe3836c2726d14f15eed325 Change-Id: I5de3f67f38c47ef76caa57c42a872ea80fa0c325
2020-09-15Snap for 6835166 from 87a0e4a2ac9774620f5bb8cd6d9b3dc3d08d8e50 to sc-d1-releaseandroid-build-team Robot
Change-Id: Ia0ce43d8b68732870803bf343542c2c5f9ec6243
2020-09-14Snap for 6832314 from 1d9c7c307510cda6426b1de90f46dcffb8068049 to sc-d1-releaseandroid-build-team Robot
Change-Id: I8fbb035ad55039d9d5b3dd7502490eada9802346
2020-09-14[automerger skipped] [DO NOT MERGE] Change #define to _BLKID_TYPES_H am: ↵Kousik Kumar
82c0e62db7 am: 30560a31d4 -s ours am: 5d6dacc81a -s ours am: c0c15ff756 -s ours am: 4456de4792 -s ours am skip reason: Change-Id I63ab1719ee1d0ccd28907f0bc99531260251fa99 with SHA-1 ec10b513c2 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/12477912 Change-Id: Ie24ce32ce2ecd00a7c6adc67777df219085614d3
2020-09-13ANDROID: e2fsck: Handle casefolded encryption am: 156028c42e am: 69a1d5f0c3 ↵Daniel Rosenberg
am: b24ea323c0 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/e2fsprogs/+/11205331 Change-Id: If843ca2129c0a7482c4f6889abb08f5f80085c43
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 00:52:29 +0000