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

56819 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Ferris
3c0ae3317e Add ability to force compile as 64 bit. 
When trying to build a single 64 bit and 32 bit image, there are
a few executables that are prefer32. When set, this will force all
of those targets to be compiled as 64 bit.

Bug: 229787331

Test: With this option, drmserver/mediaserver are built as 64 bit.
Test: Without this option, drmserver/mediaserver are built as 32 bit.
Change-Id: I1c3dbe229f9b612ff76b857ca7163b14e7dc92c5
Merged-In: I1c3dbe229f9b612ff76b857ca7163b14e7dc92c5
 2022-07-15 08:10:05 +00:00
Paul Duffin
89b8970a37 Merge "Stop exporting systemserverclasspath_fragment when targeting S" into tm-dev am: 0147aca453 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19135262

Change-Id: Ie87896cff0db031d20089bf879898f5382d0458b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-07 17:22:59 +00:00
Paul Duffin
0147aca453 Merge "Stop exporting systemserverclasspath_fragment when targeting S" into tm-dev 2022-07-07 17:03:51 +00:00
Kousik Kumar
470f93047d [automerger skipped] [RESTRICT AUTOMERGE] Cleanup RBE logs directory am: 040867f3b8 -s ours am: 33cc93f02f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I030a835ef661f120aea45cb2affe21f369cb7cc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 21:36:19 +00:00
Kousik Kumar
33cc93f02f [automerger skipped] [RESTRICT AUTOMERGE] Cleanup RBE logs directory am: 040867f3b8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I662d4c403ec76097fafa6b4be2fe89dcb3ac7f8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 21:16:51 +00:00
Paul Duffin
b0c28d63d6 Stop exporting systemserverclasspath_fragment when targeting S 
Previously, when targeting the S release the generated sdk snapshot
would contain prebuilt_systemserverclasspath_fragment modules even
though they were only added in T.

This allows SdkMemberTypes to specify the set of target build releases
they support and ignores them when targeting an unsupported target
build release.

The Merged-In value was chosen to prevent this from being merged into
branches where it will conflict due to https://r.android.com/2105804.
That will allow this change to be submitted in tm-dev before it is
submitted in AOSP.

Test: m nothing
      packages/modules/common/build/mainline_modules_sdks.sh
      # Check that the for-S-build snapshots do not include SSCPFs.
Bug: 237718221
Change-Id: I2df08c2fcebf9b866695d691572a9d3783758b17
Merged-In: Ib6d1b72bc8399fbb39075494ae37da92f4b28d03
 2022-07-05 14:48:09 +00:00
TreeHugger Robot
014e5a2d11 [automerger skipped] Merge "Cleanup RBE logs directory" into tm-dev am: 4f7e82f1ce -s ours 
am skip reason: Merged-In I46bd38d50419cb9e54e8202d24222979e47ff5ca with SHA-1 29cbe14265 is already in history

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

Change-Id: I4cc854af8abe2033c5976c9eb4c2957b8e8368d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 18:25:30 +00:00
Kousik Kumar
a3caddd060 [automerger skipped] Cleanup RBE logs directory am: c3d9ea5a54 -s ours 
am skip reason: Merged-In I46bd38d50419cb9e54e8202d24222979e47ff5ca with SHA-1 29cbe14265 is already in history

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

Change-Id: I14b48f20b24822b251507b83b886fcb8f134b63d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 18:25:29 +00:00
TreeHugger Robot
4f7e82f1ce Merge "Cleanup RBE logs directory" into tm-dev 2022-06-30 18:01:42 +00:00
Kousik Kumar
040867f3b8 [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
(cherry picked from commit 29cbe14265)
 2022-06-30 15:20:48 +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
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
c3d9ea5a54 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:30:01 +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ó
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
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
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