aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-03-15Clear apex.go entries for bluetooth libs am: d2693d5cef am: 9ae0647b00 am: ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32aml_go_odp_330912000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-mainline-go-adservices-releaseandroid13-frc-odp-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseWilliam Escande
a7165cbf9a Original change: https://android-review.googlesource.com/c/platform/external/libevent/+/2026266 Change-Id: I6c090a179daa463d2f71e98afef654de0355b2b6
2022-03-15Clear apex.go entries for bluetooth libs am: d2693d5cef am: 9ae0647b00William Escande
Original change: https://android-review.googlesource.com/c/platform/external/libevent/+/2026266 Change-Id: If194a8142ef26d30f8ca683fc06ea6c690650264
2022-03-15Clear apex.go entries for bluetooth libs am: d2693d5cefWilliam Escande
Original change: https://android-review.googlesource.com/c/platform/external/libevent/+/2026266 Change-Id: Ie25262a56d8c5feff58cf0f422310af08b396a39
2022-03-15Clear apex.go entries for bluetooth libsWilliam Escande
The module availability to Bluetooth is currently hard-coded in apex.go. We are in the process of cleaning the apex.go by adding the availability in each required module Test: Build + TH + boot phone & use bluetooth Bug: 216433795 Change-Id: I209b24a68da8c21f9eddb2518e57667b0d9bab79
2022-02-11[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8084891 am: 54e0e9a220 -s ours am: 04586e8add -s ours am skip reason: Merged-In I8c47d3d11c15125010aa4771be0abf205fd22ef6 with SHA-1 b6bd404f19 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libevent/+/16842975 Change-Id: Ibb30510632abd4229bb7cc420c2eaef241e3b88e
2022-02-11[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8084891 am: 54e0e9a220 -s ours am skip reason: Merged-In I8c47d3d11c15125010aa4771be0abf205fd22ef6 with SHA-1 b6bd404f19 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libevent/+/16842975 Change-Id: I23fc671c27dc38c9b8c4eb7c241ac23c52f59397
2022-02-11Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891Xin Li
Bug: 214455710 Merged-In: I8c47d3d11c15125010aa4771be0abf205fd22ef6 Change-Id: Ie5f878449ea2dc15fd57c1e58f17519a8075c227
2022-02-02Adding min_sdk_version to libevent required for bt apex am: 8dd4c4c4dc am: ↵Roopa Sattiraju
51f1c70f6b am: f054596f96 am: b8c23c29d3 Original change: https://android-review.googlesource.com/c/platform/external/libevent/+/1932217 Change-Id: I43508bbcd2a34c9bb4ed8fbfdff5c84543900245
2022-02-02Adding min_sdk_version to libevent required for bt apex am: 8dd4c4c4dc am: ↵Roopa Sattiraju
51f1c70f6b am: f054596f96 Original change: https://android-review.googlesource.com/c/platform/external/libevent/+/1932217 Change-Id: Iee9e4d0034c54e22be1530db8fed233c5a24b4df
2022-02-02Adding min_sdk_version to libevent required for bt apex am: 8dd4c4c4dc am: ↵Roopa Sattiraju
51f1c70f6b Original change: https://android-review.googlesource.com/c/platform/external/libevent/+/1932217 Change-Id: Ied3f9fbeeb53549cd1dd191d542a16ceb7fd6430
2022-02-02Adding min_sdk_version to libevent required for bt apex am: 8dd4c4c4dcRoopa Sattiraju
Original change: https://android-review.googlesource.com/c/platform/external/libevent/+/1932217 Change-Id: Id8edb9c3b40a5cc2ac83b36f18ce19f3a7e826d5
2022-02-01Adding min_sdk_version to libevent required for bt apexandroid-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Roopa Sattiraju
Bug: 206121418 Test: Compile Change-Id: Ib3cc790a8ed50df3f092d166cc4c95317e947738
2021-09-15Fix external/libevent compiling against musl am: b6bd404f19 am: a413947f3a ↵Colin Cross
am: 14a590a4e5 am: e05af653ec am: 7d030c89fb Original change: https://android-review.googlesource.com/c/platform/external/libevent/+/1826832 Change-Id: I0448efa2097ae68038da4d451eea9fdfbc4018c5
2021-09-15Fix external/libevent compiling against musl am: b6bd404f19 am: a413947f3a ↵Colin Cross
am: 14a590a4e5 am: e05af653ec Original change: https://android-review.googlesource.com/c/platform/external/libevent/+/1826832 Change-Id: Idd2c9749ed4c61cd625274a1ef6b04ab6cb88b23
2021-09-15Fix external/libevent compiling against musl am: b6bd404f19 am: a413947f3a ↵Colin Cross
am: 14a590a4e5 Original change: https://android-review.googlesource.com/c/platform/external/libevent/+/1826832 Change-Id: I6085904be14f75deee8304310176882de9b87649
2021-09-14Fix external/libevent compiling against musl am: b6bd404f19 am: a413947f3aColin Cross
Original change: https://android-review.googlesource.com/c/platform/external/libevent/+/1826832 Change-Id: Idd5c793f042137b2e82ce57cf6402f6c5eebc6fd
2021-09-14Fix external/libevent compiling against musl am: b6bd404f19android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Colin Cross
Original change: https://android-review.googlesource.com/c/platform/external/libevent/+/1826832 Change-Id: I184266ceb2cf604c74c1b8ebb22df79660faa4cb
2021-09-14Fix external/libevent compiling against muslColin Cross
Unset EVENT__HAVE_SYS_SYSCTL_H when compiling against musl. Bug: 190084016 Test: m USE_HOST_MUSL=true Change-Id: I8c47d3d11c15125010aa4771be0abf205fd22ef6
2021-07-07[automerger skipped] Revert "Add ramdisk_available to init_first_stage's ↵Inseob Kim
deps" am: f4db89ce07 am: f3b58a6f53 -s ours am: 359fb7ec1e -s ours am skip reason: Merged-In I044a075b7f8faf75e3ff8ef25ae01afc2aac5a32 with SHA-1 03001bd1cf is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libevent/+/15167750 Change-Id: I9a77d8ecc91df262ae570d1340a34a20f5e3e0c5
2021-07-07[automerger skipped] Revert "Add ramdisk_available to init_first_stage's ↵Inseob Kim
deps" am: f4db89ce07 -s ours am: 554553dddb -s ours am: 703f9fa38e -s ours am skip reason: Merged-In I044a075b7f8faf75e3ff8ef25ae01afc2aac5a32 with SHA-1 03001bd1cf is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libevent/+/15167750 Change-Id: Ib0608af7d2a96ca3b04c76786e24eb05050e90af
2021-07-07[automerger skipped] Revert "Add ramdisk_available to init_first_stage's ↵Inseob Kim
deps" am: f4db89ce07 am: f3b58a6f53 -s ours am skip reason: Merged-In I044a075b7f8faf75e3ff8ef25ae01afc2aac5a32 with SHA-1 03001bd1cf is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/external/libevent/+/15067035 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libevent/+/15167750 Change-Id: I44dec1091eeb540b349df90141ad1202defead2b
2021-07-07[automerger skipped] Revert "Add ramdisk_available to init_first_stage's ↵Inseob Kim
deps" am: f4db89ce07 -s ours am: 554553dddb -s ours am skip reason: Merged-In I044a075b7f8faf75e3ff8ef25ae01afc2aac5a32 with SHA-1 03001bd1cf is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libevent/+/15167750 Change-Id: I340a87643a550f8912e21cf1cee4d21c49318430
2021-07-07[automerger skipped] Revert "Add ramdisk_available to init_first_stage's ↵Inseob Kim
deps" am: f4db89ce07 am: eaeb173c22 -s ours am skip reason: Merged-In I044a075b7f8faf75e3ff8ef25ae01afc2aac5a32 with SHA-1 03001bd1cf is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/external/libevent/+/15067035 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libevent/+/15167750 Change-Id: I9042cfe71f4722140746e7c75f8268948ed87f8d
2021-07-07Revert "Add ramdisk_available to init_first_stage's deps" am: f4db89ce07android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseInseob Kim
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libevent/+/15167750 Change-Id: Ie9bcc008f498cdac3fe3f7518cc1924cefe6e413
2021-07-07Revert "Add ramdisk_available to init_first_stage's deps" am: f4db89ce07android-mainline-12.0.0_r99android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r49android-mainline-12.0.0_r122android-mainline-12.0.0_r100android12-mainline-networkstack-releaseInseob Kim
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libevent/+/15167750 Change-Id: I59a753b882ef8a6d75c846e8e4f4019b035c07bb
2021-07-07[automerger skipped] Revert "Add ramdisk_available to init_first_stage's ↵Inseob Kim
deps" am: f4db89ce07 -s ours am skip reason: Merged-In I044a075b7f8faf75e3ff8ef25ae01afc2aac5a32 with SHA-1 03001bd1cf is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/external/libevent/+/15067035 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libevent/+/15167750 Change-Id: Ib9f2fdabadb7a3d0b0e84eb03e3efb93d81baf7b
2021-07-01Revert "Add ramdisk_available to init_first_stage's deps"android-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_r16android12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devInseob Kim
Revert "Add ramdisk_available to init_first_stage's deps" Revert "Add ramdisk_available to init_first_stage's deps" Revert "Completely migrate init first stage to Soong" Revert "Add ramdisk_available to init_first_stage's deps" Revert "Add ramdisk_available to init_first_stage's deps" Revert "Add ramdisk_available to init_first_stage's deps" Revert "Add ramdisk_available to init_first_stage's deps" Revert "Add ramdisk_available to init_first_stage's deps" Revert "Add ramdisk_available to init_first_stage's deps" Revert "Add ramdisk_available to init_first_stage's deps" Revert "Update init_first_stage" Revert "Add ramdisk_available to init_first_stage's deps" Revert "Add ramdisk_available to init_first_stage's deps" Revert "Add BOARD_BUILD_SYSTEM_ROOT_IMAGE to config vars" Revert "Add install_in_root to cc_binary" Revert "Add ramdisk_available to init_first_stage's deps" Revert submission 15071196-init_first_stage_soong Reason for revert: fixes b/192248690 Reverted Changes: I23cf4f975:Add ramdisk_available to init_first_stage's deps Icd98c7e24:Add ramdisk_available to init_first_stage's deps If9da9ba16:Add ramdisk_available to init_first_stage's deps Ibc8668029:Add ramdisk_available to init_first_stage's deps I3b4b8c475:Add ramdisk_available to init_first_stage's deps I59cd149e0:Completely migrate init first stage to Soong I36d789578:Add ramdisk_available to init_first_stage's deps I2a0daa612:Add BUILD_USES_RECOVERY_AS_BOOT to soong config Ic76c325ce:Directly create ramdisk dirs in ramdisk image rule... I4c5374deb:Add BOARD_BUILD_SYSTEM_ROOT_IMAGE to config vars I8aab5faf3:Add ramdisk_available to init_first_stage's deps I9d5a10661:Add ramdisk_available to init_first_stage's deps Iaa2edeb4a:Add ramdisk_available to init_first_stage's deps I7cb582ca0:Update init_first_stage I06091d15e:Add ramdisk_available to init_first_stage's deps I8bdb8dda3:Add ramdisk_available to init_first_stage's deps I7436b8dd1:Add ramdisk_available to init_first_stage's deps I39693fd86:Add ramdisk_available to init_first_stage's deps I0a9ba90f0:Add ramdisk_available to init_first_stage's deps Ib66b4c4ea:Add ramdisk_available to init_first_stage's deps I31ce63d23:Add ramdisk_available to init_first_stage's deps Icb580f97c:Add ramdisk_available to init_first_stage's deps I044a075b7:Add ramdisk_available to init_first_stage's deps I33164a7e7:Fix ndk and aml arch order Ib8d92904a:Add ramdisk_available to sysprop_library Ibc3516453:Add install_in_root to cc_binary Change-Id: I9e196414b025d00c062e0af093ec507ff507b3cf
2021-06-25[automerger skipped] Add ramdisk_available to init_first_stage's deps am: ↵Inseob Kim
019e3d06ad am: b590067966 -s ours am: ffd8856850 -s ours am skip reason: Merged-In I044a075b7f8faf75e3ff8ef25ae01afc2aac5a32 with SHA-1 019e3d06ad is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libevent/+/15067035 Change-Id: Idfb812e04330195a4ab34a4a078bf64453eedf24
2021-06-25[automerger skipped] Add ramdisk_available to init_first_stage's deps am: ↵Inseob Kim
019e3d06ad -s ours am: 54a8c028f8 -s ours am: 09ae10ee94 -s ours am skip reason: Merged-In I044a075b7f8faf75e3ff8ef25ae01afc2aac5a32 with SHA-1 03001bd1cf is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libevent/+/15067035 Change-Id: Ie906487e0ae42429a83abf25e04e3782365cdf65
2021-06-24[automerger skipped] Add ramdisk_available to init_first_stage's deps am: ↵Inseob Kim
019e3d06ad am: b590067966 -s ours am skip reason: Merged-In I044a075b7f8faf75e3ff8ef25ae01afc2aac5a32 with SHA-1 019e3d06ad is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libevent/+/15067035 Change-Id: If5efb993c739293f815798aa6a4db32ac37c93ff
2021-06-24[automerger skipped] Add ramdisk_available to init_first_stage's deps am: ↵Inseob Kim
019e3d06ad am: 47fec838b9 -s ours am skip reason: Merged-In I044a075b7f8faf75e3ff8ef25ae01afc2aac5a32 with SHA-1 03001bd1cf is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libevent/+/15067035 Change-Id: I6981dd6fe7f7a5d614a2b9b1aea8a3e1a7876d0d
2021-06-24[automerger skipped] Add ramdisk_available to init_first_stage's deps am: ↵Inseob Kim
019e3d06ad -s ours am: 54a8c028f8 -s ours am skip reason: Merged-In I044a075b7f8faf75e3ff8ef25ae01afc2aac5a32 with SHA-1 03001bd1cf is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libevent/+/15067035 Change-Id: Ice44549fe01b9d352c011ec3055367bf656cbe76
2021-06-24Add ramdisk_available to init_first_stage's deps am: 019e3d06adInseob Kim
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libevent/+/15067035 Change-Id: Icb063de2fdc71140eac5d41e5848e217d4c32cb6
2021-06-24Add ramdisk_available to init_first_stage's deps am: 019e3d06adInseob Kim
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libevent/+/15067035 Change-Id: I0642a4014496fdf0b28dd43acbbb0d0c9d41d5ff
2021-06-24[automerger skipped] Add ramdisk_available to init_first_stage's deps am: ↵Inseob Kim
019e3d06ad -s ours am skip reason: Merged-In I044a075b7f8faf75e3ff8ef25ae01afc2aac5a32 with SHA-1 03001bd1cf is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libevent/+/15067035 Change-Id: I93d15e3c51b6592da2fd621e192156b44189db67
2021-06-23Add ramdisk_available to init_first_stage's depsInseob Kim
Bug: 187196593 Test: boot Change-Id: I044a075b7f8faf75e3ff8ef25ae01afc2aac5a32 Merged-In: I044a075b7f8faf75e3ff8ef25ae01afc2aac5a32
2021-06-18Add ramdisk_available to init_first_stage's deps am: 03001bd1cf am: ↵Inseob Kim
99e17c9b83 am: 9c03bbca68 am: d4b179834c Original change: https://android-review.googlesource.com/c/platform/external/libevent/+/1736435 Change-Id: Id1b314ec15051e4a97d6e9a8ae8967bce68a433d
2021-06-18Add ramdisk_available to init_first_stage's deps am: 03001bd1cf am: ↵Inseob Kim
99e17c9b83 am: 9c03bbca68 Original change: https://android-review.googlesource.com/c/platform/external/libevent/+/1736435 Change-Id: Idfad4a3040b72b3f8e144dc89fd92bb1a504387f
2021-06-18Add ramdisk_available to init_first_stage's deps am: 03001bd1cf am: 99e17c9b83Inseob Kim
Original change: https://android-review.googlesource.com/c/platform/external/libevent/+/1736435 Change-Id: Id3b9b5afd225491169a9bb96855a87c5f22aef71
2021-06-18Add ramdisk_available to init_first_stage's deps am: 03001bd1cfInseob Kim
Original change: https://android-review.googlesource.com/c/platform/external/libevent/+/1736435 Change-Id: Ibfc2d754d1bb1e1c3876401be5ea1fbe0562b0c3
2021-06-14Add ramdisk_available to init_first_stage's depsandroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Inseob Kim
Bug: 187196593 Test: boot Change-Id: I044a075b7f8faf75e3ff8ef25ae01afc2aac5a32
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I776dea3fa7106a356b05023fb19584ed210832ea
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 7d1bddd463 -s ↵Xin Li
ours am: e4b033b2e6 -s ours am: 48cd89513d -s ours am skip reason: Change-Id I2a4f30fe4ca7cb6b5198efcb0592abd8851c9d8a with SHA-1 45f25be7ae is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iee62a9361fcca7c1b230a941cf21d58d7b05ab57
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 7d1bddd463 -s ↵Xin Li
ours am: e4b033b2e6 -s ours am: 48cd89513d -s ours am skip reason: Change-Id I2a4f30fe4ca7cb6b5198efcb0592abd8851c9d8a with SHA-1 45f25be7ae is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I498a26f52dfb4d7b333b98b8cee812f5ef426c86
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 7d1bddd463 -s ↵Xin Li
ours am: e4b033b2e6 -s ours am skip reason: Change-Id I2a4f30fe4ca7cb6b5198efcb0592abd8851c9d8a with SHA-1 45f25be7ae is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I540fe3380f0e8f4653df0ce3c28afef2e09ac59d
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 7d1bddd463 -s oursXin Li
am skip reason: Change-Id I2a4f30fe4ca7cb6b5198efcb0592abd8851c9d8a with SHA-1 45f25be7ae is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7af7d5a47a4dd02d619dafe0e1b5dd83912a3449
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-2android-s-beta-1Xin Li
Bug: 180401296 Merged-In: I2a4f30fe4ca7cb6b5198efcb0592abd8851c9d8a Change-Id: Icf4999e6fd871ac60c1d5df4d992be370f452f95
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/libevent am: 9f370cf3dc am: ↵Bob Badour
82681c6886 am: 1397c6dbdb am: 0607ef6dd0 Original change: https://android-review.googlesource.com/c/platform/external/libevent/+/1588939 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4c7140cc010a8958676edacfd9dcba5a1a10c91d
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/libevent am: 9f370cf3dc am: ↵Bob Badour
82681c6886 am: 1397c6dbdb am: 0607ef6dd0 Original change: https://android-review.googlesource.com/c/platform/external/libevent/+/1588939 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idabb05d2b56e9dce2878903c905dc6174de331a8
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/libevent am: 9f370cf3dc am: ↵Bob Badour
82681c6886 am: 1397c6dbdb Original change: https://android-review.googlesource.com/c/platform/external/libevent/+/1588939 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If837c86aee6d3cfb00596cea7d6795ffb4077585