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

56629 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Kousik Kumar
4ba1a856f3 [automerger skipped] Move env var config loading to be within the config package. am: 2f504db708 am: 4d5f00fed6 am: 14325e74e0 am: a16f1b0452 -s ours 
am skip reason: Merged-In Iab3957b64f4b5456a861057d16ad318f4f78e0cb with SHA-1 2f504db708 is already in history

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

Change-Id: I163b5685bd095dd34ba614e8e5d4af1f12e852fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 23:38:27 +00:00
Kousik Kumar
17e9703721 [automerger skipped] Add google_prod_creds to the list of auth mechanisms am: f7574b5484 am: f6c29aa6c9 am: 6e9b4d65d0 am: 2fefa570f4 am: e5eb2c429f am: 3235fc567b -s ours 
am skip reason: Merged-In I51e3f1aefadf282240b8f861efafde6b9b61d305 with SHA-1 f7574b5484 is already in history

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

Change-Id: Ic024dd5d9e0357f2b1e7721a6c1d446b2a11539c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 23:37:54 +00:00
Kousik Kumar
896ee94126 [automerger skipped] [conflict] Allowlist stubby to be run within the path imposer am: 00327e6dfa am: 0e4e4351c9 am: 470adfb44d am: 56d1c8ce48 am: 92446e3fa6 am: 9de3516b0a -s ours 
am skip reason: Merged-In I29aec9576e86b9ed3051df7943404abd478c549b with SHA-1 9eb43e26c4 is already in history

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

Change-Id: I32ce71d481061c317ca4c3e872423b73bf82e646
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 23:36:43 +00:00
Kousik Kumar
54d4521f4b [automerger skipped] Move env var config loading to be within the config package. am: 2f504db708 am: 4d5f00fed6 am: 14325e74e0 am: 5da9178135 am: c81a6e7507 -s ours 
am skip reason: Merged-In Iab3957b64f4b5456a861057d16ad318f4f78e0cb with SHA-1 3ff037e3d9 is already in history

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

Change-Id: Iba154dccc2e80d5837c97dbc8e7316ffbf9553fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 23:05:29 +00:00
Kousik Kumar
f072966301 [automerger skipped] Add google_prod_creds to the list of auth mechanisms am: f7574b5484 am: f6c29aa6c9 am: 6e9b4d65d0 am: 2fefa570f4 am: e5eb2c429f am: 9438b7cea9 am: cef318d1ba -s ours 
am skip reason: Merged-In I51e3f1aefadf282240b8f861efafde6b9b61d305 with SHA-1 93d192cc6a is already in history

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

Change-Id: I80e862731a0fd644acd326f2a05593fe2455975c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 23:05:20 +00:00
Kousik Kumar
21fad0c7cb [automerger skipped] [conflict] Allowlist stubby to be run within the path imposer am: 00327e6dfa am: 0e4e4351c9 am: 470adfb44d am: 56d1c8ce48 am: 92446e3fa6 am: 9dedb60c6a am: 5260803c67 -s ours 
am skip reason: Merged-In I29aec9576e86b9ed3051df7943404abd478c549b with SHA-1 9eb43e26c4 is already in history

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

Change-Id: Iedc9062a3df08af019895af0b527379db437e485
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 23:05:11 +00:00
Kousik Kumar
2ccd41408e [automerger skipped] [conflict] Add additional directories from which env config can be loaded am: ef073be177 am: cc5020c964 am: 8f012ef4bf am: 749dacacda am: 3b9f9fe1eb am: fbd40f18a9 am: d43d94c657 -s ours 
am skip reason: Merged-In I9af83687d4eaeee1ffb0f88a750cfeb7c6d2bafb with SHA-1 7b7dca4316 is already in history

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

Change-Id: Ia5ef281e3b4565a82a9aa2f758f5964aeda3e9d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 23:05:01 +00:00
Kousik Kumar
490b7a7375 [automerger skipped] [conflict] Add additional directories from which env config can be loaded am: ef073be177 am: cc5020c964 am: 8f012ef4bf am: 749dacacda am: 3b9f9fe1eb am: 11529f7e5b -s ours 
am skip reason: Merged-In I9af83687d4eaeee1ffb0f88a750cfeb7c6d2bafb with SHA-1 7b7dca4316 is already in history

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

Change-Id: I700b440c73066c24b3e643690c7d5df8fa6d85e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 22:51:45 +00:00
Kousik Kumar
c81a6e7507 Move env var config loading to be within the config package. am: 2f504db708 am: 4d5f00fed6 am: 14325e74e0 am: 5da9178135 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18971604

Change-Id: I2697d8db90aed98fd3b69062de8509072f9ea70c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 22:51:40 +00:00
Kousik Kumar
cef318d1ba Add google_prod_creds to the list of auth mechanisms am: f7574b5484 am: f6c29aa6c9 am: 6e9b4d65d0 am: 2fefa570f4 am: e5eb2c429f am: 9438b7cea9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18890432

Change-Id: I8941c74b8e809cbf6c3b1a065eceb172783c8dbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 22:51:24 +00:00
Kousik Kumar
5260803c67 [conflict] Allowlist stubby to be run within the path imposer am: 00327e6dfa am: 0e4e4351c9 am: 470adfb44d am: 56d1c8ce48 am: 92446e3fa6 am: 9dedb60c6a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18931226

Change-Id: Ib2a74d51922781b454c611e408b55bf67b14ddda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 22:51:08 +00:00
Kousik Kumar
d43d94c657 [conflict] Add additional directories from which env config can be loaded am: ef073be177 am: cc5020c964 am: 8f012ef4bf am: 749dacacda am: 3b9f9fe1eb am: fbd40f18a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18915321

Change-Id: I94840b6aa5e1542227c509f8787d354f6b0a6dae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 22:50:52 +00:00
Kousik Kumar
5da9178135 Move env var config loading to be within the config package. am: 2f504db708 am: 4d5f00fed6 am: 14325e74e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18971604

Change-Id: Ib4d93c33ff943cfc92a4293bbca5cd88c495c230
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 22:34:55 +00:00
Kousik Kumar
9438b7cea9 Add google_prod_creds to the list of auth mechanisms am: f7574b5484 am: f6c29aa6c9 am: 6e9b4d65d0 am: 2fefa570f4 am: e5eb2c429f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18890432

Change-Id: Ibb5d651911e050254c1e185d9d786d1524b096f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 22:34:40 +00:00
Kousik Kumar
9dedb60c6a [conflict] Allowlist stubby to be run within the path imposer am: 00327e6dfa am: 0e4e4351c9 am: 470adfb44d am: 56d1c8ce48 am: 92446e3fa6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18931226

Change-Id: Ia5d2557c0eae1ccc4fb5465510e89fce7a31eb90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 22:34:25 +00:00
Kousik Kumar
a16f1b0452 Move env var config loading to be within the config package. am: 2f504db708 am: 4d5f00fed6 am: 14325e74e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18971604

Change-Id: I871dfacc58388b6af9e4a37380305c5009264e8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 22:33:54 +00:00
Kousik Kumar
3235fc567b Add google_prod_creds to the list of auth mechanisms am: f7574b5484 am: f6c29aa6c9 am: 6e9b4d65d0 am: 2fefa570f4 am: e5eb2c429f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18890432

Change-Id: I2d434fc3ca2dc885aeb2972125b2d63d89c10ce6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 22:33:39 +00:00
Kousik Kumar
9de3516b0a [conflict] Allowlist stubby to be run within the path imposer am: 00327e6dfa am: 0e4e4351c9 am: 470adfb44d am: 56d1c8ce48 am: 92446e3fa6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18931226

Change-Id: I02756f1fb83b38123875a0a7bf4b39e42de8f5a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 22:33:23 +00:00
Kousik Kumar
4a31fb1004 [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
 2022-06-20 21:34:04 +00:00
Kousik Kumar
14325e74e0 Move env var config loading to be within the config package. am: 2f504db708 am: 4d5f00fed6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18971604

Change-Id: Ia6f255e1d244af8301831133095dc5c14b8d1ccd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 21:17:29 +00:00
Kousik Kumar
e5eb2c429f Add google_prod_creds to the list of auth mechanisms am: f7574b5484 am: f6c29aa6c9 am: 6e9b4d65d0 am: 2fefa570f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18890432

Change-Id: I63bc86b2b4309fd8744b1f5963a5eac96d909178
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 21:17:10 +00:00
Kousik Kumar
92446e3fa6 [conflict] Allowlist stubby to be run within the path imposer am: 00327e6dfa am: 0e4e4351c9 am: 470adfb44d am: 56d1c8ce48 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18931226

Change-Id: I60dc874673139cd338db1928b0dacf6f0390df53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 21:16:50 +00:00
Kousik Kumar
4d5f00fed6 Move env var config loading to be within the config package. am: 2f504db708 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18971604

Change-Id: Id638a4751a30d681dfe874dc07cea9060e018f85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 20:58:59 +00:00
Oriol Prieto Gasco
8132fbf8c1 Hard-code apex_available handling for the btservices apex 
Bug: 236192423
Test: TH
Change-Id: Ie095ae22704a80e0ec171b1bb3fdc995f95a1c64
 2022-06-19 23:13:25 +00:00
Pedro Loureiro
489912283e Translate SDK codenames to SDK versions for finalized releases 
This applies to updatability attributes of shared libraries.

Bug: 235318264

Test: atest UpdatableSharedLibsTest
Change-Id: Id2c2b769a99ca1debb5d8525e46d37698ef2fc6c
 2022-06-17 20:01:21 +00:00
Kousik Kumar
2f504db708 Move env var config loading to be within the config package. 
When the environment variable config file is loaded after config object
is initialized, we  end up loading the USE_RBE variable in the config
file after the code to start reproxy process is run. This causes a
problem when USE_RBE variable itself is set in the config files. To
avoid this, I've moved the config file loading code to be within the
config package, this makes the main.go file cleaner too.

Test:
Ran a build with USE_RBE:true set in the config json file. The build
fails without this change and succeeds with this change.

Bug: b/209486170
Change-Id: Iab3957b64f4b5456a861057d16ad318f4f78e0cb
Merged-In: Iab3957b64f4b5456a861057d16ad318f4f78e0cb
 2022-06-17 18:41:41 +00:00
Kousik Kumar
2fefa570f4 Add google_prod_creds to the list of auth mechanisms am: f7574b5484 am: f6c29aa6c9 am: 6e9b4d65d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18890432

Change-Id: I8111a5e6e49fff5b4b25dbaab8722c065702d597
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 00:06:49 +00:00
Kousik Kumar
56d1c8ce48 [conflict] Allowlist stubby to be run within the path imposer am: 00327e6dfa am: 0e4e4351c9 am: 470adfb44d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18931226

Change-Id: Ib9d7ca9d2d47c45b6f6fb6dc9087f73088c0db64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 00:06:32 +00:00
Kousik Kumar
fbd40f18a9 [conflict] Add additional directories from which env config can be loaded am: ef073be177 am: cc5020c964 am: 8f012ef4bf am: 749dacacda am: 3b9f9fe1eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18915321

Change-Id: Ie9d3d545e0e6364330dcba2e11011b3cb143bb7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 22:28:01 +00:00
Kousik Kumar
11529f7e5b [conflict] Add additional directories from which env config can be loaded am: ef073be177 am: cc5020c964 am: 8f012ef4bf am: 749dacacda am: 3b9f9fe1eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18915321

Change-Id: Ie2ea236cc8e49669745a46770f1f885f3ccb3dff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 22:26:57 +00:00
Kousik Kumar
6e9b4d65d0 Add google_prod_creds to the list of auth mechanisms am: f7574b5484 am: f6c29aa6c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18890432

Change-Id: I7c7c7f9b7e855d69a6ab7fe197ca3ca8cae81e29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 21:04:35 +00:00
Kousik Kumar
3b9f9fe1eb [conflict] Add additional directories from which env config can be loaded am: ef073be177 am: cc5020c964 am: 8f012ef4bf am: 749dacacda 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18915321

Change-Id: I70ea14cccca08141bc24c1c2bf8aa52a7836c4dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 19:35:42 +00:00
Kousik Kumar
749dacacda [conflict] Add additional directories from which env config can be loaded am: ef073be177 am: cc5020c964 am: 8f012ef4bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18915321

Change-Id: Ie336521979100a49f540cba860478f3091afd65c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 18:22:03 +00:00
Kousik Kumar
470adfb44d [conflict] Allowlist stubby to be run within the path imposer am: 00327e6dfa am: 0e4e4351c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18881794

Change-Id: Ib8538d7aef0eb1eedfc32d2b7def524a8c7b3b59
Merged-In: I29aec9576e86b9ed3051df7943404abd478c549b
Bug: b/236273917
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 18:14:27 +00:00
Kousik Kumar
8f012ef4bf [conflict] Add additional directories from which env config can be loaded am: ef073be177 am: cc5020c964 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18881793

Bug: b/236171470
Change-Id: I0d920a60e0eed6774eccf08c11b819682be92365
Merged-In: I9af83687d4eaeee1ffb0f88a750cfeb7c6d2bafb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 14:20:25 +00:00
Kousik Kumar
f6c29aa6c9 Add google_prod_creds to the list of auth mechanisms am: f7574b5484 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18890432

Change-Id: I93471e06ccadb585f9601d1ae2fd17117d1d8d4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 20:23:38 +00:00
Kousik Kumar
0e4e4351c9 Allowlist stubby to be run within the path imposer am: 00327e6dfa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18881794

Change-Id: I7a1161fb40581e3e396c0742ef36cf1f7c03a440
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 20:23:37 +00:00
Kousik Kumar
cc5020c964 Add additional directories from which env config can be loaded am: ef073be177 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/18881793

Change-Id: If9f884d90e83ed958a929e0e2bb387b01d0a21c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 20:23:36 +00:00
Kousik Kumar
f7574b5484 Add google_prod_creds to the list of auth mechanisms 
This is to ensure that we don't default to using
application_default_creds when it is not set and rather
"RBE_use_google_prod_creds" variable is set. This is necessary to
rollout RBE gcert auth.

Bug: b/235861862, b/224446621
Change-Id: I51e3f1aefadf282240b8f861efafde6b9b61d305
Merged-In: I51e3f1aefadf282240b8f861efafde6b9b61d305
 2022-06-14 19:19:06 +00:00
Kousik Kumar
00327e6dfa Allowlist stubby to be run within the path imposer 
To support using google prod credentials for Google developers, we need
to be able to make an RPC call to exchange credentials. This RPC call
needs to be issued via stubby and hence allowlisting the stubby binary.

dwillemsen@ also pointed out that this should be less effective for
other tools running within the build since network access is disabled
for the other tools anyway via sandboxing.

Bug: b/222484146,b/235861862
Merged-In: I29aec9576e86b9ed3051df7943404abd478c549b
Change-Id: Iaabb5c51929768fef0a330ad300b25d72be6f0df
 2022-06-14 05:40:43 +00:00
Kousik Kumar
ef073be177 Add additional directories from which env config can be loaded 
This is useful for external users to be able to specify their own config files that can be loaded by soong during startup. In addition, we need this for upcoming changes to incorporate an experiments framework in Soong since the config file will be fetched from CDPush and put into the OUT_DIR folder by the config file fetcher binary.

Note: Once this is merged into internal branch, I'll fully get rid of
the vendor/google/ path from Soong in aosp.

Test:
1. Ran a build in aosp with these changes and no config file was loaded.
2. Ran a build in internal master with these changes and the current
config file inside vendor/google was loaded as expected.

Bug: b/214035335,b/235861862
Merged-In: I9af83687d4eaeee1ffb0f88a750cfeb7c6d2bafb
Change-Id: Ica2248c57828e90ec78fccceed6f8e73280360cc
 2022-06-14 05:40:30 +00:00