openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
42,797 Commits 2 Branches 1 Tag 34 MiB
Commit Graph

42797 Commits

Author SHA1 Message Date
Kousik Kumar 495a34493a Merge "Revert "Revert "Load env variables before c.config()""" into rvc-dev am: 9ecad7478f am: ecd9666a57 am: 2bdd2b278e am: 8341deb813 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15778291

Change-Id: I55f517832526a1f4229ad93b33a8bed967346a71
 2021-09-09 21:39:20 +00:00
Kousik Kumar b359504b10 Merge "Revert "Revert "Load env variables before c.config()""" into rvc-dev am: 9ecad7478f am: dd28ec5116 am: ea62b3d743 am: afe8619e1b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15778291

Change-Id: Ia17a5c2aa52856a81e3a630e2d15c859c555ebca
 2021-09-09 21:39:06 +00:00
Kousik Kumar 8341deb813 Merge "Revert "Revert "Load env variables before c.config()""" into rvc-dev am: 9ecad7478f am: ecd9666a57 am: 2bdd2b278e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15778291

Change-Id: I24aff96a3e26e2ea6077f243b207f8f99b06e010
 2021-09-09 21:20:48 +00:00
Kousik Kumar afe8619e1b Merge "Revert "Revert "Load env variables before c.config()""" into rvc-dev am: 9ecad7478f am: dd28ec5116 am: ea62b3d743 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15778291

Change-Id: I82ea559e164493d246102f97aa1e432f5d124fe8
 2021-09-09 21:20:39 +00:00
Kousik Kumar 2bdd2b278e Merge "Revert "Revert "Load env variables before c.config()""" into rvc-dev am: 9ecad7478f am: ecd9666a57 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15778291

Change-Id: I7ebf5bccaf33afa666eb593e3abffaad818e61a3
 2021-09-09 21:06:56 +00:00
Kousik Kumar ea62b3d743 Merge "Revert "Revert "Load env variables before c.config()""" into rvc-dev am: 9ecad7478f am: dd28ec5116 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15778291

Change-Id: I67da3dc3c8c11d25ebc59ab01681029e5682f072
 2021-09-09 21:01:43 +00:00
Kousik Kumar ecd9666a57 Merge "Revert "Revert "Load env variables before c.config()""" into rvc-dev am: 9ecad7478f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15778291

Change-Id: I16a1ac3a5fac8be17ff4ef923422797cd4dff026
 2021-09-09 20:44:48 +00:00
Kousik Kumar dd28ec5116 Merge "Revert "Revert "Load env variables before c.config()""" into rvc-dev am: 9ecad7478f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15778291

Change-Id: I432a96406905bf64a1bad06ec0c902d372802346
 2021-09-09 20:44:48 +00:00
Kousik Kumar 9ecad7478f Merge "Revert "Revert "Load env variables before c.config()""" into rvc-dev 2021-09-09 20:27:45 +00:00
Kousik Kumar d55b250500 [automerger skipped] Resolve merge conflicts of "Check UseRBE is set before replacing any template with the RE version." am: 3e0b9c031c am: 4e2977ee81 am: e78212a55c am: a510a2db10 am: 274c905be6 -s ours am: 074000ec27 -s ours am: 1784e3d638 -s ours 
am skip reason: Merged-In I6df58b4e700f0d231367af2710672d731d20a736 with SHA-1 16f23a4038 is already in history

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

Change-Id: Iac7c5e1393045462cabd50054dcdcec21a902e31
 2021-09-09 20:23:47 +00:00
Kousik Kumar c04a8ebe92 [automerger skipped] Resolve merge conflicts of "Check UseRBE is set before replacing any template with the RE version." am: 3e0b9c031c am: 4e2977ee81 am: e78212a55c am: a510a2db10 am: b24137e0cf -s ours am: a219d88704 -s ours am: 3d49fec2c1 -s ours 
am skip reason: Merged-In I6df58b4e700f0d231367af2710672d731d20a736 with SHA-1 16f23a4038 is already in history

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

Change-Id: I0edb54dd1332a387d8df5aa1098267cac4d2bc00
 2021-09-09 20:23:42 +00:00
Kousik Kumar 1784e3d638 [automerger skipped] Resolve merge conflicts of "Check UseRBE is set before replacing any template with the RE version." am: 3e0b9c031c am: 4e2977ee81 am: e78212a55c am: a510a2db10 am: 274c905be6 -s ours am: 074000ec27 -s ours 
am skip reason: Merged-In I6df58b4e700f0d231367af2710672d731d20a736 with SHA-1 16f23a4038 is already in history

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

Change-Id: I1ca43ce5250b7c71961a5aaa29beab22e0a14276
 2021-09-09 19:58:03 +00:00
Kousik Kumar 3d49fec2c1 [automerger skipped] Resolve merge conflicts of "Check UseRBE is set before replacing any template with the RE version." am: 3e0b9c031c am: 4e2977ee81 am: e78212a55c am: a510a2db10 am: b24137e0cf -s ours am: a219d88704 -s ours 
am skip reason: Merged-In I6df58b4e700f0d231367af2710672d731d20a736 with SHA-1 16f23a4038 is already in history

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

Change-Id: Id5650e0382cf69a6ca56782423091c201676baae
 2021-09-09 19:57:55 +00:00
Kousik Kumar 074000ec27 [automerger skipped] Resolve merge conflicts of "Check UseRBE is set before replacing any template with the RE version." am: 3e0b9c031c am: 4e2977ee81 am: e78212a55c am: a510a2db10 am: 274c905be6 -s ours 
am skip reason: Merged-In I6df58b4e700f0d231367af2710672d731d20a736 with SHA-1 16f23a4038 is already in history

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

Change-Id: I3eb0185606e171767f27b083e8f8099bbee3bc7d
 2021-09-09 19:45:42 +00:00
Kousik Kumar a219d88704 [automerger skipped] Resolve merge conflicts of "Check UseRBE is set before replacing any template with the RE version." am: 3e0b9c031c am: 4e2977ee81 am: e78212a55c am: a510a2db10 am: b24137e0cf -s ours 
am skip reason: Merged-In I6df58b4e700f0d231367af2710672d731d20a736 with SHA-1 16f23a4038 is already in history

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

Change-Id: I8e61011963f661e219b5f4587c777423d2265865
 2021-09-09 19:45:14 +00:00
Kousik Kumar 274c905be6 Resolve merge conflicts of "Check UseRBE is set before replacing any template with the RE version." am: 3e0b9c031c am: 4e2977ee81 am: e78212a55c am: a510a2db10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15776183

Change-Id: I181bb735aaf2c3c51982f3f0d50497e3ba5184be
 2021-09-09 19:17:37 +00:00
Kousik Kumar b24137e0cf Resolve merge conflicts of "Check UseRBE is set before replacing any template with the RE version." am: 3e0b9c031c am: 4e2977ee81 am: e78212a55c am: a510a2db10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15776183

Change-Id: Ie310a0529d5c3c90f5dba61ddc736edd4569ee13
 2021-09-09 19:17:37 +00:00
Kousik Kumar 008c2aa126 Revert "Revert "Load env variables before c.config()"" 
This reverts commit 4e88859af0.

Reason for revert: Given https://googleplex-android-review.git.corp.google.com/c/platform/build/soong/+/15747538, we should be able to rollforward with this now.

Bug: b/198045383
Change-Id: I4c069e952d9f77258433b5059f3867293993a64d
 2021-09-08 07:37:19 +00:00
Kousik Kumar a510a2db10 Resolve merge conflicts of "Check UseRBE is set before replacing any template with the RE version." am: 3e0b9c031c am: 4e2977ee81 am: e78212a55c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15747538

Bug: b/198045383
Merged-In: I6df58b4e700f0d231367af2710672d731d20a736
Change-Id: Ide5966e039ae5232438946fa064d8621088bc1ee
 2021-09-07 15:20:50 +00:00
Kousik Kumar e78212a55c Merge "Check UseRBE is set before replacing any template with the RE version." am: 3e0b9c031c am: 4e2977ee81 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15747538

Change-Id: Ifa33cdad01dac8e81724d97f6373b745ff775ca9
 2021-09-07 14:32:59 +00:00
Martin Stjernholm d50c559c57 Merge "Add exclude_runtime_libs to more targets." into sc-qpr1-dev am: c3d9e36be3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15727048

Change-Id: I5db34c69965d69cd3cd2c8b3edb6e2bc68834a9f
 2021-09-06 12:40:01 +00:00
Martin Stjernholm c3d9e36be3 Merge "Add exclude_runtime_libs to more targets." into sc-qpr1-dev 2021-09-06 12:26:43 +00:00
Kousik Kumar 4e2977ee81 Merge "Check UseRBE is set before replacing any template with the RE version." am: 3e0b9c031c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1419252

Test:
1. Applied https://googleplex-android-review.git.corp.google.com/c/platform/build/soong/+/15723183, confirmed that the build fails on rvc-dev (by running `USE_RBE=false m `)
2. Subsequently applied this patch and tested to confirm that the failure is fixed (by running `USE_RBE=false m out/soong/.intermediates/vendor/qcom/sm7250/proprietary/commonsys/qcrilOemHook/qcrilmsgtunnel/android_common/combined/qcrilmsgtunnel.jar` and `USE_RBE=true m out/soong/.intermediates/vendor/qcom/sm7250/proprietary/commonsys/qcrilOemHook/qcrilmsgtunnel/android_common/combined/qcrilmsgtunnel.jar`).

Bug: b/198045383
Merged-In: I6df58b4e700f0d231367af2710672d731d20a736
Change-Id: I52b7a3810fdf3314ae107f4b8330e9d6f62c6302
(cherry picked from commit f15ed4fe61)
 2021-09-02 19:15:35 +00:00
Kousik Kumar 27a8b4640a Revert "Load env variables before c.config()" am: 4e88859af0 am: 9ee45ad09a am: fb58d3aaaf am: b4d9316616 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15741350

Change-Id: I25f3f3bc67bdafdbfc9bcac7219ca0ea2461c7f5
 2021-09-02 00:59:11 +00:00
Kousik Kumar f46fc703f2 Revert "Load env variables before c.config()" am: 4e88859af0 am: 51c318f403 am: e41ee225ae am: 8c1a61a30f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15741350

Change-Id: I05a70f3e67d1ac3638d0c113ba3787c276e97b09
 2021-09-02 00:58:51 +00:00
Kousik Kumar b4d9316616 Revert "Load env variables before c.config()" am: 4e88859af0 am: 9ee45ad09a am: fb58d3aaaf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15741350

Change-Id: Ib86ba32c3974574751241a7584b569086176a9b9
 2021-09-02 00:45:53 +00:00
Kousik Kumar 8c1a61a30f Revert "Load env variables before c.config()" am: 4e88859af0 am: 51c318f403 am: e41ee225ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15741350

Change-Id: I1566f5e15e1a28da20c4c7c37bd097c954528ffb
 2021-09-02 00:45:41 +00:00
Kousik Kumar fb58d3aaaf Revert "Load env variables before c.config()" am: 4e88859af0 am: 9ee45ad09a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15741350

Change-Id: I76d4eecf6acd51462d6682e878f57c43b6f4a548
 2021-09-02 00:33:55 +00:00
Kousik Kumar e41ee225ae Revert "Load env variables before c.config()" am: 4e88859af0 am: 51c318f403 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15741350

Change-Id: Ia229ea5263a3456015ad2d446ce9f77f5e7639d0
 2021-09-02 00:33:21 +00:00
Kousik Kumar 9ee45ad09a Revert "Load env variables before c.config()" am: 4e88859af0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15741350

Change-Id: I954c16917928fe1e4eace7209558b42d517c14ab
 2021-09-02 00:18:52 +00:00
Kousik Kumar 51c318f403 Revert "Load env variables before c.config()" am: 4e88859af0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15741350

Change-Id: I3eb5b3b7175135616eca41935ec472339c83f666
 2021-09-02 00:18:44 +00:00
Kousik Kumar 4e88859af0 Revert "Load env variables before c.config()" 
This reverts commit 062b011502.

Reason for revert: This change is accidentally opting in a bunch of people into RBE because we aren't respecting USE_RBE variable in rvc-dev branch (possibly missing cherry-pick of some earlier fix).

Merged-In: I416e8da75f84aa2b53995f525cf50501488dc972
Change-Id: Ic678b63b165deb3ac4ec3d3c5cbc166621d8eec3
 2021-09-01 22:16:51 +00:00
Kousik Kumar b421756b52 Load env variables before c.config() am: 062b011502 am: f04dc7f1b1 am: de85899f78 am: a9396f3727 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15723183

Change-Id: I6714c98be88674e9a557af614ee4671ba29d01e5
 2021-08-31 18:27:46 +00:00
Kousik Kumar df4ac9c32a Load env variables before c.config() am: 062b011502 am: ef9d91b7ac am: 50c2a1b2a4 am: 073f79b50c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15723183

Change-Id: Ie6c1cc271eea3efcfd481e972e4d8cc184c6c2e8
 2021-08-31 18:27:41 +00:00
Kousik Kumar a9396f3727 Load env variables before c.config() am: 062b011502 am: f04dc7f1b1 am: de85899f78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15723183

Change-Id: If08483b4d0702ea51f0580f92d1f176eb3b1e98e
 2021-08-31 18:03:38 +00:00
Kousik Kumar 073f79b50c Load env variables before c.config() am: 062b011502 am: ef9d91b7ac am: 50c2a1b2a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15723183

Change-Id: I0bc6992644c580cbc091f9cda8864e0c2da4f470
 2021-08-31 18:03:34 +00:00
Kousik Kumar de85899f78 Load env variables before c.config() am: 062b011502 am: f04dc7f1b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15723183

Change-Id: Ic0629266b7ea9b51d4a7ad2f697dd1e0cdb65051
 2021-08-31 17:59:15 +00:00
Kousik Kumar 50c2a1b2a4 Load env variables before c.config() am: 062b011502 am: ef9d91b7ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15723183

Change-Id: I5574eba839d8e186a3fff27b5198ab34ec10e1ce
 2021-08-31 17:50:32 +00:00
Kousik Kumar f04dc7f1b1 Load env variables before c.config() am: 062b011502 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15723183

Change-Id: I13773a3be06c8ad4426960b0f2fbc45bbed3e85f
 2021-08-31 17:33:30 +00:00
Kousik Kumar ef9d91b7ac Load env variables before c.config() am: 062b011502 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15723183

Change-Id: I6fd005904a174ae685853fcb9303e678ab7a48d0
 2021-08-31 17:33:30 +00:00
Martin Stjernholm 830152c3cb Add exclude_runtime_libs to more targets. 
Cherry-picked from https://r.android.com/1810756.

Test: `m droid` with https://r.android.com/1810717
Bug: 197856821
Change-Id: I4c93ae4b1f686796827a9635ba4ed50db00e6a8c
Merged-In: I4c93ae4b1f686796827a9635ba4ed50db00e6a8c
 2021-08-31 16:37:01 +01:00
Kousik Kumar 062b011502 Load env variables before c.config() 
If the env variables are loaded after the config object is created, they aren't set in the Environment object inside the config object which causes RBE to not work

Bug: b/198045383
Test: Tested by running a build against rvc-dev branch and ensuring it works.
Change-Id: I509289467df81e5535b4cbbfe4e5eb336c0e4e59
 2021-08-31 05:44:29 +00:00
Mathew Inwood 4669614b92 Update error message for new policy. 
A new presubmit hook enforces that required information is present in
any CL that adds new dependencies to allowed_deps.txt.

Test: m
Bug: 195303213
Merged-In: I1fb932a52f64f9cbf0d12ead75ffd3d9c2a5e942
Change-Id: I1fb932a52f64f9cbf0d12ead75ffd3d9c2a5e942
 2021-08-24 13:17:08 +01:00
Treehugger Robot 4c48b27091 [automerger skipped] Add FAILED: prefix to RBE Fatal error message" am: 907bbdfc9f am: 46d4a14089 -s ours am: 0b7859c0d9 -s ours am: 5fa40b1a2b -s ours 
am skip reason: Merged-In Ie0c9acee2739acf149384e33804b5fca3273c24f with SHA-1 1e4d5f3e67 is already in history

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

Change-Id: I563147d07f921809bfa6ac432169a9c4f1025b10
 2021-08-19 19:56:27 +00:00
Treehugger Robot c7409844c7 [automerger skipped] Add FAILED: prefix to RBE Fatal error message" am: 907bbdfc9f am: 9ba871bbe9 -s ours am: 41a0ece7d4 -s ours am: 1ffe58c42b -s ours 
am skip reason: Merged-In Ie0c9acee2739acf149384e33804b5fca3273c24f with SHA-1 1e4d5f3e67 is already in history

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

Change-Id: Ie1066b72483d6ccfa92e66349d5803baa4576e22
 2021-08-19 19:56:16 +00:00
Treehugger Robot 5fa40b1a2b [automerger skipped] Add FAILED: prefix to RBE Fatal error message" am: 907bbdfc9f am: 46d4a14089 -s ours am: 0b7859c0d9 -s ours 
am skip reason: Merged-In Ie0c9acee2739acf149384e33804b5fca3273c24f with SHA-1 1e4d5f3e67 is already in history

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

Change-Id: I74586233adc72131f77e4fb6c6ee777df07dffd2
 2021-08-19 19:40:34 +00:00
Treehugger Robot 1ffe58c42b [automerger skipped] Add FAILED: prefix to RBE Fatal error message" am: 907bbdfc9f am: 9ba871bbe9 -s ours am: 41a0ece7d4 -s ours 
am skip reason: Merged-In Ie0c9acee2739acf149384e33804b5fca3273c24f with SHA-1 1e4d5f3e67 is already in history

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

Change-Id: I7169df1cda5f89648159bff750aea245384346a6
 2021-08-19 19:40:30 +00:00
Treehugger Robot 0b7859c0d9 [automerger skipped] Add FAILED: prefix to RBE Fatal error message" am: 907bbdfc9f am: 46d4a14089 -s ours 
am skip reason: Merged-In Ie0c9acee2739acf149384e33804b5fca3273c24f with SHA-1 1e4d5f3e67 is already in history

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

Change-Id: Ibf4e6d9cb9077871b480651137e7444670eb88ac
 2021-08-19 19:24:21 +00:00
Treehugger Robot 41a0ece7d4 [automerger skipped] Add FAILED: prefix to RBE Fatal error message" am: 907bbdfc9f am: 9ba871bbe9 -s ours 
am skip reason: Merged-In Ie0c9acee2739acf149384e33804b5fca3273c24f with SHA-1 1e4d5f3e67 is already in history

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

Change-Id: If98b1b5871568e54889b195a475d670e00030c6e
 2021-08-19 19:23:27 +00:00
Treehugger Robot 46d4a14089 Add FAILED: prefix to RBE Fatal error message" am: 907bbdfc9f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15625816

Change-Id: If65b22f21e7b46113800525668598d63020c26fe
 2021-08-19 19:09:43 +00:00