Commit Graph

20850 Commits

Author SHA1 Message Date
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 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
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 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 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 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 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 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 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 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 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 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 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 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
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 0f35aeec67 Merge "Remove special-cased stub deps on framework-res" into rvc-dev 2020-10-16 17:23:22 +00:00
Patrice Arruda e32b384719 Collect the hostname of the machine as a metric. am: af7b75b8db
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12849657

Change-Id: I21d6d894ce261bb9181dc6863c41ff67c5af904a
2020-10-15 22:49:36 +00:00
Anton Hansson c8861c6acb Remove special-cased stub deps on framework-res
This dep is now possible to express in native Android.bp syntax,
which makes the build easier to understand.

Bug: 161214753
Test: build sdk, diff out/dist before and after
Change-Id: I878eda49b5bf54aaf581fc52e0fe9719e4bcdfce
Merged-In: I878eda49b5bf54aaf581fc52e0fe9719e4bcdfce
2020-10-15 17:52:26 +00:00
Patrice Arruda af7b75b8db Collect the hostname of the machine as a metric.
The hostname is collected during a build to determine where the user
is build from (from office workstation, cloudtop, etc...). This is a
useful metrics for RBE related builds.

Bug: b/169395325
Test: m nothing, ran printproto to verify that soong_metrics has the
      hostname.
Change-Id: I3e5d64f948ae43c5dda60de1d4a52b187e36dff8
Merged-In: I3e5d64f948ae43c5dda60de1d4a52b187e36dff8
Merged-In: Ib6898b49c16a830d814efe74581bde463caedf76
2020-10-15 17:39:49 +00:00
Anton Hansson 8fe023c551 Add a tagged output for app's exportPackage
This allows the android stubs to depend on framework-res' exportPackage
without special-casing inside the build system.

Bug: 161214753
Test: depending on this output in a followup CL
Merged-In: I8c5d17540d2624974983d73e56ba17898505dba8
Change-Id: I8c5d17540d2624974983d73e56ba17898505dba8
2020-10-14 17:08:06 +00:00
Patrice Arruda 925c9f2983 resolve merge conflicts of 87deed46bf to rvc-dev
Test: I solemnly swear I tested this conflict resolution.
Bug: b/169423400
Merged-In: If801d23c431a71eddcf332c100b00eacd97ced5a
Merged-In: Ifcce83e3d424a5eaaea38068a9cda79dc8c4b747
Merged-In: I2d3b790f8e031d0607a32cae9a21c6bc9fc3238a
Merged-In: If3cabaf2058844fceaa8366ce3592e8ebd69736e
Change-Id: I8a9768f23a0ebf221a969cebf620e6bd604c7458
2020-09-30 21:14:33 +00:00
Patrice Arruda 68805280f0 resolve merge conflicts of 64d43056ac to rvc-dev
Test: I solemnly swear I tested this conflict resolution.
Bug: b/169423400
Change-Id: I9e4bf3784a1ba5ae49793dbf367347106b997461
Merged-In: I67b229fbf52e913b0c4f5e7932021132ddc0598f
2020-09-30 16:16:23 +00:00
Patrice Arruda 87deed46bf Collect FORCE_USE_GOMA environment variable as a metric. am: 3fc4c98bd9
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12722544

Change-Id: I97b6cc360664bb8a2c2f959a632efd99b9d9021a
2020-09-29 22:48:52 +00:00
Kousik Kumar 64d43056ac Deprecate USE_GOMA and replace with FORCE_USE_GOMA am: dbe59cdd81
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12721330

Change-Id: I6ff581a4b66298a34453282c5709102fbc691d7d
2020-09-29 22:48:49 +00:00
Patrice Arruda 3fc4c98bd9 Collect FORCE_USE_GOMA environment variable as a metric.
FORCE_USE_GOMA is needed to be collected as a metric for the
deprecation of GOMA on Android builds.

Bug: b/169423400
Test: m nothing, ran printproto command
Change-Id: I12300389f1f27239d8f21875d1b6e4ad069d95d7
Merged-In: I12300389f1f27239d8f21875d1b6e4ad069d95d7
2020-09-29 16:40:54 +00:00
Kousik Kumar dbe59cdd81 Deprecate USE_GOMA and replace with FORCE_USE_GOMA
Bug: b/163361527
Test: Ran builds with USE_GOMA / FORCE_USE_GOMA flags
Change-Id: I67b229fbf52e913b0c4f5e7932021132ddc0598f
Merged-In: I67b229fbf52e913b0c4f5e7932021132ddc0598f
2020-09-29 16:40:38 +00:00
Victor Khimenko f81e0a1eaf Merge "Add -D__ANDROID_NATIVE_BRIDGE__ to native_bridge targets" into rvc-dev 2020-09-18 08:44:55 +00:00
Victor Khimenko 17fbc895ec Add -D__ANDROID_NATIVE_BRIDGE__ to native_bridge targets
And remove dual meaning from arm_on_x86 target. It was set for x86
targets with arm support and for arm targets with x86 support - and that
2nd one was abused for native_bridge version of RenderScript.

It's much safer and cleaner to rely on __ANDROID_NATIVE_BRIDGE__ there
while leaving arm_on_x86 to mean "x86 binary built in the image with arm
support".

It's only used by bcc compiler which is in canadian-cross situation here:
it's pure x86-64 binary, but it needs to know about ALL supported
architectures on device because it needs to include appropriate codegen
module.

Bug: http://b/153609531

Test: cts-tradefed run cts --abi armeabi-v7a -m CtsRsCppTestCases
Test: cts-tradefed run cts --abi arm64-v8a -m CtsRsCppTestCases

Change-Id: I869212e0b82eeaa30361a4e183d5c862ab40ef12
Merged-In: I869212e0b82eeaa30361a4e183d5c862ab40ef12
2020-09-17 19:10:04 +00:00
TreeHugger Robot 2e0768753d [automerger skipped] Merge "[DO NOT MERGE] Add Goma deprecation PSA to soong." into qt-dev am: 3f4bdf5015 am: 4d5943fa65 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I601ba14cd5a812b779ddfa02398ac6f68b6eb8ae
2020-09-16 23:43:46 +00:00
Ramy Medhat d6c260c4a2 [automerger skipped] [DO NOT MERGE] Add Goma deprecation PSA to soong. am: ee50d5b5b0 am: db6b17e7ac -s ours
am skip reason: subject contains skip directive

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

Change-Id: I285da4ba062e0c6810a77cc8b4e66412ab9d5964
2020-09-16 23:43:44 +00:00
TreeHugger Robot 4d5943fa65 Merge "[DO NOT MERGE] Add Goma deprecation PSA to soong." into qt-dev am: 3f4bdf5015
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12614869

Change-Id: I37b43e7591eeedc1e78da38362b6b90bfc98118f
2020-09-16 23:38:56 +00:00
Ramy Medhat db6b17e7ac [DO NOT MERGE] Add Goma deprecation PSA to soong. am: ee50d5b5b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12614869

Change-Id: I9503e5c8bbd0412973439f57ffe22f470201d092
2020-09-16 23:38:53 +00:00
TreeHugger Robot 9356c73f02 [automerger skipped] Merge "Start collecting build configuration metrics." into qt-dev am: b4435196a3 am: c3e751fdab -s ours
am skip reason: Change-Id I39536eabad01aafbb3bd7182515d72230b36f658 with SHA-1 09a832cb11 is in history

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

Change-Id: I9d34848d1431ed3cbddba5900813ef99560daecb
2020-09-16 23:33:18 +00:00