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,631 Commits 2 Branches 1 Tag 34 MiB
Commit Graph

42631 Commits

Author SHA1 Message Date
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 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 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 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 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 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 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 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 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 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
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
Treehugger Robot 9ba871bbe9 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: I9e55824b4e8359eb514c6cb3d31b8e0a98c55a7d
 2021-08-19 19:09:04 +00:00
Treehugger Robot 907bbdfc9f Add FAILED: prefix to RBE Fatal error message" 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1560871

Bug: b/195592452
Change-Id: I00e2cb26eb3e1e3b695ba067cad24f45169f3a58
(cherry picked from commit ab2803a870)
Merged-In: Ie0c9acee2739acf149384e33804b5fca3273c24f
 2021-08-19 17:08:49 +00:00
Colin Cross e9fc2e55b3 Collect lint reports from apps in apexes am: 192221b55e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15531885

Change-Id: I013e140227377cb6226a1e771f858f11f0f17fe8
 2021-08-11 18:57:57 +00:00
Colin Cross 192221b55e Collect lint reports from apps in apexes 
Lint reports were only being collected from jars in apexes, not
apps.

Bug: 188772607
Test: mainline_modules_arm64 build
Change-Id: Ie84819343f8b8ab3f43496bbc9b7876d0d0d8e70
Merged-In: Ie84819343f8b8ab3f43496bbc9b7876d0d0d8e70
(cherry picked from commit 8355c1524fbb1d6b7b7a25a13f66feffb1aa7214)
 2021-08-11 09:07:57 -07:00
Kun Niu fe1d6c535c Merge "Use prebuild modules even when coverage is enabled." into sc-dev 2021-08-06 19:12:27 +00:00
Kousik Kumar 0c49dac503 resolve merge conflicts of 233c1be0bd to rvc-dev am: 3c12576942 am: a907f283fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15473760

Change-Id: I42938333328a0a42f99f80ba4b53e64b33935316
 2021-08-06 16:09:04 +00:00
Kousik Kumar e8d959e5cf resolve merge conflicts of 233c1be0bd to rvc-dev am: 3c12576942 am: 4d645c7791 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15473760

Change-Id: I5568c2f0fed211356a521bed0e26332e930bd22b
 2021-08-06 16:03:42 +00:00
Kousik Kumar a907f283fc resolve merge conflicts of 233c1be0bd to rvc-dev am: 3c12576942 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15473760

Change-Id: Ied3e486f490decd767d4ae3c7c63947bf41cdc64
 2021-08-06 15:45:40 +00:00
Kousik Kumar 4d645c7791 resolve merge conflicts of 233c1be0bd to rvc-dev am: 3c12576942 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15473760

Change-Id: I2168fdd669b5ea1b73fce690609be8293fd9069a
 2021-08-06 15:45:38 +00:00
Kousik Kumar 3c12576942 resolve merge conflicts of 233c1be0bd to rvc-dev 
Bug: b/194679562

Change-Id: Icb42c43c1b4c8018b1402bd508271a0d4a052b14
Merged-In: I416e8da75f84aa2b53995f525cf50501488dc972
 2021-08-05 20:16:26 +00:00
Kun Niu ce1dcf6a9f Use prebuild modules even when coverage is enabled. 
Bug: 194323871
Test: local build passed.
Change-Id: I94a3922453473de7d754afce4b05ac3b6ae3765d
 2021-08-05 18:15:28 +00:00
Kousik Kumar 233c1be0bd Merge "Load RBE related env vars from config files" am: b3a5d18470 am: 9f6fa868c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15454953

Change-Id: Ie1e7b2bdb392c33a286d7f52e0fee4ccf560b1b7
 2021-08-05 18:08:31 +00:00
Kousik Kumar 9f6fa868c5 Merge "Load RBE related env vars from config files" am: b3a5d18470 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1773209

Bug: b/194679562
Change-Id: Id84167a3ae6ab15c8b74b72b4cc2c179e0da5d0c
Merged-In: I416e8da75f84aa2b53995f525cf50501488dc972
(cherry picked from commit a7ab7c9394ccfc80e163b5e405792a3975eaf2f3)
 2021-08-03 13:22:44 -04:00
Mathew Inwood e6cc66da0e Merge "Build updatable-bcp-packages.txt from prebuilts in sdk snapshot" into sc-dev 2021-07-26 12:16:14 +00:00
Paul Duffin dbcc29647a Build updatable-bcp-packages.txt from prebuilts in sdk snapshot 
Previously, the java_import and java_sdk_library_import modules did not
make their permitted_packages available to the rule that generates the
updatable-bcp-packages.txt file. This change corrects that.

Bug: 193095050
Test: m nothing
      - Added unit tests, which all failed and then fixed the tests.
Merged-In: If0706e4551a331b48d383123088e63924dded48b
Change-Id: If0706e4551a331b48d383123088e63924dded48b
(cherry picked from commit 630b11e9d4d63e5fabaa20adf5d1b1c81ede6681)
 2021-07-23 09:42:28 +01:00