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

43189 Commits

Author SHA1 Message Date
hcl 6cd92b8604 新增aosk编译宏开关，以留后续使用 2022-11-18 15:15:15 +08:00
fanyouwei d8f117ae6a Add starkylin-build-tools in ExcludeDirs for soong. 2022-10-29 16:18:21 +08:00
fanyouwei baf7031711 Change PatchConfig settings for gecko build. 2022-10-29 16:18:21 +08:00
fanyouwei 4134f8167a Add gecko in ExcludeDirs for soong. 2022-10-29 16:18:21 +08:00
Android Build Coastguard Worker d4a42b37ca Snap for 8071527 from 340b39da38 to sc-d2-release 
Change-Id: I2cbed3e725526e103147bf5687570d1bbe13cc6e
 2022-01-13 00:01:15 +00:00
Colin Cross 340b39da38 [automerge] Revert "Time out and dump stacks from R8 processes after 30 minutes" 2p: b18a037fc6 am: 44c522badf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/16426550

Change-Id: Icf53dbe05f00dad699ea1f8ce968f2afa3b78235
 2022-01-11 21:33:01 +00:00
Colin Cross 44c522badf [automerge] Revert "Time out and dump stacks from R8 processes after 30 minutes" 2p: b18a037fc6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/16426547

Bug: 207767452
Change-Id: I33de7faa8e8727e113a7baccb58da00d532eb330
Merged-In: Ia0c3826aea3288e9db3bdbd4955e1e16c0a38fe3
 2021-12-13 19:09:22 +00:00
Colin Cross b18a037fc6 Revert "Time out and dump stacks from R8 processes after 30 minutes" 
This reverts commit 29c294b2cf.

The deadlock in R8 was fixed, and the timeout causes problems when
RBE is enabled and the R8 action gets stuck in a queue for 30
minutes.

Bug: 207767452
Test: checkbuild
Change-Id: Ia0c3826aea3288e9db3bdbd4955e1e16c0a38fe3
Merged-In: Ia0c3826aea3288e9db3bdbd4955e1e16c0a38fe3
(cherry picked from commit a832a04db24683228ab60c86fa17cf343168cb70)
 2021-12-08 21:19:10 -08:00
Android Build Coastguard Worker 2938397f7a Snap for 7891132 from 08dd45a3b5 to sc-d2-release 
Change-Id: I95bbde9f405b62330b31d2eeea5507188a9a9799
 2021-11-06 21:00:32 +00:00
Android Build Coastguard Worker 88e8c60e97 Snap for 7889170 from b7de10739f to sc-d2-release 
Change-Id: I597f7c9ffde77aef3651a5f87350fc1852da6035
 2021-11-06 01:00:40 +00:00
Michael Wright 08dd45a3b5 S V2 is now 32 
Bug: 204295952
Test: N/A
Change-Id: Ib13f30c27cf79c2903e05d3c2cd27d79c4a28668
Merged-In: Ib13f30c27cf79c2903e05d3c2cd27d79c4a28668
 2021-11-05 19:39:17 +00:00
Ivan Lozano b7de10739f rust: Remove libtest from stdlibs list 
libtest does not need to be linked for every module type, so remove it
from the stdlibs list. Instead, link it only when building benchmarks or
tests.

Bug: 193782599
Test: cd external/rust/crates/; mma
Test: Rust tests still run correctly.
Merged-In: I536be8754da0987e09340744d9ebf668b8e734d0
Change-Id: I536be8754da0987e09340744d9ebf668b8e734d0
 2021-11-02 23:53:23 +00:00
Android Build Coastguard Worker 0b66a869be Snap for 7838477 from 9db406c811 to sc-d2-release 
Change-Id: I9e0b98ea72965c9dea91f8f928de223bf74511db
 2021-10-19 23:00:38 +00:00
Colin Cross 9db406c811 Up per-product memory usage to 30 GB 
Reduce multiproduct_kati parallelism by upping required memory per product
to 30 GB.

Bug: 201671935
Test: builds
Change-Id: Ia756f309459d28e22a49f190a5227a139b356a1f
Merged-In: Ia756f309459d28e22a49f190a5227a139b356a1f
 2021-10-19 14:40:11 +00:00
Android Build Coastguard Worker cfc80141ae Snap for 7821078 from b9b436fe17 to sc-d2-release 
Change-Id: I47d7df1e9e209d9451cc44bcbe24c21cb8dc8102
 2021-10-13 23:01:01 +00:00
Jay Aliomer b9b436fe17 Added src and exclude_src to debuggable builds 
Fixes: 200976245
Test: manually tested
Change-Id: I68b6230f30aa2c15e6a80010cd639ea453b4b29e
Merged-In: I68b6230f30aa2c15e6a80010cd639ea453b4b29e
(cherry picked from commit 85a8afa9e72feff6d804c5d0a0827db63cb55fb9)
 2021-10-12 19:06:27 +00:00
Android Build Coastguard Worker dbb23ac878 Snap for 7809322 from bee6271909 to sc-d2-release 
Change-Id: Ida2d8d6f66f9d93f6c8bffe9f59626311b369b5c
 2021-10-09 21:00:43 +00:00
Saeid Farivar Asanjan bee6271909 Add {.aar} support for android_library 
Bug: 199548380
Test: manually
Change-Id: I2c392d3dfc545c23495b03d0f236680fd59e1401
 2021-10-05 13:27:09 -07:00
Android Build Coastguard Worker 40a8b17bc4 Snap for 7721244 from 495a34493a to sc-d2-release 
Change-Id: I8f0a13c11ee92aed349d36a0edce723c8c82dde1
 2021-09-11 01:00:34 +00:00
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
Android Build Coastguard Worker d9a3d39a1f Snap for 7708232 from d50c559c57 to sc-d2-release 
Change-Id: I4c4fb1fdc2a12543e63049ec1e6c22f9e96aa4c5
 2021-09-06 23:00:27 +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
Android Build Coastguard Worker fd4ab45d1d Snap for 7697873 from 27a8b4640a to sc-d2-release 
Change-Id: Ic358b679bc734af6de91d52c03bc955d52fd0a7f
 2021-09-02 23:01:07 +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