StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
56,968 Commits 1 Branch 0 Tags
eab1f7027a39fde7df48ced005d234cc3b10d0dd
Commit Graph

56968 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kousik Kumar
eab1f7027a [automerger skipped] [RESTRICT AUTOMERGE] Cleanup RBE logs directory am: 29cbe14265 am: 905d2ed5d7 -s ours am: f75e6a131b -s ours am: 29781b6a41 -s ours am: cd597c12df -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I979b2c1885082e4a03fa347ea370998c98d416f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 19:53:51 +00:00
Kousik Kumar
bf4202fd26 [automerger skipped] Pass along local resource fraction to reproxy am: dbc313375a am: 3f87c8cd8b am: 60b79a39f5 -s ours am: 7e0aec24ac -s ours am: 6a567774f8 -s ours 
am skip reason: Merged-In I118bc10109f5a55df7a6c1ecd79499320055f2ed with SHA-1 dbc313375a is already in history

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

Change-Id: Icead1d71afb0805b17b1dd5c608d8e80c9e4e450
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 19:51:57 +00:00
Kousik Kumar
360c0ebbbb [automerger skipped] Do not dump metrics if reproxy was never started am: 5990257d46 am: 1145dd81a7 am: f3d2edfd4b -s ours am: b107bfb634 -s ours am: 85ae909053 -s ours 
am skip reason: Merged-In Ic3403331e1f4ac2c7c72fd9169aa7b82a7545c75 with SHA-1 5990257d46 is already in history

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

Change-Id: I72273846e4fe2d5bc972f8fe38a1a3a55e4cc4de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 19:50:02 +00:00
Kousik Kumar
0e9fb73a80 [automerger skipped] [RESTRICT AUTOMERGE] Cleanup RBE logs directory am: 29cbe14265 am: b8a8d8bb2c -s ours am: a63d2406a6 -s ours am: faf05d15a1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If9543311ff0b9b1b95821435ed32a4800e684505
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 19:48:05 +00:00
Kousik Kumar
a4ae4e02db [automerger skipped] Pass along local resource fraction to reproxy am: dbc313375a am: 0db3027fb7 -s ours am: 1a3e516781 -s ours am: 0f808bb577 -s ours 
am skip reason: Merged-In I118bc10109f5a55df7a6c1ecd79499320055f2ed with SHA-1 35faaef43e is already in history

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

Change-Id: I43185b0fe8a1c75540ddd93b107555d190578e07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 19:46:09 +00:00
Kousik Kumar
31cc63d868 [automerger skipped] Do not dump metrics if reproxy was never started am: 5990257d46 am: 24a39050fd -s ours am: 3b3b252748 -s ours am: 446732fa22 -s ours 
am skip reason: Merged-In Ic3403331e1f4ac2c7c72fd9169aa7b82a7545c75 with SHA-1 a1d8fa9961 is already in history

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

Change-Id: I50a473697ea55ccff93c9561b073a6e9fb934666
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 19:42:07 +00:00
Kousik Kumar
cd597c12df [automerger skipped] [RESTRICT AUTOMERGE] Cleanup RBE logs directory am: 29cbe14265 am: 905d2ed5d7 -s ours am: f75e6a131b -s ours am: 29781b6a41 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3d81d14d47afaaebd68b599bd0e642ffe3118c7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 18:48:40 +00:00
Kousik Kumar
6a567774f8 [automerger skipped] Pass along local resource fraction to reproxy am: dbc313375a am: 3f87c8cd8b am: 60b79a39f5 -s ours am: 7e0aec24ac -s ours 
am skip reason: Merged-In I118bc10109f5a55df7a6c1ecd79499320055f2ed with SHA-1 dbc313375a is already in history

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

Change-Id: Ia535fefa283ec41b568f9a5375a9c0e9a8164671
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 18:48:35 +00:00
Kousik Kumar
85ae909053 [automerger skipped] Do not dump metrics if reproxy was never started am: 5990257d46 am: 1145dd81a7 am: f3d2edfd4b -s ours am: b107bfb634 -s ours 
am skip reason: Merged-In Ic3403331e1f4ac2c7c72fd9169aa7b82a7545c75 with SHA-1 5990257d46 is already in history

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

Change-Id: I7bfd461c344f0a3257b6f5671c086369d2fa69c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 18:48:31 +00:00
Kousik Kumar
faf05d15a1 [automerger skipped] [RESTRICT AUTOMERGE] Cleanup RBE logs directory am: 29cbe14265 am: b8a8d8bb2c -s ours am: a63d2406a6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I70c2e081988142eb3b95312c52bc9267a1c89408
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 18:48:24 +00:00
Kousik Kumar
0f808bb577 [automerger skipped] Pass along local resource fraction to reproxy am: dbc313375a am: 0db3027fb7 -s ours am: 1a3e516781 -s ours 
am skip reason: Merged-In I118bc10109f5a55df7a6c1ecd79499320055f2ed with SHA-1 35faaef43e is already in history

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

Change-Id: I932ee0671a5b2268b9282ba505aca6b1eb8dc9a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 18:48:20 +00:00
Kousik Kumar
446732fa22 [automerger skipped] Do not dump metrics if reproxy was never started am: 5990257d46 am: 24a39050fd -s ours am: 3b3b252748 -s ours 
am skip reason: Merged-In Ic3403331e1f4ac2c7c72fd9169aa7b82a7545c75 with SHA-1 a1d8fa9961 is already in history

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

Change-Id: I9eb116d54aac7a4a3d4712e74e10a04ce4fb2b96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 18:48:00 +00:00
Kousik Kumar
29781b6a41 [automerger skipped] [RESTRICT AUTOMERGE] Cleanup RBE logs directory am: 29cbe14265 am: 905d2ed5d7 -s ours am: f75e6a131b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5990530f2640d3c27a25d000d1f013d076ae7393
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 18:46:27 +00:00
Kousik Kumar
7e0aec24ac [automerger skipped] Pass along local resource fraction to reproxy am: dbc313375a am: 3f87c8cd8b am: 60b79a39f5 -s ours 
am skip reason: Merged-In I118bc10109f5a55df7a6c1ecd79499320055f2ed with SHA-1 dbc313375a is already in history

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

Change-Id: Id20bee6da04d47e745789cf85ba6be85be04427e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 18:46:21 +00:00
Kousik Kumar
b107bfb634 [automerger skipped] Do not dump metrics if reproxy was never started am: 5990257d46 am: 1145dd81a7 am: f3d2edfd4b -s ours 
am skip reason: Merged-In Ic3403331e1f4ac2c7c72fd9169aa7b82a7545c75 with SHA-1 5990257d46 is already in history

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

Change-Id: If4f3a1c4d04a2cf8d19b4a7fe82fe830fee576d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 18:46:13 +00:00
Kousik Kumar
f75e6a131b [automerger skipped] [RESTRICT AUTOMERGE] Cleanup RBE logs directory am: 29cbe14265 am: 905d2ed5d7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9554aa900081e0d20dcb5c78b79d60e9d32591a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 18:29:55 +00:00
Kousik Kumar
60b79a39f5 Pass along local resource fraction to reproxy am: dbc313375a am: 3f87c8cd8b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049588

Change-Id: I79014a559f1c48fb34cc62381dc95ca763a0b672
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 18:29:49 +00:00
Kousik Kumar
a63d2406a6 [automerger skipped] [RESTRICT AUTOMERGE] Cleanup RBE logs directory am: 29cbe14265 am: b8a8d8bb2c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib02db70a8e86da04606f418952a027f798563708
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 18:29:42 +00:00
Kousik Kumar
1a3e516781 [automerger skipped] Pass along local resource fraction to reproxy am: dbc313375a am: 0db3027fb7 -s ours 
am skip reason: Merged-In I118bc10109f5a55df7a6c1ecd79499320055f2ed with SHA-1 35faaef43e is already in history

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

Change-Id: Id2282f6f1150c29c6297c216181ccd933e8e9c28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 18:29:35 +00:00
Kousik Kumar
f3d2edfd4b Do not dump metrics if reproxy was never started am: 5990257d46 am: 1145dd81a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049587

Change-Id: Ibdf61b445a1b6b11fb81a8021945e0a849a97a6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 18:29:33 +00:00
Kousik Kumar
3b3b252748 [automerger skipped] Do not dump metrics if reproxy was never started am: 5990257d46 am: 24a39050fd -s ours 
am skip reason: Merged-In Ic3403331e1f4ac2c7c72fd9169aa7b82a7545c75 with SHA-1 a1d8fa9961 is already in history

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

Change-Id: I2325c832ab78efcd40b779f665f239ed26baa8d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 18:29:25 +00:00
Kousik Kumar
905d2ed5d7 [RESTRICT AUTOMERGE] Cleanup RBE logs directory am: 29cbe14265 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049589

Change-Id: Ia42f4c8b6e36db233e4dbdb660ef7bc6db8d7933
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 18:03:26 +00:00
Kousik Kumar
3f87c8cd8b Pass along local resource fraction to reproxy am: dbc313375a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049588

Change-Id: Ife8306fa56df31d9c023436d32765fbe14fbff22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 18:03:11 +00:00
Kousik Kumar
1145dd81a7 Do not dump metrics if reproxy was never started am: 5990257d46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049587

Change-Id: I814eaefcad669f9dcdf723e857815cbfa1c44ff7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 18:02:56 +00:00
Kousik Kumar
b8a8d8bb2c [RESTRICT AUTOMERGE] Cleanup RBE logs directory am: 29cbe14265 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049589

Change-Id: I0124f015b9c9d1abc829b54fb29549599d58b0df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 18:02:24 +00:00
Kousik Kumar
0db3027fb7 Pass along local resource fraction to reproxy am: dbc313375a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049588

Change-Id: If103a5d9b9d2a8e544d7aab8b6120fd6dad190a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 18:02:09 +00:00
Kousik Kumar
24a39050fd Do not dump metrics if reproxy was never started am: 5990257d46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049587

Change-Id: I1e87a465acf447336183df58ffb2c4e21371fcb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 18:01:54 +00:00
TreeHugger Robot
a5728bfcda Merge "Move embedded notice file path above aapt rule generation" into tm-dev am: 8378feda12 am: eeaa35e781 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049995

Change-Id: I77ca19aafe163c40a20beb8a0124d4b1fafd98d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 20:25:58 +00:00
TreeHugger Robot
eeaa35e781 Merge "Move embedded notice file path above aapt rule generation" into tm-dev am: 8378feda12 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19049995

Change-Id: I290be083c6b14006c51123d73beecaefcead5ce1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 20:08:57 +00:00
TreeHugger Robot
8378feda12 Merge "Move embedded notice file path above aapt rule generation" into tm-dev 2022-06-23 19:39:53 +00:00
Kousik Kumar
29cbe14265 [RESTRICT AUTOMERGE] Cleanup RBE logs directory 
RBE logs directory is currently messy:
1. We use RBE_output_dir variable to specify where rbe_metrics.txt /
   rbe_metrics.pb file should go to.
2. We use proxy_log_dir to specify where *.rpl / *.rpi (detailed per
   action info log file) should go to.
3. We use RBE_log_dir to specify where reproxy.* / bootstrap.* log files
   should go to.

Ideally, all RBE related logs should go to one single directory. In this
CL, I'm creating a temporary log directory under out/soong/.temp/rbe/
where all RBE related log files per build would go to. The log dir
prefix is also being set to the same prefix as the socket address file.

Test: Ran a sample build with `m libc` and ensured that logs are getting
cleared across rebuilds and that `rbe_metrics.pb` file is properly
generated and being copied to the right location (i.e., from
out/soong/.temp/rbe/<rand> to out/ dir)

Bug: b/233382420
Bug: b/236909178
Bug: b/235861862

Merged-In: I46bd38d50419cb9e54e8202d24222979e47ff5ca
Change-Id: I46bd38d50419cb9e54e8202d24222979e47ff5ca
 2022-06-23 18:27:29 +00:00
Colin Cross
3d6cfd14d3 Move embedded notice file path above aapt rule generation 
The embedded notice file generation for apps was moved below the aapt
rules, which meant the added asset path was ignored.  Move the code
to pick the notice file path selection back above the aapt rules,
and leave the code to generate the notice file rule where it is.

Bug: 236006463
Test: m NetworkStack ALWAYS_EMBED_NOTICES=true
Change-Id: I1421fb0dbcdb759281259abfae7bddc9aecdaa56
Merged-in: I1421fb0dbcdb759281259abfae7bddc9aecdaa56
 2022-06-23 18:05:09 +00:00
Kousik Kumar
dbc313375a Pass along local resource fraction to reproxy 
Reproxy should be respecting the -j value set by the user and not be
doing excessive local executions assuming the whole machine is available
to it. The local_resource_fraction flag is a way to ensure reproxy
consumes CPU only upto the -j value specified by the user.

Test:
1. Ran with `USE_RBE=true m -j 10 nothing` and local_resource_fraction
was set to 0.14 on a 72-core workstation.
2. Ran with `USE_RBE=true m nothing` and local_resource_fraction was set
to 1.0 on a 72-core machine.

Bug: b/207296459
Bug: b/236909178
Bug: b/235861862

Merged-In: I118bc10109f5a55df7a6c1ecd79499320055f2ed
Change-Id: I118bc10109f5a55df7a6c1ecd79499320055f2ed
 2022-06-23 15:33:19 +00:00
Kousik Kumar
5990257d46 Do not dump metrics if reproxy was never started 
Dumping of RBE metrics should only happen when reproxy was started.
Reproxy is started only when Soong is run in make / build mode and not
in dumpvars mode.

Doc: https://docs.google.com/document/d/1Iqhu5QgozB_rA9fucMHO6X4U6A8e8qFtZyub9j83ICQ/edit#
Test: Ran a build with / without RBE. No metrics dumped during lunch
without RBE and metrics dumping worked as expected with RBE.

Bug: b/197213143
Bug: b/236909178
Bug: b/235861862

Merged-In: Ic3403331e1f4ac2c7c72fd9169aa7b82a7545c75
Change-Id: Ic3403331e1f4ac2c7c72fd9169aa7b82a7545c75
 2022-06-23 15:32:49 +00:00
Oriol Prieto Gascó
7b8cb64821 Merge "Hard-code apex_available handling for the btservices apex" into tm-dev am: 3bb9d7a8d9 am: bb63423da1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18972588

Change-Id: I0686fb0a9f7b4fe48558b63ef49988f23fee0add
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 18:12:30 +00:00
Oriol Prieto Gascó
bb63423da1 Merge "Hard-code apex_available handling for the btservices apex" into tm-dev am: 3bb9d7a8d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18972588

Change-Id: I8510160598d10eafc035a8b1a4c3c1f29a2a4566
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 17:45:18 +00:00
Oriol Prieto Gascó
3bb9d7a8d9 Merge "Hard-code apex_available handling for the btservices apex" into tm-dev 2022-06-22 17:18:45 +00:00
Kousik Kumar
4c3a4adf5f [automerger skipped] [RESTRICT AUTOMERGE] Fix ioutil import in sc-dev branch am: de3a770705 -s ours am: 6c856a571d -s ours am: da8fdd57ce -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibde4006c32e5ee16dfbd1c1af5d546c6c0f84e66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 16:39:12 +00:00
Kousik Kumar
da8fdd57ce [automerger skipped] [RESTRICT AUTOMERGE] Fix ioutil import in sc-dev branch am: de3a770705 -s ours am: 6c856a571d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I96eb85a1c209f1cd89a7de41b7e028cd33fcb4f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 16:13:20 +00:00
Kousik Kumar
6c856a571d [automerger skipped] [RESTRICT AUTOMERGE] Fix ioutil import in sc-dev branch am: de3a770705 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I15c5427826443309b7a4896080411dc8885dcf73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 15:54:41 +00:00
Kousik Kumar
de3a770705 [RESTRICT AUTOMERGE] Fix ioutil import in sc-dev branch 
Looks like the change from rvc-dev (https://googleplex-android-review.git.corp.google.com/c/platform/build/soong/+/18971604),
when merged into sc-dev removes the ioutil import which is actually
being used.

Test: Ran a build and made sure Soong bootstrap works.

Bug: b/236642556
Change-Id: I2b85b7f4787ec2df5082ebfc969887495763aa3b
(cherry picked from commit 4a31fb1004)
 2022-06-21 13:16:53 +00:00
Kousik Kumar
1f6e846ca1 [automerger skipped] [RESTRICT AUTOMERGE] Fix ioutil import in sc-dev branch am: 4a31fb1004 am: cda87b8dbc -s ours am: 82f4566bf7 -s ours am: d449cd0adf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9e1dca3c0576f24aaf322cf02b690ccdb8a292c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 05:21:19 +00:00
Kousik Kumar
e0089c7bef [automerger skipped] [RESTRICT AUTOMERGE] Fix ioutil import in sc-dev branch am: 4a31fb1004 am: c7b2310e73 -s ours am: cf811d7266 -s ours am: dd0d2f58f2 -s ours am: 4fb7980f3f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4d93a9ffdffea10f9dcafcee656f726b2a9fa5b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 05:21:14 +00:00
Kousik Kumar
d449cd0adf [automerger skipped] [RESTRICT AUTOMERGE] Fix ioutil import in sc-dev branch am: 4a31fb1004 am: cda87b8dbc -s ours am: 82f4566bf7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I082eb660a3cbad694e38c0e5747cec91a8fe9d34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 05:02:51 +00:00
Kousik Kumar
4fb7980f3f [automerger skipped] [RESTRICT AUTOMERGE] Fix ioutil import in sc-dev branch am: 4a31fb1004 am: c7b2310e73 -s ours am: cf811d7266 -s ours am: dd0d2f58f2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie4f8d0c0aadfbace35edcb954fc82c5577583a1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 05:02:45 +00:00
Kousik Kumar
82f4566bf7 [automerger skipped] [RESTRICT AUTOMERGE] Fix ioutil import in sc-dev branch am: 4a31fb1004 am: cda87b8dbc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id729f9873fa8c38767e48381dcdc8979347b13f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 04:48:21 +00:00
Kousik Kumar
dd0d2f58f2 [automerger skipped] [RESTRICT AUTOMERGE] Fix ioutil import in sc-dev branch am: 4a31fb1004 am: c7b2310e73 -s ours am: cf811d7266 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idce8cae9949a3ab989287b0b07fd6f5693bc7581
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 04:43:19 +00:00
Kousik Kumar
cf811d7266 [automerger skipped] [RESTRICT AUTOMERGE] Fix ioutil import in sc-dev branch am: 4a31fb1004 am: c7b2310e73 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id2ed4f0d7487dc5bc3321ad0b4bc9322c5c134fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 04:27:48 +00:00
Kousik Kumar
c7b2310e73 [RESTRICT AUTOMERGE] Fix ioutil import in sc-dev branch am: 4a31fb1004 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19003520

Change-Id: I33fbfb6e9f6792065e8c51b98bb1892a6bd1cad1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 03:59:36 +00:00
Kousik Kumar
cda87b8dbc [RESTRICT AUTOMERGE] Fix ioutil import in sc-dev branch am: 4a31fb1004 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19003520

Change-Id: I19063b62540e12d6bf51571250fccf124bac3e8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 03:58:33 +00:00