Commit Graph

89050 Commits

Author SHA1 Message Date
Treehugger Robot
d2e6018e93 Merge "Handle zip64 extra fields better" am: 57c1aa7b16 am: 5c3a34b358 am: acddbb78de am: dab757ddc2
Original change: https://android-review.googlesource.com/c/platform/build/+/2628431

Change-Id: Ia478128cca52fc024365f22d163dedc2799368ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-18 01:31:21 +00:00
Treehugger Robot
dab757ddc2 Merge "Handle zip64 extra fields better" am: 57c1aa7b16 am: 5c3a34b358 am: acddbb78de
Original change: https://android-review.googlesource.com/c/platform/build/+/2628431

Change-Id: I40f8a83bcd76d49a4512f3f26079442696e07fc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-18 00:45:05 +00:00
Treehugger Robot
acddbb78de Merge "Handle zip64 extra fields better" am: 57c1aa7b16 am: 5c3a34b358
Original change: https://android-review.googlesource.com/c/platform/build/+/2628431

Change-Id: I6b5cf8f14df5c1999bbd5a4eab80abf25bd8e829
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-17 23:56:26 +00:00
Treehugger Robot
5c3a34b358 Merge "Handle zip64 extra fields better" am: 57c1aa7b16
Original change: https://android-review.googlesource.com/c/platform/build/+/2628431

Change-Id: Ieefcc8ee08c2d91f447fc5209967d43db7454c75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-17 23:04:21 +00:00
Treehugger Robot
57c1aa7b16 Merge "Handle zip64 extra fields better" 2023-06-17 22:12:26 +00:00
Kelvin Zhang
1e774245a4 Handle zip64 extra fields better
Test: check_target_files_signatures
Bug: 283033491
Change-Id: I7da89f8389c09cc99201cff342483c158bd7e9c1
2023-06-17 09:21:46 -07:00
Wei Li
d263695cd4 Include static libraries information in Android SBOM.
Bug: 280852724
Test: CIs
Test: lunch aosp_cf_x86_64_phone-userdebug && m sbom
Change-Id: Ie2365d79ba24910b7ace132b578589be10a17d78
2023-06-16 23:02:09 -07:00
Treehugger Robot
9068a500d1 Merge "Use patch instead of git apply." am: 0d2d11bc00 am: 251eac36ab am: c3afc51e86 am: 4b6b6f95d2 am: e32a687708
Original change: https://android-review.googlesource.com/c/platform/build/+/2627735

Change-Id: Ibc3cf01446e208aaba3ca946897a3ba18f75e555
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-17 05:47:30 +00:00
Treehugger Robot
e32a687708 Merge "Use patch instead of git apply." am: 0d2d11bc00 am: 251eac36ab am: c3afc51e86 am: 4b6b6f95d2
Original change: https://android-review.googlesource.com/c/platform/build/+/2627735

Change-Id: I6f4d9f931c5028665a93cf5af6ed2b51e3411d20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-17 05:06:33 +00:00
Treehugger Robot
4b6b6f95d2 Merge "Use patch instead of git apply." am: 0d2d11bc00 am: 251eac36ab am: c3afc51e86
Original change: https://android-review.googlesource.com/c/platform/build/+/2627735

Change-Id: I6db10d07636ab82de5b9366f4687b94713472b4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-17 04:19:12 +00:00
Treehugger Robot
c3afc51e86 Merge "Use patch instead of git apply." am: 0d2d11bc00 am: 251eac36ab
Original change: https://android-review.googlesource.com/c/platform/build/+/2627735

Change-Id: I8d3d026100c25303bfa196efcbcafd4860e26e5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-17 03:31:04 +00:00
Treehugger Robot
251eac36ab Merge "Use patch instead of git apply." am: 0d2d11bc00
Original change: https://android-review.googlesource.com/c/platform/build/+/2627735

Change-Id: Ia63a8d9eb8877d763bcfee18beedba41d775c481
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-17 02:49:12 +00:00
Treehugger Robot
0d2d11bc00 Merge "Use patch instead of git apply." 2023-06-17 01:56:52 +00:00
Treehugger Robot
79b5bc2b9b Merge "aconfig: change java flag method name to camelCase" am: 59d662524c am: bec4ce710f am: 9c7c5dabaa am: cdfd8e3f4f am: 41b8aa0805
Original change: https://android-review.googlesource.com/c/platform/build/+/2626776

Change-Id: I209b10615081b97e5b001d02436fefc2d8828559
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-17 01:35:54 +00:00
Treehugger Robot
41b8aa0805 Merge "aconfig: change java flag method name to camelCase" am: 59d662524c am: bec4ce710f am: 9c7c5dabaa am: cdfd8e3f4f
Original change: https://android-review.googlesource.com/c/platform/build/+/2626776

Change-Id: I730d882a0fa34f59f69a369615d7cd8c691f0f7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-17 00:55:59 +00:00
Treehugger Robot
cdfd8e3f4f Merge "aconfig: change java flag method name to camelCase" am: 59d662524c am: bec4ce710f am: 9c7c5dabaa
Original change: https://android-review.googlesource.com/c/platform/build/+/2626776

Change-Id: I5158885f1f8dc25a166c4f06ced7940663fe0042
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-17 00:09:54 +00:00
Treehugger Robot
9c7c5dabaa Merge "aconfig: change java flag method name to camelCase" am: 59d662524c am: bec4ce710f
Original change: https://android-review.googlesource.com/c/platform/build/+/2626776

Change-Id: I371b95a00f483f2a30ccc6e67cb3ffb7c332dccd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 23:23:39 +00:00
Treehugger Robot
bec4ce710f Merge "aconfig: change java flag method name to camelCase" am: 59d662524c
Original change: https://android-review.googlesource.com/c/platform/build/+/2626776

Change-Id: I7d5747d6a4a33f6b49e2c13f06bf539c71c324ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 22:41:03 +00:00
Treehugger Robot
59d662524c Merge "aconfig: change java flag method name to camelCase" 2023-06-16 21:49:22 +00:00
Gabriel Biren
fdcf16f55c Add rule to convert WIFI_FEATURE_IMU_DETECTION
to the equivalent soong variable.

Bug: 287607876
Test: Manual test - add a log message to wifi_ext that
       only prints if the proper flag is enabled.
       Check whether the log is displayed, both before
       and after this change.
Change-Id: Id9bfc81384384b915e9772a2016a9843a57897db
2023-06-16 21:11:10 +00:00
Alex Buynytskyy
bce1a51df8 Use patch instead of git apply.
Bug: 281682520
Test: run locally
Change-Id: Ia84055b7a9074836c6d7b3039ba980e39043a41e
2023-06-16 20:23:36 +00:00
Zhi Dou
af81e20653 aconfig: change java flag method name to camelCase
Before java code will directly use the flag name as the method name.
This change adds funciton to try the best to convert flag name to
camelCase, and then use the camelCase string as the method name in the
generated code.

Bug: 279483816
Test: atest aconfig.test aconfig.test.java
Change-Id: I45fc6df46c9d535cd38a657a41313202f9b660af
2023-06-16 12:40:40 +00:00
Lokesh Kumar Goel
5f04423ae5 [automerger skipped] Update Security String to 2023-08-01 am: 85adf2e404 am: e4e40fc164 am: bd58a9d5b7 am: 6e8c32b58f -s ours am: fa43562ebf -s ours am: 846336796d -s ours am: d6b38eb87a -s ours am: 04737c1d11 -s ours am: 5b0c29645f -s ours am: 08f34fc2a9 -s ours am: d7b3cf92ce -s ours
am skip reason: Merged-In Iec37a521c10365635950d6646f57153e7d3e3794 with SHA-1 ba70ed836e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554873

Change-Id: I20cd9407bb157045a22da9a75b616e46d9d6e6c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 11:39:51 +00:00
Lokesh Kumar Goel
abece25595 [automerger skipped] Update Security String to 2023-08-01 am: 85adf2e404 am: e4e40fc164 am: bd58a9d5b7 am: 6e8c32b58f -s ours am: fa43562ebf -s ours am: 846336796d -s ours am: 4c0aa1fcfb -s ours am: 431c2eb92d -s ours am: 3b9c69cc58 -s ours am: 449955ea03 -s ours
am skip reason: Merged-In Iec37a521c10365635950d6646f57153e7d3e3794 with SHA-1 ba70ed836e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554873

Change-Id: Ic28aee99f1fa383cb75507b5c081879bbcc1b7e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 11:39:41 +00:00
Lokesh Kumar Goel
8382efdace [automerger skipped] Update Security String to 2023-08-01 am: 85adf2e404 am: e4e40fc164 am: bd58a9d5b7 am: 6e8c32b58f -s ours am: fa43562ebf -s ours am: 846336796d -s ours am: d6b38eb87a -s ours am: 04737c1d11 -s ours am: 54123493ce -s ours am: adc2eeef42 -s ours am: 63d1d05594 -s ours
am skip reason: Merged-In Iec37a521c10365635950d6646f57153e7d3e3794 with SHA-1 ba70ed836e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554873

Change-Id: I47add0150ea32634b63c1ee1604d7a93549382bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 11:34:46 +00:00
Lokesh Kumar Goel
17a5b42bcd [automerger skipped] Update Security String to 2023-08-01 am: 85adf2e404 am: e4e40fc164 am: bd58a9d5b7 am: 6e8c32b58f -s ours am: fa43562ebf -s ours am: 846336796d -s ours am: d6b38eb87a -s ours am: 04737c1d11 -s ours am: 5b0c29645f -s ours am: 4e63f2b640 -s ours am: cf3b177882 -s ours
am skip reason: Merged-In Iec37a521c10365635950d6646f57153e7d3e3794 with SHA-1 ba70ed836e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554873

Change-Id: I643cfc6575aadf15b5d85a7d1dbe5711e52a08f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 11:34:37 +00:00
Lokesh Kumar Goel
37dd38d9c5 [automerger skipped] Update Security String to 2023-08-01 am: 85adf2e404 am: e4e40fc164 am: bd58a9d5b7 am: 6e8c32b58f -s ours am: fa43562ebf -s ours am: 846336796d -s ours am: 4c0aa1fcfb -s ours am: 431c2eb92d -s ours am: 3ed3ad5a4e -s ours am: 41ab00377a -s ours
am skip reason: Merged-In Iec37a521c10365635950d6646f57153e7d3e3794 with SHA-1 ba70ed836e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554873

Change-Id: I2b9d6ba7bfb21f8850bd261319824bff86488370
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 11:34:29 +00:00
Lokesh Kumar Goel
03e313eade [automerger skipped] Update Security String to 2023-08-01 am: 85adf2e404 am: e4e40fc164 am: bd58a9d5b7 am: 6e8c32b58f -s ours am: fa43562ebf -s ours am: 846336796d -s ours am: d6b38eb87a -s ours am: 04737c1d11 -s ours am: 5b0c29645f -s ours am: 08f34fc2a9 -s ours am: bc88588196 -s ours
am skip reason: Merged-In Iec37a521c10365635950d6646f57153e7d3e3794 with SHA-1 ba70ed836e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554873

Change-Id: I3a579557dc1b573f329f0de9e933c17ab6a7812b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 11:34:20 +00:00
Lokesh Kumar Goel
e1c27ab7ff [automerger skipped] Update Security String to 2023-08-01 am: 85adf2e404 am: e4e40fc164 am: bd58a9d5b7 am: 6e8c32b58f -s ours am: fa43562ebf -s ours am: 846336796d -s ours am: 4c0aa1fcfb -s ours am: 431c2eb92d -s ours am: 3b9c69cc58 -s ours am: 4a83346975 -s ours
am skip reason: Merged-In Iec37a521c10365635950d6646f57153e7d3e3794 with SHA-1 ba70ed836e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554873

Change-Id: Ie26f56ff067a9bc26db5a3f45a08c237dff41f1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 11:33:57 +00:00
Lokesh Kumar Goel
63d1d05594 [automerger skipped] Update Security String to 2023-08-01 am: 85adf2e404 am: e4e40fc164 am: bd58a9d5b7 am: 6e8c32b58f -s ours am: fa43562ebf -s ours am: 846336796d -s ours am: d6b38eb87a -s ours am: 04737c1d11 -s ours am: 54123493ce -s ours am: adc2eeef42 -s ours
am skip reason: Merged-In Iec37a521c10365635950d6646f57153e7d3e3794 with SHA-1 ba70ed836e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554873

Change-Id: I9a31d27936ac982b870691f7463ab659e3be999f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 10:55:01 +00:00
Lokesh Kumar Goel
cf3b177882 [automerger skipped] Update Security String to 2023-08-01 am: 85adf2e404 am: e4e40fc164 am: bd58a9d5b7 am: 6e8c32b58f -s ours am: fa43562ebf -s ours am: 846336796d -s ours am: d6b38eb87a -s ours am: 04737c1d11 -s ours am: 5b0c29645f -s ours am: 4e63f2b640 -s ours
am skip reason: Merged-In Iec37a521c10365635950d6646f57153e7d3e3794 with SHA-1 ba70ed836e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554873

Change-Id: Ia9df8786615ff4bc160aa3342102206934ddf986
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 10:54:53 +00:00
Lokesh Kumar Goel
41ab00377a [automerger skipped] Update Security String to 2023-08-01 am: 85adf2e404 am: e4e40fc164 am: bd58a9d5b7 am: 6e8c32b58f -s ours am: fa43562ebf -s ours am: 846336796d -s ours am: 4c0aa1fcfb -s ours am: 431c2eb92d -s ours am: 3ed3ad5a4e -s ours
am skip reason: Merged-In Iec37a521c10365635950d6646f57153e7d3e3794 with SHA-1 ba70ed836e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554873

Change-Id: I991598e843cc23f47d8c70d142b4d97719c9dbeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 10:54:14 +00:00
Lokesh Kumar Goel
d7b3cf92ce [automerger skipped] Update Security String to 2023-08-01 am: 85adf2e404 am: e4e40fc164 am: bd58a9d5b7 am: 6e8c32b58f -s ours am: fa43562ebf -s ours am: 846336796d -s ours am: d6b38eb87a -s ours am: 04737c1d11 -s ours am: 5b0c29645f -s ours am: 08f34fc2a9 -s ours
am skip reason: Merged-In Iec37a521c10365635950d6646f57153e7d3e3794 with SHA-1 ba70ed836e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554873

Change-Id: I2cf1e7c3527d85dd7463398d5d96c754613aa2ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 10:53:58 +00:00
Lokesh Kumar Goel
449955ea03 [automerger skipped] Update Security String to 2023-08-01 am: 85adf2e404 am: e4e40fc164 am: bd58a9d5b7 am: 6e8c32b58f -s ours am: fa43562ebf -s ours am: 846336796d -s ours am: 4c0aa1fcfb -s ours am: 431c2eb92d -s ours am: 3b9c69cc58 -s ours
am skip reason: Merged-In Iec37a521c10365635950d6646f57153e7d3e3794 with SHA-1 ba70ed836e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554873

Change-Id: I5779e2493e32f3f9ae86c1326ea76d3375a72c51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 10:53:51 +00:00
Lokesh Kumar Goel
adc2eeef42 [automerger skipped] Update Security String to 2023-08-01 am: 85adf2e404 am: e4e40fc164 am: bd58a9d5b7 am: 6e8c32b58f -s ours am: fa43562ebf -s ours am: 846336796d -s ours am: d6b38eb87a -s ours am: 04737c1d11 -s ours am: 54123493ce -s ours
am skip reason: Merged-In Iec37a521c10365635950d6646f57153e7d3e3794 with SHA-1 ba70ed836e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554873

Change-Id: I6015515c65fec9e12b7420f035efc9027b522f88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 10:53:39 +00:00
Lokesh Kumar Goel
bc88588196 [automerger skipped] Update Security String to 2023-08-01 am: 85adf2e404 am: e4e40fc164 am: bd58a9d5b7 am: 6e8c32b58f -s ours am: fa43562ebf -s ours am: 846336796d -s ours am: d6b38eb87a -s ours am: 04737c1d11 -s ours am: 5b0c29645f -s ours am: 08f34fc2a9 -s ours
am skip reason: Merged-In Iec37a521c10365635950d6646f57153e7d3e3794 with SHA-1 ba70ed836e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554873

Change-Id: Ibff719ae3056c2a82012c69072ea41ff1b060856
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 10:49:52 +00:00
Lokesh Kumar Goel
4a83346975 [automerger skipped] Update Security String to 2023-08-01 am: 85adf2e404 am: e4e40fc164 am: bd58a9d5b7 am: 6e8c32b58f -s ours am: fa43562ebf -s ours am: 846336796d -s ours am: 4c0aa1fcfb -s ours am: 431c2eb92d -s ours am: 3b9c69cc58 -s ours
am skip reason: Merged-In Iec37a521c10365635950d6646f57153e7d3e3794 with SHA-1 ba70ed836e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554873

Change-Id: I29ec65419b082f3e8c2f5f5874699ac044482519
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 10:49:42 +00:00
Lokesh Kumar Goel
4e63f2b640 [automerger skipped] Update Security String to 2023-08-01 am: 85adf2e404 am: e4e40fc164 am: bd58a9d5b7 am: 6e8c32b58f -s ours am: fa43562ebf -s ours am: 846336796d -s ours am: d6b38eb87a -s ours am: 04737c1d11 -s ours am: 5b0c29645f -s ours
am skip reason: Merged-In Iec37a521c10365635950d6646f57153e7d3e3794 with SHA-1 ba70ed836e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554873

Change-Id: Icf08f27421123b36009560f94a05908816ac9baf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 10:26:53 +00:00
Lokesh Kumar Goel
08f34fc2a9 [automerger skipped] Update Security String to 2023-08-01 am: 85adf2e404 am: e4e40fc164 am: bd58a9d5b7 am: 6e8c32b58f -s ours am: fa43562ebf -s ours am: 846336796d -s ours am: d6b38eb87a -s ours am: 04737c1d11 -s ours am: 5b0c29645f -s ours
am skip reason: Merged-In Iec37a521c10365635950d6646f57153e7d3e3794 with SHA-1 ba70ed836e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554873

Change-Id: Ied02b78c3c2dcf6bcab5f2bbfca8d5441390b400
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 10:08:49 +00:00
Lokesh Kumar Goel
3b9c69cc58 [automerger skipped] Update Security String to 2023-08-01 am: 85adf2e404 am: e4e40fc164 am: bd58a9d5b7 am: 6e8c32b58f -s ours am: fa43562ebf -s ours am: 846336796d -s ours am: 4c0aa1fcfb -s ours am: 431c2eb92d -s ours
am skip reason: Merged-In Iec37a521c10365635950d6646f57153e7d3e3794 with SHA-1 ba70ed836e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554873

Change-Id: Ib525a7351c6582090ae803e3d39147ae91c7e85d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 10:08:26 +00:00
Lokesh Kumar Goel
5b0c29645f [automerger skipped] Update Security String to 2023-08-01 am: 85adf2e404 am: e4e40fc164 am: bd58a9d5b7 am: 6e8c32b58f -s ours am: fa43562ebf -s ours am: 846336796d -s ours am: d6b38eb87a -s ours am: 04737c1d11 -s ours
am skip reason: Merged-In Iec37a521c10365635950d6646f57153e7d3e3794 with SHA-1 ba70ed836e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554873

Change-Id: Ibb5969e8c28d6e2c6858351408b54264b9d1b9da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 10:06:49 +00:00
Lokesh Kumar Goel
54123493ce [automerger skipped] Update Security String to 2023-08-01 am: 85adf2e404 am: e4e40fc164 am: bd58a9d5b7 am: 6e8c32b58f -s ours am: fa43562ebf -s ours am: 846336796d -s ours am: d6b38eb87a -s ours am: 04737c1d11 -s ours
am skip reason: Merged-In Iec37a521c10365635950d6646f57153e7d3e3794 with SHA-1 ba70ed836e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554873

Change-Id: I7ccfbb2bdd07af0317f12eedd615040aa3ede87f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 10:04:41 +00:00
Lokesh Kumar Goel
3ed3ad5a4e [automerger skipped] Update Security String to 2023-08-01 am: 85adf2e404 am: e4e40fc164 am: bd58a9d5b7 am: 6e8c32b58f -s ours am: fa43562ebf -s ours am: 846336796d -s ours am: 4c0aa1fcfb -s ours am: 431c2eb92d -s ours
am skip reason: Merged-In Iec37a521c10365635950d6646f57153e7d3e3794 with SHA-1 ba70ed836e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554873

Change-Id: I90ddda99c90ac0aca12205d57c08759c5fb55f8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 10:04:20 +00:00
Jooyung Han
6fcee699c4 Merge "Remove --blkid_path argument" am: e4635b3e04 am: 4941f6fd47 am: da705680d7 am: db9d2f09b7 am: 48f01e183b
Original change: https://android-review.googlesource.com/c/platform/build/+/2624574

Change-Id: Ib4fe57f91482ab00297d98765e15fdbfca11a014
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 10:03:53 +00:00
Lokesh Kumar Goel
04737c1d11 [automerger skipped] Update Security String to 2023-08-01 am: 85adf2e404 am: e4e40fc164 am: bd58a9d5b7 am: 6e8c32b58f -s ours am: fa43562ebf -s ours am: 846336796d -s ours am: d6b38eb87a -s ours
am skip reason: Merged-In Iec37a521c10365635950d6646f57153e7d3e3794 with SHA-1 ba70ed836e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554873

Change-Id: I39edfd1ead48eb174013e8258cf000fe428522c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 09:24:43 +00:00
Jooyung Han
48f01e183b Merge "Remove --blkid_path argument" am: e4635b3e04 am: 4941f6fd47 am: da705680d7 am: db9d2f09b7
Original change: https://android-review.googlesource.com/c/platform/build/+/2624574

Change-Id: I9fc71d6857f566186a1151fe29058e4348123e05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 09:24:09 +00:00
Lokesh Kumar Goel
431c2eb92d [automerger skipped] Update Security String to 2023-08-01 am: 85adf2e404 am: e4e40fc164 am: bd58a9d5b7 am: 6e8c32b58f -s ours am: fa43562ebf -s ours am: 846336796d -s ours am: 4c0aa1fcfb -s ours
am skip reason: Merged-In Iec37a521c10365635950d6646f57153e7d3e3794 with SHA-1 ba70ed836e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554873

Change-Id: I03c759ff22c0ab31fd21e54906dfd47023478a21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 09:22:03 +00:00
Lokesh Kumar Goel
d6b38eb87a [automerger skipped] Update Security String to 2023-08-01 am: 85adf2e404 am: e4e40fc164 am: bd58a9d5b7 am: 6e8c32b58f -s ours am: fa43562ebf -s ours am: 846336796d -s ours
am skip reason: Merged-In Iec37a521c10365635950d6646f57153e7d3e3794 with SHA-1 ba70ed836e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554873

Change-Id: I53c1a42baef3d8ca94b676db965461e7281f923d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 08:39:56 +00:00
Lokesh Kumar Goel
4c0aa1fcfb [automerger skipped] Update Security String to 2023-08-01 am: 85adf2e404 am: e4e40fc164 am: bd58a9d5b7 am: 6e8c32b58f -s ours am: fa43562ebf -s ours am: 846336796d -s ours
am skip reason: Merged-In Iec37a521c10365635950d6646f57153e7d3e3794 with SHA-1 ba70ed836e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554873

Change-Id: I79531bd248fabea1eed319426345682de012f676
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 08:39:10 +00:00
Jooyung Han
db9d2f09b7 Merge "Remove --blkid_path argument" am: e4635b3e04 am: 4941f6fd47 am: da705680d7
Original change: https://android-review.googlesource.com/c/platform/build/+/2624574

Change-Id: Idebb626816eebee2f789ec7d372a0a016d192ea9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 08:36:48 +00:00