aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-06-18Merge "Add ramdisk_available to init_first_stage's deps" am: ad04868449 am: ↵Inseob Kim
c57de39dab am: c95dd759ab am: 07c4bd6d43 Original change: https://android-review.googlesource.com/c/platform/external/lzma/+/1736473 Change-Id: I6b544c1e3158b57b3f2af6454299f702c1c8b040
2021-06-18Merge "Add ramdisk_available to init_first_stage's deps" am: ad04868449 am: ↵Inseob Kim
c57de39dab am: c95dd759ab Original change: https://android-review.googlesource.com/c/platform/external/lzma/+/1736473 Change-Id: Icc7c69ad90e6e3ab79d1c3b7c1705a75992b1f40
2021-06-18Merge "Add ramdisk_available to init_first_stage's deps" am: ad04868449 am: ↵Inseob Kim
c57de39dab Original change: https://android-review.googlesource.com/c/platform/external/lzma/+/1736473 Change-Id: I7d0f40539704f2d355aa9fd4b642c42ed9a93958
2021-06-18Merge "Add ramdisk_available to init_first_stage's deps" am: ad04868449Inseob Kim
Original change: https://android-review.googlesource.com/c/platform/external/lzma/+/1736473 Change-Id: Ib65c22f030c506aa9be43025b5f0a05646c81c7d
2021-06-18Merge "Add ramdisk_available to init_first_stage's deps"android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Inseob Kim
2021-06-14Add ramdisk_available to init_first_stage's depsInseob Kim
Bug: 187196593 Test: boot Change-Id: I06091d15ea6ad15fa3fe7e2153278228ec4169b6
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: Ie5cde7ff7b7ca86b33e51e1e1d29a05e345be4f7
2021-03-08Merge "Add min_sdk_version for ART module." am: 53571c407b am: 8685e8aef9 ↵Nicolas Geoffray
am: a237b914f7 am: 2ee0b84d4c Original change: https://android-review.googlesource.com/c/platform/external/lzma/+/1614811 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If309673c26db15f08678f189671c85327f3e1fff
2021-03-08Merge "Add min_sdk_version for ART module." am: 53571c407b am: 8685e8aef9 ↵Nicolas Geoffray
am: a237b914f7 am: 2ee0b84d4c Original change: https://android-review.googlesource.com/c/platform/external/lzma/+/1614811 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I02694470f3a32492d2d98a92ed67d34c2385a059
2021-03-08Merge "Add min_sdk_version for ART module." am: 53571c407b am: 8685e8aef9 ↵Nicolas Geoffray
am: a237b914f7 Original change: https://android-review.googlesource.com/c/platform/external/lzma/+/1614811 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1b85d22be79cec4ec522ae7b8a4d2aa07db4e608
2021-03-08Merge "Add min_sdk_version for ART module." am: 53571c407b am: 8685e8aef9Nicolas Geoffray
Original change: https://android-review.googlesource.com/c/platform/external/lzma/+/1614811 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3524cd549e8636a260b79aaa854676a3c7c57af3
2021-03-08Merge "Add min_sdk_version for ART module." am: 53571c407bNicolas Geoffray
Original change: https://android-review.googlesource.com/c/platform/external/lzma/+/1614811 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idd2b8afc85f99636e4d3324ef8ae49464b48bee4
2021-03-08Merge "Add min_sdk_version for ART module."android-s-beta-2android-s-beta-1Nicolas Geoffray
2021-03-06Add min_sdk_version for ART module.Nicolas Geoffray
Bug: 180399951 Test: m Change-Id: I2a04d0aa252bf4b42737d6dbd2bc2f38a1768f1a
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 167dafe30c -s ↵Xin Li
ours am: 26f7a77331 -s ours am: a784c6aa0e -s ours am skip reason: Change-Id I061bdba426828811c7f8afbc6a5aefde70814203 with SHA-1 8b056f9530 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I390da87e192afcfd0ecceae4dd514873998aa6de
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 167dafe30c -s ↵Xin Li
ours am: 26f7a77331 -s ours am: a784c6aa0e -s ours am skip reason: Change-Id I061bdba426828811c7f8afbc6a5aefde70814203 with SHA-1 8b056f9530 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8e7dc73080b4053b7265a131b4304ffb7dade667
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 167dafe30c -s ↵Xin Li
ours am: 26f7a77331 -s ours am skip reason: Change-Id I061bdba426828811c7f8afbc6a5aefde70814203 with SHA-1 8b056f9530 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9904cf4c4b303e648323cd1c7ce2b64d8f6c92bd
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 167dafe30c -s oursXin Li
am skip reason: Change-Id I061bdba426828811c7f8afbc6a5aefde70814203 with SHA-1 8b056f9530 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I564e39639fd94f0e4e01e7fa2460d9218d187953
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: I061bdba426828811c7f8afbc6a5aefde70814203 Change-Id: I84b3207cf50a067b127676bc7af8a69c3ef16bac
2021-02-04Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/lzma" am: 435ea22543 am: ↵Bob Badour
268b867a00 am: df89996f6d am: d22f5a7bb2 Original change: https://android-review.googlesource.com/c/platform/external/lzma/+/1575760 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I45fff8131e88976f81e81f1ac7abae0d2a618f49
2021-02-04Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/lzma" am: 435ea22543 am: ↵Bob Badour
268b867a00 am: df89996f6d am: d22f5a7bb2 Original change: https://android-review.googlesource.com/c/platform/external/lzma/+/1575760 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic794a1834730921b372210b07e1aa166e7249094
2021-02-04Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/lzma" am: 435ea22543 am: ↵Bob Badour
268b867a00 am: df89996f6d Original change: https://android-review.googlesource.com/c/platform/external/lzma/+/1575760 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I03c271b17ec07c6f8996e0d732f1104ecce5ed19
2021-02-04Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/lzma" am: 435ea22543 am: ↵Bob Badour
268b867a00 Original change: https://android-review.googlesource.com/c/platform/external/lzma/+/1575760 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5357c6b19642b7f11ade22b113164203a2c47603
2021-02-04Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/lzma" am: 435ea22543Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/lzma/+/1575760 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8f05245d814bdd32c4eeb9a25e37d8b4461d1359
2021-02-04Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/lzma"android-s-preview-1Bob Badour
2021-02-03[LSC] Add LOCAL_LICENSE_KINDS to external/lzmaBob Badour
Added legacy_unencumbered to: Android.bp C/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I07eec80ffc467160f75c91cf33f953782fea35e5
2020-11-24Mark ab/6881855 as merged am: 963d712248 am: 8b056f9530Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/lzma/+/13112846 Change-Id: I81d69af28089020f3e0b3ab9f9441d19436647b3
2020-11-24Mark ab/6881855 as merged am: 963d712248Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/lzma/+/13112846 Change-Id: I061bdba426828811c7f8afbc6a5aefde70814203
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: Iffe811c69ed12f0ee531182a41c99d1d4a5ca7cd
2020-11-12Merge "Add product_available to product available modules" am: 6ea060eab4 ↵Treehugger Robot
am: cc0746e09b am: c05433893d am: 3623e357ad Original change: https://android-review.googlesource.com/c/platform/external/lzma/+/1495998 Change-Id: Ie9a33067f4a150335dbf62f8cc69aadc3533ccdc
2020-11-12Merge "Add product_available to product available modules" am: 6ea060eab4 ↵Treehugger Robot
am: cc0746e09b am: c05433893d Original change: https://android-review.googlesource.com/c/platform/external/lzma/+/1495998 Change-Id: If1bee800d86925323ddf214b58921e8986210fe1
2020-11-12Merge "Add product_available to product available modules" am: 6ea060eab4 ↵Treehugger Robot
am: cc0746e09b Original change: https://android-review.googlesource.com/c/platform/external/lzma/+/1495998 Change-Id: I2c59477e0369362d0396d4be06586358b8490327
2020-11-12Merge "Add product_available to product available modules" am: 6ea060eab4Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/lzma/+/1495998 Change-Id: I51e6cb4880d15c5e203c9130e2cc0b6a209f2e76
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: If64600206609f00cbc29e7032c3008c30ff619ae
2020-10-29Merge "liblzma: make vendor_ramdisk_available." am: db6afe554c am: ↵Yifan Hong
f4761515a1 am: 343cbd6778 am: 1d7fba9684 Original change: https://android-review.googlesource.com/c/platform/external/lzma/+/1477218 Change-Id: I3453fcb71b6b1bff1a8642a933725391f028e34c
2020-10-29Merge "liblzma: make vendor_ramdisk_available." am: db6afe554c am: ↵Yifan Hong
f4761515a1 am: 343cbd6778 Original change: https://android-review.googlesource.com/c/platform/external/lzma/+/1477218 Change-Id: Id4bfb20d20f90f0861b6ecf581b58294e2738c55
2020-10-29Merge "liblzma: make vendor_ramdisk_available." am: db6afe554c am: f4761515a1Yifan Hong
Original change: https://android-review.googlesource.com/c/platform/external/lzma/+/1477218 Change-Id: Ic88b8b0280367eb5d01143e24dd70082fb63645f
2020-10-29Merge "liblzma: make vendor_ramdisk_available." am: db6afe554cYifan Hong
Original change: https://android-review.googlesource.com/c/platform/external/lzma/+/1477218 Change-Id: I845fc52b31513262916ed3fc85fda6484dc1deba
2020-10-29Merge "liblzma: make vendor_ramdisk_available."Yifan Hong
2020-10-27liblzma: make vendor_ramdisk_available.Yifan Hong
Test: builds Bug: 156098440 Change-Id: I1853806edf0be700bc568496c8d57844d1351e93
2020-10-23[automerger skipped] Merge "Rename ART release APEX to com.android.art." am: ↵Martin Stjernholm
d78aa75791 am: 2fed4cef17 am: 850b0464b9 am: 9943cff518 -s ours am skip reason: Change-Id I709cd4c76eebecd32e0a788fa9d6d256b8d40e47 with SHA-1 6e30d4fce7 is in history Original change: https://android-review.googlesource.com/c/platform/external/lzma/+/1456271 Change-Id: I2aa26eaabe8cf326e05add8ccaa2294c6e722d08
2020-10-23Merge "Rename ART release APEX to com.android.art." am: d78aa75791 am: ↵Martin Stjernholm
2fed4cef17 am: 850b0464b9 Original change: https://android-review.googlesource.com/c/platform/external/lzma/+/1456271 Change-Id: I3052a664527be74586682ddd315133daba097989
2020-10-23Merge "Rename ART release APEX to com.android.art." am: d78aa75791 am: ↵Martin Stjernholm
2fed4cef17 Original change: https://android-review.googlesource.com/c/platform/external/lzma/+/1456271 Change-Id: Ib35cd9c81dd7fc71437a022c4b9c791cb8ff9193
2020-10-23Merge "Rename ART release APEX to com.android.art." am: d78aa75791Martin Stjernholm
Original change: https://android-review.googlesource.com/c/platform/external/lzma/+/1456271 Change-Id: I17086d1249f62ee117a6a0f1f29c09e858e7f220
2020-10-23Merge "Rename ART release APEX to com.android.art."Martin Stjernholm
2020-10-19Rename ART release APEX to com.android.art.Martin Stjernholm
Test: See https://r.android.com/1457217 Bug: 169639321 Change-Id: I709cd4c76eebecd32e0a788fa9d6d256b8d40e47 Merged-In: I709cd4c76eebecd32e0a788fa9d6d256b8d40e47
2020-10-14Rename ART release APEX to com.android.art.Martin Stjernholm
Test: See https://r.android.com/1457217 Bug: 169639321 Change-Id: I709cd4c76eebecd32e0a788fa9d6d256b8d40e47 Merged-In: I709cd4c76eebecd32e0a788fa9d6d256b8d40e47
2020-09-13Set apex_available property am: c83537b439 am: 69ed0e13caJiyong Park
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/lzma/+/11297987 Change-Id: I4d0846cb87042e93c0297eb8c69a50f74ddad4d0
2020-05-16[automerger skipped] Merge "Set apex_available property" am: 678fe9907b am: ↵Jiyong Park
b320dbbac4 -s ours am: 8a3cc406ae -s ours am: 797d02c1af -s ours am: 109d782766 -s ours am skip reason: Change-Id Id68e7417f98307cbadea251f9e8a96b0697d8bec with SHA-1 c83537b439 is in history Change-Id: I8e30ed5ab834ace221688cfd1ce3218e57217f02
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-26 10:07:48 +0000