StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,599 Commits 1 Branch 0 Tags
cda10e187b6fb696af84968f3dfd1b61f4cdb9c4
Commit Graph

58599 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oriol Prieto Gascó
cda10e187b Merge "Hard-code apex_available handling for the btservices apex" into tm-dev am: 3bb9d7a8d9 am: bb63423da1 am: 7b8cb64821 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18972588

Change-Id: I7742de88e124be497b0f60a73fd81852c464848d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 18:38:07 +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
Trevor Radcliffe
6af9c109f0 Merge "Remove implementation_deps from cc_library headers" am: 2923fa8bcf am: 073217461d am: 58461be7d6 am: 52d3d47504 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2127884

Change-Id: Ie4933df2fd2bdd6003c2edfc36252fb499eba14a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 16:02:54 +00:00
Trevor Radcliffe
52d3d47504 Merge "Remove implementation_deps from cc_library headers" am: 2923fa8bcf am: 073217461d am: 58461be7d6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2127884

Change-Id: Ied49600bc8b2fcdf379e55beb679f4fc9f781106
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 15:48:02 +00:00
Trevor Radcliffe
58461be7d6 Merge "Remove implementation_deps from cc_library headers" am: 2923fa8bcf am: 073217461d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2127884

Change-Id: I21137fe037517d79e7087717b5caab1413356750
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 15:23:08 +00:00
Trevor Radcliffe
073217461d Merge "Remove implementation_deps from cc_library headers" am: 2923fa8bcf 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2127884

Change-Id: If994a03411e58f4bec5815735917b0a226ad5085
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 15:03:22 +00:00
Trevor Radcliffe
2923fa8bcf Merge "Remove implementation_deps from cc_library headers" 2022-06-22 14:45:18 +00:00
Trevor Radcliffe
fb6c522420 Remove implementation_deps from cc_library headers 
Don't add implementation_deps to cc_library_headers in bp2build

Fixes: 236404654
Test: unit tests, USE_MIXED_BUILDS=1 m
Change-Id: I0f6a35c10284f261b6a8b7a4831655d5fa084977
 2022-06-21 22:34:11 +00:00
Bob Badour
170e4f5fe1 Fix escaping for package_name am: a10d5a2746 am: d5a951da99 am: 5f35225082 am: b1335157b9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2133016

Change-Id: I316a5859d2927896dc06a5ed74c8d0cd2eca5715
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 21:41:49 +00:00
Bob Badour
b1335157b9 Fix escaping for package_name am: a10d5a2746 am: d5a951da99 am: 5f35225082 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2133016

Change-Id: I23333e6fd1dfe5dccb6abe5a62b77ee7bbc86956
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 21:17:28 +00:00
Bob Badour
5f35225082 Fix escaping for package_name am: a10d5a2746 am: d5a951da99 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2133016

Change-Id: I053298497b76d6d5738ad5120affdcf62931c487
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 20:51:32 +00:00
Bob Badour
d5a951da99 Fix escaping for package_name am: a10d5a2746 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2133016

Change-Id: Idf9d91c966d73a1ab2c9188d2422ce59139ab751
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 20:24:17 +00:00
Bob Badour
a10d5a2746 Fix escaping for package_name 
Bug: 235333302

Test: m droid dist
Change-Id: I6e52b960be4171a9510edd4f2857f13cc3f54bc0
 2022-06-21 11:12:01 -07:00
Jiyong Park
edc1827511 Merge "buildinfo_prop generates ro.build.version.known_codenames" am: 061d352801 am: 2e4bc136fd am: 2f36d8e906 am: edd0f81677 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2133112

Change-Id: Ia3baec2627367efc4e23c80a43d429cf3fcf98a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 17:51:36 +00:00
Jingwen Chen
67cddc2eec Rewrite apex_diff_test as regular soong integration tests. am: 26f0b214ba am: 73f757b721 am: 4a6df7a819 am: ff7e9d7c2c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2123653

Change-Id: Ibb3930d91cda07b41145a500e3b0e887fa880628
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 17:51:06 +00:00
Jiyong Park
edd0f81677 Merge "buildinfo_prop generates ro.build.version.known_codenames" am: 061d352801 am: 2e4bc136fd am: 2f36d8e906 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2133112

Change-Id: Idc0d83777d088b768fd73c4018f2f5c7e8326da7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 17:43:13 +00:00
Jingwen Chen
ff7e9d7c2c Rewrite apex_diff_test as regular soong integration tests. am: 26f0b214ba am: 73f757b721 am: 4a6df7a819 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2123653

Change-Id: I7848c90de6980b44c02e43da165399396ac0cab7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 17:42:53 +00:00
Jiyong Park
2f36d8e906 Merge "buildinfo_prop generates ro.build.version.known_codenames" am: 061d352801 am: 2e4bc136fd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2133112

Change-Id: I28ccd4839366114cf5958aa382e10c2e45f6d302
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 17:34:21 +00:00
Jingwen Chen
4a6df7a819 Rewrite apex_diff_test as regular soong integration tests. am: 26f0b214ba am: 73f757b721 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2123653

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

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

Change-Id: I7afc5d6c1ce5909ec21223ab1ce4cfe334280b7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 17:06:34 +00:00
Jiyong Park
2e4bc136fd Merge "buildinfo_prop generates ro.build.version.known_codenames" am: 061d352801 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2133112

Change-Id: Ic3237aab13b7f473937f5ff38c4d0588ded57ced
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 17:05:40 +00:00
Jingwen Chen
73f757b721 Rewrite apex_diff_test as regular soong integration tests. am: 26f0b214ba 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2123653

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

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

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

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

Change-Id: I182c455356ec9537ec5c4243d8615cca027dd032
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 17:04:47 +00:00
Jiyong Park
061d352801 Merge "buildinfo_prop generates ro.build.version.known_codenames" 2022-06-21 16:54:26 +00:00
Kousik Kumar
9ac3fe7104 [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: Ic6f6df8a6390b71617a8aca72842c9dcc176ce5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 16:39:31 +00:00
Kousik Kumar
a91359f042 [automerger skipped] [RESTRICT AUTOMERGE] Fix ioutil import in sc-dev branch am: de3a770705 -s ours am: 6c856a571d -s ours am: 04b3f4422e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2449cc7bbca2f299b6ae5d74330c87bf6d83ff80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 16:39:14 +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
04b3f4422e [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: I63bdcac8e17c898c75726f31778417ca2fbc53c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 16:12:09 +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
Automerger Merge Worker
4a19a4a48f Merge "[automerger skipped] [RESTRICT AUTOMERGE] Fix ioutil import in sc-dev branch am: 4a31fb1004 am: cda87b8dbc -s ours am: 82f4566bf7 -s ours am: ebb94c7787 -s ours" into tm-d1-dev-plus-aosp am: c1ca77e6b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19003520

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

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

Change-Id: Ibc152dfbf5c7d2f0f1c2b34ff05d20559fd1768b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 05:47:21 +00:00
Kousik Kumar
c7f5e5a544 [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: 5ce4e13fe6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1c5238dc90f4571e1e927168c0c84e60a8463ce5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 05:47:11 +00:00
Automerger Merge Worker
353feecffa Merge "[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: 70b7fb5666 -s ours" into tm-d1-dev-plus-aosp am: da234bfc35 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19003520

Change-Id: Ic7ed8eb63fdc3cf4d8342dd61f09be669561fcb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 05:47:04 +00:00
Kousik Kumar
f4791639e9 [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: 70b7fb5666 -s ours am: ea5e754655 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9391016e48c30d48ed5513756b04f629dd251184
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 05:47:03 +00:00
Kousik Kumar
72d1abf7e7 [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: 3ba87bf3fe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I98652278d4455a107fffd6b68b69466b85c31cb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 05:46:52 +00:00
Kousik Kumar
6275571fb0 [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: 1f6e846ca1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0d3058d78274f4a5867d4ecdfbed20e9b43ceb9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 05:46:37 +00:00
Kousik Kumar
d9bbf4df9e [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: e0089c7bef -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ica13c45678f27eaf5be12c5dbe01a79103d369d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 05:46:31 +00:00
Automerger Merge Worker
c1ca77e6b8 Merge "[automerger skipped] [RESTRICT AUTOMERGE] Fix ioutil import in sc-dev branch am: 4a31fb1004 am: cda87b8dbc -s ours am: 82f4566bf7 -s ours am: ebb94c7787 -s ours" into tm-d1-dev-plus-aosp 2022-06-21 05:21:22 +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
5c0a6d15c9 [automerger skipped] [RESTRICT AUTOMERGE] Fix ioutil import in sc-dev branch am: 4a31fb1004 am: cda87b8dbc -s ours am: 82f4566bf7 -s ours am: ebb94c7787 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id64561947822e562916f9945fb0fccc80d1718a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 05:21:19 +00:00
Kousik Kumar
5ce4e13fe6 [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: I312aae11b089207755a2ebde6a94eb256f2977ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 05:21:19 +00:00
Automerger Merge Worker
da234bfc35 Merge "[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: 70b7fb5666 -s ours" into tm-d1-dev-plus-aosp 2022-06-21 05:21:16 +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
ea5e754655 [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: 70b7fb5666 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5fc095900b9ff192f19e8d93909ff25822b8d977
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 05:21:13 +00:00
Kousik Kumar
3ba87bf3fe [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: I8ab056722fadcfdcad8970a6922886b1631c3b1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 05:21:12 +00:00