Commit graph

601 commits

Author SHA1 Message Date
Treehugger Robot
ed826115b7 Merge "revert addition of --skip-soong-test flag" am: 9bc50689c9 am: 3cbef527f0 am: def5eefbb7
Original change: https://android-review.googlesource.com/c/platform/build/+/2060119

Change-Id: I7f60617cc3da425444049cb8f7786a858181f3e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 17:22:14 +00:00
Treehugger Robot
3cbef527f0 Merge "revert addition of --skip-soong-test flag" am: 9bc50689c9
Original change: https://android-review.googlesource.com/c/platform/build/+/2060119

Change-Id: I5bea9a572c1257509131f042df2efc196cd87fa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 16:37:41 +00:00
Sam Delmerico
9d67a905b7 revert addition of --skip-soong-test flag
aosp/2045666 attempted to permit passing the `--skip-soong-tests` flag
through the `b` command to `soong_ui`, but it has been causing problems.

Test: b build '...' --skip-soong-tests is not recognized
Test: build/bazel/ci/bp2build.sh
Change-Id: I02487841d8081218dc941cb04bfa1a9e148ab6af
2022-04-11 12:27:10 +00:00
Treehugger Robot
b233bcfe39 Merge "Implement multitree lunch" am: 9d1b28ed10 am: 1080b9f3f6 am: 9ebe2e2729
Original change: https://android-review.googlesource.com/c/platform/build/+/2060107

Change-Id: Iec70a4739c1b93050b3d4827b409c554da0dd2d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-09 03:13:22 +00:00
Treehugger Robot
1080b9f3f6 Merge "Implement multitree lunch" am: 9d1b28ed10
Original change: https://android-review.googlesource.com/c/platform/build/+/2060107

Change-Id: I8f1f7fc98a0e521a9e3347d1b140eefa657857a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-09 00:41:56 +00:00
Treehugger Robot
9d1b28ed10 Merge "Implement multitree lunch" 2022-04-09 00:19:03 +00:00
Joe Onorato
824608c33d Implement multitree lunch
Test: (cd build/make/orchestrator/core ; ./test_lunch.py)
Change-Id: I4ba36a79abd13c42b986e3ba0d6d599c1cc73cb0
2022-04-08 13:42:55 -07:00
Treehugger Robot
4e72e7557f Merge "prevent unintended m bp2build "" when running b" am: 54dbc8c36a am: 83cd363614 am: 7a1cca449f
Original change: https://android-review.googlesource.com/c/platform/build/+/2055109

Change-Id: I32e8c53f9dfd4f7e2dd5edccaf118fec9a513f36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 20:44:35 +00:00
Treehugger Robot
83cd363614 Merge "prevent unintended m bp2build "" when running b" am: 54dbc8c36a
Original change: https://android-review.googlesource.com/c/platform/build/+/2055109

Change-Id: I654dd587a07486f03d8ab1aa761c1f972e3fada1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 19:47:47 +00:00
Sam Delmerico
89a4702555 prevent unintended m bp2build "" when running b
cl/2045666 allowed the --skip-soong-tests flag to pass through
invocations of the `b` command to soong_ui. But when the flag was
missing, an extra `""` argument was passed instead which caused soong_ui
to invoke a build of the droid target.

Test: m clean && b build '...'  # verify Soong does not run a build
Change-Id: I7b99437d225786eb1698a88d0c755ce897550e70
2022-04-05 13:47:32 +00:00
Treehugger Robot
a92032b7c6 Merge "add flag to skip soong tests for b command" am: 375dd60d5a am: 9244deabb0 am: 6fa65aef1c
Original change: https://android-review.googlesource.com/c/platform/build/+/2045666

Change-Id: I9b51987a12706961df931277d186c5a467c239bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 20:43:50 +00:00
Treehugger Robot
6fa65aef1c Merge "add flag to skip soong tests for b command" am: 375dd60d5a am: 9244deabb0
Original change: https://android-review.googlesource.com/c/platform/build/+/2045666

Change-Id: Ia62bc9642e7f2d2a688a19e5ca166987acb36057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 20:20:13 +00:00
Sam Delmerico
ef43149136 add flag to skip soong tests for b command
Sometimes it is very handy during testing to temporarily skip Soong
tests, but there is not easy method to allow this without changing the
envsetup.sh file and re-sourcing before/after enabling/disabling the
skip-tests flag.

Test: b build '...' --skip-soong-tests
Change-Id: I6dcad3ba0336cfd1c4d2c4357b852900792445c3
2022-03-29 14:39:33 +00:00
Will Burr
79626450f0 Merge "envsetup.sh: Update text in lunch menu for clarity" am: 44adfa7f8c am: 0b828a50c7 am: c838e15827 am: 0bc5e16871
Original change: https://android-review.googlesource.com/c/platform/build/+/1974422

Change-Id: I20ec8376a69d29454a5d365d9e45052cba5e7ddf
2022-02-09 20:37:03 +00:00
Will Burr
0bc5e16871 Merge "envsetup.sh: Update text in lunch menu for clarity" am: 44adfa7f8c am: 0b828a50c7 am: c838e15827
Original change: https://android-review.googlesource.com/c/platform/build/+/1974422

Change-Id: I6f2c3d6aa414773e6aa737800a886762801112cd
2022-02-09 20:22:05 +00:00
Will Burr
404012020f envsetup.sh: Update text in lunch menu for clarity
Updates the lunch menu text to make it clearer that the choices in lunch
menu are not fully comprehensive. As the list comes from common lunch
choices the text now refers to 'common combinations' and informs that
you can 'specify your own'. This should help developers who are unsure
why they cannot find their desired lunch target in the list.

Change-Id: Ib9d55ee46b7037c30a8f4b43fdd552ea66e887e8
Test: source build/envsetup.sh && lunch
2022-02-09 15:25:17 +00:00
Presubmit Automerger Backend
4dd821f386 [automerge] Add a keys argument to tapas 2p: 5ff4380b5d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16804130

Bug: 216553104
Change-Id: Ibc4ef4f682bbdb50c3aef23ee9cf4e68c247f7de
Merged-In: I2161be9e15f99713e11d22901d6eb7ad3c420093
2022-02-07 18:50:33 +00:00
Colin Cross
5ff4380b5d Add a keys argument to tapas
Add a keys argument to tapas that allows specifying devkeys to
use internal aosp_devkeys_* products that use the internal
devkeys, which will allow building unbundled apps that use platform
keys for testing.

Bug: 216553104
Test: tapas CarMediaApp devkeys
Change-Id: I2161be9e15f99713e11d22901d6eb7ad3c420093
Merged-In: I2161be9e15f99713e11d22901d6eb7ad3c420093
2022-02-07 18:50:22 +00:00
Colin Cross
7f49a67d0d Add a keys argument to tapas
Add a keys argument to tapas that allows specifying devkeys to
use internal aosp_devkeys_* products that use the internal
devkeys, which will allow building unbundled apps that use platform
keys for testing.

Bug: 216553104
Test: tapas CarMediaApp devkeys
Change-Id: I2161be9e15f99713e11d22901d6eb7ad3c420093
2022-01-28 16:56:43 +00:00
Treehugger Robot
2495360637 Merge "Ensure there are no empty paths in ANDROID_BUILD_PATHS and PATH." am: 46bd6ec0f6 am: 1ec033c132 am: 8676adc660 am: fd8a495fff
Original change: https://android-review.googlesource.com/c/platform/build/+/1900564

Change-Id: I5557c20f12bb9d17c9a09ee4b1a325bcd66f0515
2021-11-24 20:35:52 +00:00
Martin Stjernholm
6a012266a1 Ensure there are no empty paths in ANDROID_BUILD_PATHS and PATH.
Test: lunch armv8
      - Check that PATH has no "::".
      - Check that an executable script in CWD doesn't get executed.
Change-Id: I3a97eb661c614ff2e09723e9ccca0bdeb63dbdc5
2021-11-24 14:59:15 +00:00
Kousik Kumar
d086b0918a Merge "Remove unnecessary RBE sourcing in envsetup.sh" am: 8bd19a4143 am: 49433fefde am: 3a42b842ba am: 49fd1bb0b3 am: 2fb7d4ab03
Original change: https://android-review.googlesource.com/c/platform/build/+/1877136

Change-Id: I237f25a6ba0f0a32b42742b83164861d13862825
2021-11-09 21:39:54 +00:00
Kousik Kumar
bd9b9b0226 Remove unnecessary RBE sourcing in envsetup.sh
We no longer need these since we switched to config files and I missed removing them. So removing them now

Bug: b/202340353
Change-Id: Ibab8ab8d4a45e01d2c98632ccee2684ea600ff69
2021-11-01 01:36:03 -04:00
Treehugger Robot
7f5cee09f9 Merge "Support -s in installmod command" am: 8cdc80bc24 am: 12f85f31e3 am: e7af6fa1e6 am: 493776ffd7 am: 82a39a7d70
Original change: https://android-review.googlesource.com/c/platform/build/+/1869665

Change-Id: Ia6ce242ae4012af90def209d8c6fe5d4cf78809c
2021-10-26 02:27:14 +00:00
Cole Faust
3e1923867a Support -s in installmod command
The -s flag must be passed before the adb command,
as in `adb -s emulator-5554 install myapp.apk`
instead of `adb install -s emulator-5554 myapp.apk`.
Parse it and move it to the correct location if it
exists.

Test: Manually
Change-Id: I4b296d7fe4efbe3b25d21d33a8082b321787651a
2021-10-25 13:43:48 -07:00
Treehugger Robot
eb94295e66 Merge "Remove removed selinux prebuilts from $PATH" am: 472833c0dc am: 7418e06869 am: a3d538864e am: e99a5383e7 am: 6b03f45367
Original change: https://android-review.googlesource.com/c/platform/build/+/1842319

Change-Id: Iaafd915aef68bd0785592f8ded95f6cef33cd4da
2021-10-01 07:20:31 +00:00
Dan Willemsen
838dcece45 Remove removed selinux prebuilts from $PATH
These were removed in https://android-review.googlesource.com/c/platform/external/selinux/+/1807296

Change-Id: If13bbeff5e14dc0bcc2e1f30ba5d7eab8d0ff6e3
2021-09-30 22:40:38 +00:00
Jingwen Chen
0dc9e9aee0 Merge "Remove module_name_to_label short circuit from m." am: 4528968faf am: 6492201d28 am: 12b73bc1f5 am: 685f419e0f am: 457d4dbda7
Original change: https://android-review.googlesource.com/c/platform/build/+/1829694

Change-Id: I459026895d210c9e7dbf2b46191600fa43815558
2021-09-20 12:32:59 +00:00
Jingwen Chen
0e4eba1544 Remove module_name_to_label short circuit from m.
This wasn't adding much value, let's remove it for now until we decide
on how mixed builds will be exposed for users later.

Test: USE_BAZEL_ANALYSIS=1 m droid
Change-Id: I16465fd7759646964ea8c50aab6ab91f47c5e8d1
2021-09-17 08:45:30 +00:00
Treehugger Robot
0fa85301dc Merge "Replace GENERATE_BAZEL_FILES=1 with "m bp2build"." am: f673d10736 am: af7f572207 am: d6d5fbd463 am: 375370fdaa am: d10de8bd7d
Original change: https://android-review.googlesource.com/c/platform/build/+/1818098

Change-Id: If9ca0f92a1dd6edce46dc4d3e803b9d4231ae4a5
2021-09-07 11:01:34 +00:00
Lukacs T. Berki
3fef660fae Replace GENERATE_BAZEL_FILES=1 with "m bp2build".
This should have been submitted in the pertinent topic, but I messed by
git repositories up.

Test: Presubmits.
Change-Id: I7f3e9648c1961169ff40c8e2ddaf3d893498f625
2021-09-07 08:20:33 +02:00
Treehugger Robot
6bba054440 Merge "Add a prompt to try out RBE for local builds" am: f72c0facd3 am: 859caa8d1e am: ac007172d0 am: 33de4bbe25 am: 11dd7c70d6
Original change: https://android-review.googlesource.com/c/platform/build/+/1806336

Change-Id: I92c3a4e359267ad9a03197f1a3bd63b7fda0e5c4
2021-08-23 22:10:38 +00:00
Kousik Kumar
09af254c8f Add a prompt to try out RBE for local builds
This is to nudge developers to use RBE especially when they run into
long builds and do NOT have RBE turned on.

Change-Id: I7da94763f5387310e522931bf650f9d7c01dc7f2
2021-08-23 14:55:35 -04:00
Kousik Kumar
743c4a0e6a Merge "Add the ability to source RBE related scripts from envsetup.sh" am: 660fdcd664 am: 2a678d73ab am: d66723fbe6 am: 53d07e9f0d
Original change: https://android-review.googlesource.com/c/platform/build/+/1766185

Change-Id: Iffe667b37563c1fc587e567af3449e5d34b8123c
2021-07-14 19:51:56 +00:00
Kousik Kumar
721533e0d6 Add the ability to source RBE related scripts from envsetup.sh
This is so that developers don't have to remember to source a separate
script to source RBE related variables.
I'll modify the docs once this change is submitted.

Test:
Ran forrest build with fix for previous build failure - https://android-build.googleplex.com/builds/abtd/run/L72300000950316038

Bug: b/193407413
Change-Id: I16f057086e2ee4f5918816ea70dbb33d0f5e99ab
2021-07-14 11:31:54 -04:00
Ahaan Ugale
04a01c67d6 Merge "Revert "Add the ability to source RBE related scripts from envsetup.sh"" am: 203c72ee23 am: 3fafb9b720 am: b84510e31e am: a98c3d76c3
Original change: https://android-review.googlesource.com/c/platform/build/+/1764839

Change-Id: Ie229b1ccac498c5a1df30b1a25a3aeefae84637c
2021-07-13 23:20:26 +00:00
Ahaan Ugale
678f26c1e7 Revert "Add the ability to source RBE related scripts from envsetup.sh"
This reverts commit 9aa9e47b8c.

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_rvc-qpr-dev-plus-aosp&target=ndk&lkgb=7546337&lkbb=7546521&fkbb=7546426, bug https://buganizer.corp.google.com/issues/193566521

Fix: 193566521
Change-Id: I7196a00006499f729baa86a252b0df6535c6aeaa
2021-07-13 22:12:24 +00:00
Treehugger Robot
3cdbcac1a6 Merge "Add the ability to source RBE related scripts from envsetup.sh" am: 10935cf315 am: 85382dcfec am: 955e561ffa am: 1023e9f615
Original change: https://android-review.googlesource.com/c/platform/build/+/1763565

Change-Id: I2bd1d35db99b204e4bb406609b0d0fbc33b03f2c
2021-07-13 21:15:15 +00:00
Kousik Kumar
9aa9e47b8c Add the ability to source RBE related scripts from envsetup.sh
This is so that developers don't have to remember to source a separate
script to source RBE related variables.
I'll modify the docs once this change is submitted.

Test:
USE_RBE=true source build/envsetup.sh sources RBE variables.
USE_RBE=false source build/envsetup.sh does NOT source RBE variables.
source build/envsetup.sh does NOT source RBE variables.

Bug: b/193407413
Change-Id: Ib8abf4c307b02fbb0c63b8a62d7aeda8be42d0fb
2021-07-12 14:05:13 -04:00
Treehugger Robot
3299f7e724 Merge "Direct Bazel builds from m." am: 186c7779f1 am: 65b4bb73cc am: 3cd5e84603 am: c9ed94626c
Original change: https://android-review.googlesource.com/c/platform/build/+/1737506

Change-Id: I321d571acddffa88f53085beceda85c8f0cc7a15
2021-06-21 19:54:34 +00:00
Jingwen Chen
bfa114d05b Direct Bazel builds from m.
This CL extends the `m` function to short circuit to Bazel iff:

1) USE_BAZEL_ANALYSIS is set to 1 or true
2) There is only 1 Soong module requested to be built
3) The Soong module has a corresponding Bazel alias target in @soong_injection//targets/BUILD to the real target in out/soong/workspace.

Test: TH
Change-Id: I976ffa53106c0b52c75b71f1e0e1e8b3ef5cb3d1
2021-06-21 06:12:33 +00:00
Treehugger Robot
6cd53418f8 Merge "Show bazel help for b called without args." am: bb53fe394b am: 541174975b am: 561e16a0a5 am: bbdac0940c
Original change: https://android-review.googlesource.com/c/platform/build/+/1737501

Change-Id: I5defbca387879b6913cd04b993a500630dfb7678
2021-06-17 03:22:29 +00:00
Jingwen Chen
69f9ed14a9 Show bazel help for b called without args.
This is less surprising than trying to use --config=bp2build as the only args, which is invalid.

Test: source build/envsetup.sh; b
Change-Id: I0b3724d05b8cc149268e660eb672192fe9bad19d
2021-06-16 09:44:57 +00:00
Anton Hansson
43e582a0c0 Merge "Add help message for likely typo to lunch" am: 757e2e1fc1 am: 47bebaca8b am: e444a5c3fb am: 86eac1d610
Original change: https://android-review.googlesource.com/c/platform/build/+/1736893

Change-Id: Id6a3738ea35587f36b1fb8f3669e91ac378c6b19
2021-06-15 17:47:46 +00:00
Anton Hansson
32fa7ee8c3 Add help message for likely typo to lunch
Test: lunch aosp_blueline_userdebug
Change-Id: Ieb8059d1717a98f66d61387d6bfd28470835eb6e
2021-06-14 17:21:22 +01:00
Jingwen Chen
0b7f33bbdb Merge "Improve bazel() warning in envsetup.sh." am: c137b8520b am: e0b4775fed am: c9e50e33b1 am: 62aec15055
Original change: https://android-review.googlesource.com/c/platform/build/+/1732933

Change-Id: I340d0dda6e074a1dd256c5b373a425a6bb14125a
2021-06-10 11:33:01 +00:00
Jingwen Chen
17d569940f Improve bazel() warning in envsetup.sh.
Fixes: 190688038

Test: source ~/aosp/build/envsetup.sh && cd / && bazel
Change-Id: I309a77e109d8b3a65c4b28aeb5fbf2a059006ee0
2021-06-10 08:17:54 +00:00
Jingwen Chen
14e8d673a1 Merge "Introduce b into envsetup.sh." am: ec11d42e3b am: eb5ad873b7 am: 75941f99fe am: 88ca5a67c0
Original change: https://android-review.googlesource.com/c/platform/build/+/1710468

Change-Id: Id5a27695451f071d853cfa24b44a9becdb2e24c7
2021-05-20 02:46:29 +00:00
Jingwen Chen
d728ee1a06 Introduce b into envsetup.sh.
`b` is a function that combines:

1. Integrated generation of a synthetic bazel workspace, containing
symlinks to BUILD and bzl files alongside symlinks to the source tree.
This is the --package_path of the bazel build.
2. Running the Bazel build itself with b's entire argv.

A user accustomed to typing `bazel build <targets>` would
now type `b build <targets>`.

Test: source build/envsetup.sh; b build //bionic/...; b cquery --output=label_kind //bionic/...
Fixes: 188490434
Change-Id: I36e366108b024c09945d764a1115786658e03681
2021-05-18 23:37:39 +00:00
Kousik Kumar
41dacd1870 Add a warning to lunch command for metrics collection
When metrics collection is enabled but
there's no gcert, print a warning and ask the user to run gcert so that
metrics collection can work.

Bug: b/184040091
Change-Id: Ib79c61e89a42dc7da9ef452b7101dac955859a7d
2021-05-12 09:56:20 -04:00