summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2022-03-09Merge "Snap for 8277062 from 6cb79dee0c4cfc5acfc2bfd48be5a676f58efb92 to ↵caf/aosp-new/gki13-boot-releaseAndroid Build Coastguard Worker1-1/+1
gki13-boot-release" into gki13-boot-release
2022-03-09Snap for 8277062 from 6cb79dee0c4cfc5acfc2bfd48be5a676f58efb92 to ↵Android Build Coastguard Worker1-1/+1
gki13-boot-release Change-Id: Idb20f99c2fdd0e38bf6cf2b637b643dc16dd65e6
2022-03-08Merge "Move comment to license_note"caf/aosp-new/masterTreehugger Robot1-1/+1
2022-03-08Merge "Snap for 8269078 from 60ae554353e4b96677f67324d130eb271f679591 to ↵Android Build Coastguard Worker0-0/+0
gki13-boot-release" into gki13-boot-release
2022-03-08Snap for 8269078 from 60ae554353e4b96677f67324d130eb271f679591 to ↵Android Build Coastguard Worker0-0/+0
gki13-boot-release Change-Id: I1bdc3cdf9c94a7fef2c55073740723c6dfbd0102
2022-03-03Move comment to license_noteBob Badour1-1/+1
Comments not preserved during refresh. Test: m nothing Change-Id: I99e93202c263092fc5d1447d6a698bcac6656446
2022-02-11Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891Xin Li0-0/+0
Bug: 214455710 Merged-In: Ifbf3fa74207a5e6d23eba4806a9aec05cba44e95 Change-Id: I9b3b6019a4fab4740c2ecb2690572327f1dac092
2022-01-24Merge "Adding bt apex to lib required by it" am: 1523bc6d1aRoopa Sattiraju1-0/+2
Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1932109 Change-Id: Ic1c5b75f7bab8d1c1b463c8f1bb1cd2563226dec
2022-01-24Merge "Adding bt apex to lib required by it"android-t-preview-2android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1caf/aosp-new/android-t-preview-1caf/aosp-new/android-s-v2-beta-3caf/aosp-new/android-s-qpr3-beta-1Roopa Sattiraju1-0/+2
2022-01-13Merge "Update cpe for vulnerability scanners" am: bde6e2aac1 am: 7e9be661ce ↵Elliott Hughes1-0/+3
am: 616a75ed35 Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1914287 Change-Id: I6a7dfdca445f3c4758966d446e6e43872e6ac46c
2022-01-13Merge "Update cpe for vulnerability scanners" am: bde6e2aac1 am: 7e9be661ceElliott Hughes1-0/+3
Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1914287 Change-Id: Id25b2bdc323fdcf3f6286eafc0410e939b6bc726
2022-01-13Merge "Update cpe for vulnerability scanners" am: bde6e2aac1Elliott Hughes1-0/+3
Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1914287 Change-Id: Ib570d27b8096d1398a8002cdb84794ead4537734
2022-01-13Merge "Update cpe for vulnerability scanners"Elliott Hughes1-0/+3
2022-01-12Update cpe for vulnerability scannersMaria Uretsky1-0/+3
Bug: http://b/201572953 Change-Id: Ifbf3fa74207a5e6d23eba4806a9aec05cba44e95
2021-12-22Adding bt apex to lib required by itRoopa Sattiraju1-0/+2
Bug: 206121418 Test: Compiles against internal-master and aosp Change-Id: I39321f4edca53e0c5b98c222824730255db785e9
2021-12-16Merge "Renamed bluetooth apex name to com.android.bluetooth" am: e420fd085e ↵Etienne Ruffieux1-2/+2
am: b8d4028dec am: 171dbead43 Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1924423 Change-Id: I96aafb19f2fa68b92b79f39b98a4a07b896a7cad
2021-12-16Merge "Renamed bluetooth apex name to com.android.bluetooth" am: e420fd085e ↵Etienne Ruffieux1-2/+2
am: b8d4028dec Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1924423 Change-Id: Ide1fed8b27c3f6f2a7af4f0d78a54346326baf73
2021-12-16Merge "Renamed bluetooth apex name to com.android.bluetooth" am: e420fd085eEtienne Ruffieux1-2/+2
Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1924423 Change-Id: I82dd64b3c7f7dc07ec2d0e6ef5dfcf1132e9c1b5
2021-12-16Merge "Renamed bluetooth apex name to com.android.bluetooth"Etienne Ruffieux1-2/+2
2021-12-15Renamed bluetooth apex name to com.android.bluetoothEtienne Ruffieux1-2/+2
Tag: #feature Bug: 206614050 Test: Compiles Change-Id: Ieb03a907ba39b58ef012adb1927c967bcd4e684a
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 46f474a606 -s ours am: ↵Xin Li0-0/+0
5e101ce78f -s ours am: 903d9d0dc1 -s ours am: 5264103c44 -s ours am skip reason: Merged-In Ieab4bfb42317700fa96365e42e4df09dcd2929bf with SHA-1 a755076076 is already in history Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1847208 Change-Id: Icaf737a231f60be994eea9894b9277073c093333
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 46f474a606 -s ours am: ↵Xin Li0-0/+0
5e101ce78f -s ours am: 903d9d0dc1 -s ours am skip reason: Merged-In Ieab4bfb42317700fa96365e42e4df09dcd2929bf with SHA-1 a755076076 is already in history Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1847208 Change-Id: If6ffdf6a3f8db07df4e9f759f38e0734e95c8e65
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 46f474a606 -s ours am: ↵Xin Li0-0/+0
5e101ce78f -s ours am skip reason: Merged-In Ieab4bfb42317700fa96365e42e4df09dcd2929bf with SHA-1 a755076076 is already in history Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1847208 Change-Id: I802f3344d4d5362f8a8fbc7fc360aead0e3a7a35
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 46f474a606 -s oursXin Li0-0/+0
am skip reason: Merged-In Ieab4bfb42317700fa96365e42e4df09dcd2929bf with SHA-1 a755076076 is already in history Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1847208 Change-Id: Ide8b031764a11130158da3cb508535ddc1931dfa
2021-10-07Merge "Merge Android 12"android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2caf/aosp-new/android-s-v2-preview-1Xin Li2-2/+50
2021-10-06Merge Android 12Xin Li2-2/+50
Bug: 202323961 Merged-In: Ieab4bfb42317700fa96365e42e4df09dcd2929bf Change-Id: Ic45e5b928636cf2ea9bc96b06a9cb1ecf17f84d1
2021-09-25Merge "Remove external/protobuf/.gitmodules and submodule directories" am: ↵Treehugger Robot3-0/+0
850c0d04cb am: a755076076 am: 272fedad91 am: cee762521f Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1830605 Change-Id: I9ec936a42c868c1ac473b74fd398a2dddfc2e383
2021-09-25Merge "Remove external/protobuf/.gitmodules and submodule directories" am: ↵Treehugger Robot3-0/+0
850c0d04cb am: a755076076 am: 272fedad91 Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1830605 Change-Id: Ifd19a29bc59034e49eb1f4a4fceb125a6adee386
2021-09-25Merge "Remove external/protobuf/.gitmodules and submodule directories" am: ↵Treehugger Robot3-0/+0
850c0d04cb am: a755076076 Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1830605 Change-Id: I09c2e3d35686bd8401bd7e10e9a791547ce043d6
2021-09-25Merge "Remove external/protobuf/.gitmodules and submodule directories" am: ↵Treehugger Robot3-0/+0
850c0d04cb Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1830605 Change-Id: Ieab4bfb42317700fa96365e42e4df09dcd2929bf
2021-09-24Merge "Remove external/protobuf/.gitmodules and submodule directories"Treehugger Robot3-0/+0
2021-09-24Remove external/protobuf/.gitmodules and submodule directoriesRaman Tenneti3-0/+0
Android doesn't support .gitmodules in external directory. Bug: 152899985 Test: Presubmit-Verify Change-Id: Iee741eb576083e49931519ba68e238141e1f1049
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li0-0/+0
8f4acf9548 -s ours am: c03fe8cf8d -s ours am: ff981a3d21 -s ours am skip reason: Merged-In I6ad4a635e495c8142d4c55146a87968361f0913f with SHA-1 8c5cddaf70 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/15571707 Change-Id: I9439f184d47d5b699c5ecfba625736fd1eb60110
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li0-0/+0
8f4acf9548 -s ours am: c03fe8cf8d -s ours am skip reason: Merged-In I6ad4a635e495c8142d4c55146a87968361f0913f with SHA-1 8c5cddaf70 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/15571707 Change-Id: I0c82b2d35fca7d8d2e6561892ffe84a6990b638e
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li0-0/+0
8f4acf9548 -s ours am skip reason: Merged-In I6ad4a635e495c8142d4c55146a87968361f0913f with SHA-1 8c5cddaf70 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/15571707 Change-Id: Ib11abe78f3c293790a64d35204c59a163c645f93
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622Xin Li2-2/+50
Merged-In: I6ad4a635e495c8142d4c55146a87968361f0913f Change-Id: I274372773c340f41dc99299a97132d44ea6375bd
2021-07-07[automerger skipped] Merge "Revert "Add ramdisk_available to ↵TreeHugger Robot0-0/+0
init_first_stage's deps"" into sc-dev am: 6821054858 am: 6dc46cc0d0 -s ours am skip reason: Merged-In Icb580f97c313753d3ad9b63d5f7c6d668e66467c with SHA-1 c14eaf4996 is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/15067036 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/15167749 Change-Id: Idbe85d02a1dd2a6aa8b9293932dce8bb467edcd9
2021-07-07[automerger skipped] Merge "Revert "Add ramdisk_available to ↵TreeHugger Robot0-0/+0
init_first_stage's deps"" into sc-dev am: 6821054858 -s ours am: 8c5cddaf70 -s ours am skip reason: Merged-In Icb580f97c313753d3ad9b63d5f7c6d668e66467c with SHA-1 c14eaf4996 is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/15167749 Change-Id: I6161a87740c909a072f26f5caae4836f83e38054
2021-07-07Merge "Revert "Add ramdisk_available to init_first_stage's deps"" into ↵caf/aosp-new/android12L-devTreeHugger Robot1-1/+0
sc-dev am: 6821054858 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/15167749 Change-Id: If5ac0249100ac9c45dc27678e8525abec721511b
2021-07-07[automerger skipped] Merge "Revert "Add ramdisk_available to ↵TreeHugger Robot0-0/+0
init_first_stage's deps"" into sc-dev am: 6821054858 -s ours am skip reason: Merged-In Icb580f97c313753d3ad9b63d5f7c6d668e66467c with SHA-1 c14eaf4996 is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/15067036 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/15167749 Change-Id: I6ad4a635e495c8142d4c55146a87968361f0913f
2021-07-07Merge "Revert "Add ramdisk_available to init_first_stage's deps"" into sc-devandroid-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_r16LA.AU.1.4.1.r1-00400-sa8155.0LA.AU.0.3.1.r2-06900-gen3meta.0LA.AU.0.3.1.r2-06700-gen3meta.0caf/refs/tags/android-12.0.0_r16caf/automotive-aosp.lnx.5.0.r1-relcaf/aosp-new/android12-qpr1-releasecaf/aosp-new/android12-qpr1-d-s3-releasecaf/aosp-new/android12-qpr1-d-s2-releasecaf/aosp-new/android12-qpr1-d-s1-releasecaf/aosp-new/android12-qpr1-d-releasecaf/aosp-new/android12-devTreeHugger Robot1-1/+0
2021-07-01Revert "Add ramdisk_available to init_first_stage's deps"Inseob Kim1-1/+0
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: Ic3f93815ee30bf7c351cb935867f80bb82d683e1
2021-06-28Merge "Allow AppSearch's icing library access to libprotobuf." into sc-dev ↵Alexander Dorokhine0-0/+0
am: 504342b7c3 am: ad146b244a Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/15031541 Change-Id: Id0c64a19c41f591b2691c57462cbf279406e332b
2021-06-28Merge "Allow AppSearch's icing library access to libprotobuf." into sc-dev ↵Alexander Dorokhine1-0/+1
am: 504342b7c3 am: 8b8c2d6a55 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/15031541 Change-Id: Ic5151dac926b411eee61ec98d446207a3a24fc24
2021-06-28Merge "Allow AppSearch's icing library access to libprotobuf." into sc-dev ↵Alexander Dorokhine1-0/+1
am: 504342b7c3 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/15031541 Change-Id: Ic66532378705eae9c9822ac0e343278593b19331
2021-06-28Merge "Allow AppSearch's icing library access to libprotobuf." into sc-dev ↵Alexander Dorokhine1-0/+1
am: 504342b7c3 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/15031541 Change-Id: I2fc8b4d2d2ae303c2268611976f3d982690fb0a8
2021-06-28Merge "Allow AppSearch's icing library access to libprotobuf." into sc-devAlexander Dorokhine1-0/+1
2021-06-24[automerger skipped] Add ramdisk_available to init_first_stage's deps am: ↵Inseob Kim0-0/+0
b1bf82938f am: c297f02082 -s ours am skip reason: Merged-In Icb580f97c313753d3ad9b63d5f7c6d668e66467c with SHA-1 b1bf82938f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/15067036 Change-Id: I829b674a342f7988acff5edfdaee166b6cd15e29
2021-06-24[automerger skipped] Add ramdisk_available to init_first_stage's deps am: ↵Inseob Kim0-0/+0
b1bf82938f -s ours am: 83ecf6cc24 -s ours am skip reason: Merged-In Icb580f97c313753d3ad9b63d5f7c6d668e66467c with SHA-1 c14eaf4996 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/15067036 Change-Id: I52f4fb2c7e810761fc5c5d818674d6ec2413abd6
2021-06-24Add ramdisk_available to init_first_stage's deps am: b1bf82938fInseob Kim1-0/+1
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/15067036 Change-Id: I9b85eaea94112c213a38c77435ea9b33298c88f7