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

21820 Commits

Author SHA1 Message Date
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 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
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 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 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
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 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
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
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
Kousik Kumar e992416430 Print the output from RBE bootstrap shutdown am: 91a46d0ef4 am: 1f3a7f6ccf am: 6874a5b8d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/14371203

Change-Id: I7a0c74d03a14f0d6e4ec320306d965dd13b10b2e
 2021-04-30 05:23:14 +00:00
Kousik Kumar 6874a5b8d0 Print the output from RBE bootstrap shutdown am: 91a46d0ef4 am: 1f3a7f6ccf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/14371203

Change-Id: I7d8dd627fd0e93c2ae1a48bb635beb06089dd80a
 2021-04-30 05:07:38 +00:00
Kousik Kumar 1f3a7f6ccf Print the output from RBE bootstrap shutdown am: 91a46d0ef4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/14371203

Change-Id: Ie450c8f1b27f21246b5f17ae6a56b918b7a3a78a
 2021-04-30 04:49:24 +00:00
Kousik Kumar 91a46d0ef4 Print the output from RBE bootstrap shutdown 
The output from bootstrap would contain the a one-line summary of RBE
download / upload stats.

Bug: b/183007125
Change-Id: I90082a8433504e40bbf92992c3c8d1d656c49429
Merged-In: I90082a8433504e40bbf92992c3c8d1d656c49429
 2021-04-29 20:49:13 -04:00
Bob Badour 06a524a85b [automerger skipped] Minimal license feature. am: 459beab694 -s ours am: b5d58b3eaa -s ours am: 64a932b9c7 -s ours am: 7ebfebdb93 -s ours 
am skip reason: skip tag Change-Id Ic78672cd25da13aa9078a48b06446f66780c792d with SHA-1 58d85b87bc is already in history

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

Change-Id: I33d035390a3218f8316b656921970c63b509b545
 2021-03-19 22:08:12 +00:00
Bob Badour 7ebfebdb93 [automerger skipped] Minimal license feature. am: 459beab694 -s ours am: b5d58b3eaa -s ours am: 64a932b9c7 -s ours 
am skip reason: skip tag Change-Id Ic78672cd25da13aa9078a48b06446f66780c792d with SHA-1 58d85b87bc is already in history

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

Change-Id: Ieaddfa6ed52c8febdb199cb604f372afb350d65d
 2021-03-19 21:30:21 +00:00
Bob Badour 64a932b9c7 [automerger skipped] Minimal license feature. am: 459beab694 -s ours am: b5d58b3eaa -s ours 
am skip reason: skip tag Change-Id Ic78672cd25da13aa9078a48b06446f66780c792d with SHA-1 58d85b87bc is already in history

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

Change-Id: I4393e98e96b34b0e4604e0c03a7cc2b16e7a5c2e
 2021-03-19 20:54:22 +00:00
Bob Badour 9a4ba8c6e2 [automerger skipped] Minimal license feature. am: 58d85b87bc am: 6b4ddeb66c -s ours am: 967ca0a6f0 -s ours 
am skip reason: skip tag Change-Id Ic78672cd25da13aa9078a48b06446f66780c792d with SHA-1 dc5be9099b is already in history

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

Change-Id: I205fdd6184d71558111a96988861838906ec8649
 2021-03-19 20:54:19 +00:00
Bob Badour b5d58b3eaa [automerger skipped] Minimal license feature. am: 459beab694 -s ours 
am skip reason: skip tag Change-Id Ic78672cd25da13aa9078a48b06446f66780c792d with SHA-1 58d85b87bc is already in history

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

Change-Id: If527f71987f23aee63aa0a1209572479672398c5
 2021-03-19 20:20:01 +00:00
Bob Badour 967ca0a6f0 [automerger skipped] Minimal license feature. am: 58d85b87bc am: 6b4ddeb66c -s ours 
am skip reason: skip tag Change-Id Ic78672cd25da13aa9078a48b06446f66780c792d with SHA-1 dc5be9099b is already in history

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

Change-Id: I8fd218bbabaf658ef3408fbefe00b9eb2ed8e3f4
 2021-03-19 20:15:33 +00:00
Bob Badour 6b4ddeb66c Minimal license feature. am: 58d85b87bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/13929165

Change-Id: I49453a723ea46a2bda5d21655e569c212564c076
 2021-03-19 19:35:42 +00:00
Bob Badour 459beab694 Minimal license feature. 
Keeps license declarations from breaking the build without implementing
the full feature.

Test: m all

Bug: 181768532

Change-Id: Ic78672cd25da13aa9078a48b06446f66780c792d
Merged-in: Ic78672cd25da13aa9078a48b06446f66780c792d
Merged-in: If3fbc157c6ffed8e3ee4bdd9aa56fabe2c24444b
Merged-in: Ie7e1695ecb8cd943124426a0cad2c0d1db2b46ed
 2021-03-19 01:28:12 -07:00
Bob Badour 58d85b87bc Minimal license feature. 
Keeps license declarations from breaking the build without implementing
the full feature.

Test: m all

Bug: 181768532

Change-Id: Ic78672cd25da13aa9078a48b06446f66780c792d
Merged-in: Ic78672cd25da13aa9078a48b06446f66780c792d
Merged-in: If3fbc157c6ffed8e3ee4bdd9aa56fabe2c24444b
Merged-in: Ie7e1695ecb8cd943124426a0cad2c0d1db2b46ed
 2021-03-19 00:42:52 -07:00
Bob Badour 2c75333a45 Minimal license feature. am: dc5be9099b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/13879853

Change-Id: Ib49755e526c64d8cbaee4e6d26133321b66bd535
 2021-03-16 23:15:55 +00:00
Bob Badour dc5be9099b Minimal license feature. 
Keeps license declarations from breaking the build without implementing
the full feature.

Test: m all

Bug: 181768532

Change-Id: Ic78672cd25da13aa9078a48b06446f66780c792d
Merged-in: If3fbc157c6ffed8e3ee4bdd9aa56fabe2c24444b
Merged-in: Ie7e1695ecb8cd943124426a0cad2c0d1db2b46ed
 2021-03-16 18:53:03 +00:00
TreeHugger Robot f341eaee16 [automerger skipped] Merge "[DO NOT MERGE] Capture the build command that executed the build system." into rvc-dev am: b157ffc6f7 -s ours am: 6b49ce61f9 -s ours 
am skip reason: Change-Id I7ab94dcf037211f1abffe6afd012b03ffbf99756 with SHA-1 807a8f9142 is in history

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

Change-Id: I6a2b6740a8181b8ed8687ae86def6f4ad30529cc
 2020-11-02 22:53:43 +00:00
TreeHugger Robot 6b49ce61f9 [automerger skipped] Merge "[DO NOT MERGE] Capture the build command that executed the build system." into rvc-dev am: b157ffc6f7 -s ours 
am skip reason: Change-Id I7ab94dcf037211f1abffe6afd012b03ffbf99756 with SHA-1 807a8f9142 is in history

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

Change-Id: I51531f29f1543778abd9a66baf9e67f7e7e86967
 2020-11-02 22:41:08 +00:00
TreeHugger Robot b157ffc6f7 Merge "[DO NOT MERGE] Capture the build command that executed the build system." into rvc-dev 2020-11-02 22:31:35 +00:00
Patrice Arruda c90c67fb94 [automerger skipped] [DO NOT MERGE] Capture the build command that executed the build system. am: 807a8f9142 am: 43743ee2ce -s ours am: b777aac4c8 am: c8018262c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12969335

Change-Id: Iea2abcbab2bdda6372738f00d8aecbac3ea38e0d
 2020-11-02 21:19:40 +00:00
Patrice Arruda c8018262c6 [automerger skipped] [DO NOT MERGE] Capture the build command that executed the build system. am: 807a8f9142 am: 43743ee2ce -s ours am: b777aac4c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12969335

Change-Id: I83127208c359ab80837e15fb116b1e3a3a1f4579
 2020-11-02 21:07:56 +00:00
Patrice Arruda b777aac4c8 [automerger skipped] [DO NOT MERGE] Capture the build command that executed the build system. am: 807a8f9142 am: 43743ee2ce -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic96b958a70e654d6f8893bdbd6777027974510fd
 2020-11-02 20:57:53 +00:00
Patrice Arruda 43743ee2ce [DO NOT MERGE] Capture the build command that executed the build system. am: 807a8f9142 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12969335

Change-Id: Ib496613df81acb9e17f1ca4b717583fab39643cc
 2020-11-02 20:44:03 +00:00
Patrice Arruda c5563628f0 [DO NOT MERGE] Capture the build command that executed the build system. 
We need to capture the user build command to understand what additional
arguments is passed in to Soong. This data is useful to know which
targets are being executed and have statistics on top build targets
are specified.

Bug: b/169453712
Test: ran "m blueprint_tools", "m nothing", "lunch 1" and checked
      in soong_metrics proto.
Change-Id: I7ab94dcf037211f1abffe6afd012b03ffbf99756
Merged-In: I7ab94dcf037211f1abffe6afd012b03ffbf99756
Merged-In: If9a1443eff6b48cee865ea914370261f5e0cfee6
 2020-11-02 12:16:56 -08:00
Patrice Arruda 807a8f9142 [DO NOT MERGE] Capture the build command that executed the build system. 
We need to capture the user build command to understand what additional
arguments is passed in to Soong. This data is useful to know which
targets are being executed and have statistics on top build targets
are specified.

Bug: b/169453712
Test: ran "m blueprint_tools", "m nothing", "lunch 1" and checked
      in soong_metrics proto.
Change-Id: I7ab94dcf037211f1abffe6afd012b03ffbf99756
Merged-In: I7ab94dcf037211f1abffe6afd012b03ffbf99756
 2020-11-02 09:50:47 -08:00
Kousik Kumar 16dd7f296f Deprecate both USE_GOMA and FORCE_USE_GOMA flags am: 6d0034f49f am: 04f6efa716 am: 72fd2abc5c am: e21a8a1c00 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12886656

Change-Id: I7f218f2d042cabcad930e683a6dc76314d8bebd1
 2020-10-21 04:20:51 +00:00
Kousik Kumar e21a8a1c00 Deprecate both USE_GOMA and FORCE_USE_GOMA flags am: 6d0034f49f am: 04f6efa716 am: 72fd2abc5c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12886656

Change-Id: I52d2bbdfd8682c37c595b49d3c1bc78a4d96e30c
 2020-10-21 04:14:35 +00:00
Kousik Kumar 72fd2abc5c Deprecate both USE_GOMA and FORCE_USE_GOMA flags am: 6d0034f49f am: 04f6efa716 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12886656

Change-Id: Ib4848042fdc9926a9929e6eebf416e01d045fd90
 2020-10-21 04:01:35 +00:00
Kousik Kumar 04f6efa716 Deprecate both USE_GOMA and FORCE_USE_GOMA flags am: 6d0034f49f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12886656

Change-Id: If52cdcd09678cc154257b22b869f6ebabd8557f0
 2020-10-21 03:53:09 +00:00
Kousik Kumar 6d0034f49f Deprecate both USE_GOMA and FORCE_USE_GOMA flags 
Test:
m USE_GOMA=true GOMA_DIR=$(goma_ctl goma_dir) toybox
m FORCE_USE_GOMA=true GOMA_DIR=$(goma_ctl goma_dir) toybox
both result in error message being printed.

Bug: b/171325288
Change-Id: I94ccaf217dba71aca990d88d205bad669a49a2f5
Merged-In: I94ccaf217dba71aca990d88d205bad669a49a2f5
 2020-10-20 19:51:14 +00:00
Jaewoong Jung d745727f2f Merge "Add data bin and lib properties to sh_test" into rvc-qpr-dev 2020-10-20 13:57:18 +00:00
TreeHugger Robot 3f905b3871 Merge "resolve merge conflicts of e32b384719 to rvc-dev" into rvc-dev am: 7790f714d5 am: b0c70846ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12851151

Change-Id: If1fbc8f73c6fb4a2a61a16b9fcaa19323d535acb
 2020-10-19 20:34:17 +00:00
TreeHugger Robot b0c70846ae Merge "resolve merge conflicts of e32b384719 to rvc-dev" into rvc-dev am: 7790f714d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12851151

Change-Id: I0b4a0274e5a8a78d2d8c5ad5359534a25135e4bf
 2020-10-19 19:57:28 +00:00
TreeHugger Robot 7790f714d5 Merge "resolve merge conflicts of e32b384719 to rvc-dev" into rvc-dev 2020-10-19 19:47:37 +00:00
Patrice Arruda a24c3479a8 resolve merge conflicts of e32b384719 to rvc-dev 
Test: I solemnly swear I tested this conflict resolution.
Bug: b/169395325
Change-Id: Iaac2f8ef4b452c95bdc4584697c3e4e9ed69aa5c
Merged-In: Ib6898b49c16a830d814efe74581bde463caedf76
Merged-In: I3e5d64f948ae43c5dda60de1d4a52b187e36dff8
 2020-10-19 18:09:54 +00:00
Liz Kammer 3098adf57f Merge "Remove special-cased stub deps on framework-res" into rvc-dev am: 0f35aeec67 am: 81768cc9cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12849659

Change-Id: I26c9f5f44f9e503fc757e89098fd020d932b6b0f
 2020-10-16 18:31:35 +00:00
Anton Hansson 8667afc95c Add a tagged output for app's exportPackage am: 8fe023c551 am: 4139580eb7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12838384

Change-Id: Id094c934a1184262b594a33f4f0846e617efc6fb
 2020-10-16 18:31:34 +00:00