Commit graph

591 commits

Author SHA1 Message Date
Treehugger Robot
cbc5cc8500 Merge "[Bugfix][Coredump] Fix coredump_enable() in envsetup.sh" am: f6aae1608d
Original change: https://android-review.googlesource.com/c/platform/build/+/2107828

Change-Id: Ic93e452300e3b919dcdcd92c165838bedb5d4e52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 22:15:30 +00:00
Treehugger Robot
f6aae1608d Merge "[Bugfix][Coredump] Fix coredump_enable() in envsetup.sh" 2022-06-02 21:53:40 +00:00
Anton Hansson
10129759b5 Merge "Change default arch for banchan to arm64" am: 3f65d6d834
Original change: https://android-review.googlesource.com/c/platform/build/+/2105084

Change-Id: I71afcacff56545940e25a92ab26c9914c2bdf353
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 09:32:52 +00:00
Anton Hansson
3f65d6d834 Merge "Change default arch for banchan to arm64" 2022-05-31 09:12:24 +00:00
xi yu
addf4833b6 [Bugfix][Coredump] Fix coredump_enable() in envsetup.sh
-P means PID to affect (default $PPID), while -p means Pipe buffer (512 bytes), we should use -P here.

Bug: 234049197

Test: Perform ". build/envsetup.sh" in host, then run "coredump_enable $PID".

Change-Id: Id373f2a7adc56d6a40720ec900b2561c9dbea2b1
2022-05-27 04:58:22 +00:00
Usta Shrestha
596a630c65 Merge "Allow sourcing envsetup from anywhere" am: 0e46244250
Original change: https://android-review.googlesource.com/c/platform/build/+/2097636

Change-Id: Ifd8b3f9d5556a05713ae6d9043d7047b42fb5b27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 17:29:31 +00:00
Anton Hansson
0328e32621 Change default arch for banchan to arm64
Devices that only support 32-bit are very uncommon. Default
to the arch that module authors are most likely to be using.

Test: banchan com.android.sdkext | grep TARGET_PRODUCT
Test: banchan com.android.sdkext arm | grep TARGET_PRODUCT
Test: banchan com.android.sdkext arm64 | grep TARGET_PRODUCT
Change-Id: I31734660318eabbe3279214980b5cdecb55ab80b
2022-05-24 15:47:40 +00:00
Usta Shrestha
1433fb357b Allow sourcing envsetup from anywhere
Bug: 232555676
Test: cd build && source envsetup.sh
Change-Id: I8491628406e494f31589249d1cc851b672dd7cae
2022-05-23 18:50:52 +00:00
Treehugger Robot
c7de0493f1 Merge "Checkpoint new build orchestrator" am: a96be433c4
Original change: https://android-review.googlesource.com/c/platform/build/+/2096153

Change-Id: Id670437d8bb08dff6cac932cee28986a3c0bd20a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 23:37:59 +00:00
Joe Onorato
7cf6f97775 Checkpoint new build orchestrator
Test: rm -rf out && multitree_build
Change-Id: Ic274182f0925f30d56227597b65e5b9ef3b19707
2022-05-12 12:12:38 -07:00
Treehugger Robot
d436fa704b Merge "envsetup.sh: fix adb tab completion" am: 1ef63b944e
Original change: https://android-review.googlesource.com/c/platform/build/+/2087123

Change-Id: I9324867e6b23d6288150ac045bcfb724a381de08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 09:07:17 +00:00
Mårten Kongstad
cb5c73fd9e envsetup.sh: fix adb tab completion
The adb module has been moved from system/core to packages/modules/adb.
Update the path to the adb tab completion script accordingly.

Also teach envsetup.sh to complain if completion files are not found.

Test: manual: adb tab completion works
Test: source build/envsetup.sh && declare -F _adb
Change-Id: I7d6fda3813b95e64de7b1953675f66659e750c31
2022-05-04 14:47:20 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Joe Onorato
0bac4fe09d Make verifymodinfo in envsetup.sh quiet on errors during tab completion
Test: m <tab><tab> before having done a full build.
Test: m <tab><tab> after having done a full build.
Change-Id: I35154151e6902d0337a26eab27d9d4fc797beed7
2021-04-29 15:44:29 -07:00
Joe Onorato
4acbe3b416 Use python3 specifically for envsetup.sh
Test: . build/envsetup.sh ; m <tab>
Change-Id: I94152c567f179fd7829bc675766e764624e5b7a3
2021-04-29 15:44:29 -07:00
Colin Cross
fa50d406bb Clear TARGET_PRODUCT and TARGET_BUILD_VARIANT when getting lunch menu
An old TARGET_PRODUCT value pointing to a removed product or an invalid
TARGET_BUILD_VARIANT value cause lunch to fail to read
COMMON_LUNCH_CHOICES, clear them before calling into the build with
get_build_var.

Test: TARGET_PRODUCT=foobar TARGET_BUILD_VARIANT=foobar lunch
Change-Id: I53d205784149ba7e32cc093f9d81d1a82c08bfc0
2021-04-22 13:05:41 -07:00
Martin Stjernholm
215596dd59 Merge "Allow selecting a different product in banchan." 2021-04-20 11:22:00 +00:00
Treehugger Robot
9dbecd650f Merge "envsetup: fix indent" 2021-04-19 18:16:08 +00:00
Martin Stjernholm
2b8d923a09 Allow selecting a different product in banchan.
Necessary since the products used for APEX modules are different in
internal builds.

Test: banchan com.android.art
Test: banchan com.android.art arm
Test: banchan com.android.art art_module_arm
Test: banchan com.android.art module_arm
Test: banchan com.android.art x86_64
Test: banchan com.android.art art_module_x86_64
Bug: 179779520
Change-Id: Ib59a86b70e409537aaad7258465b6874b589b858
2021-04-19 18:32:00 +01:00
Timi
0469c3f91c envsetup: fix indent
Test: . build/envsetup.sh
Change-Id: I829dafc707dc02d5a31899a784f88a367ec95e94
Signed-off-by: Timi <timi.rautamaki@gmail.com>
2021-04-19 17:07:53 +02:00
Martin Stjernholm
f692c756f7 Add new user setup command banchan for module building.
It currently uses TARGET_BUILD_APPS just like tapas, but the use case is
different and it may diverge more in the future.

Test: banchan com.android.art
Test: banchan help
Test: banchan
Test: hmm
Bug: 179779520
Change-Id: Iae718e65a2a7212c741c397e03c6f9a6d5ee8951
2021-04-13 02:07:04 +01:00
Taesu Lee
ea0cecd9e4 Add "ktgrep" for Kotlin
New ktgrep is added and sgrep/treegrep also scan *.kt files.

Test: kgrep/sgrep/treegrep for Kotlin files.

Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Change-Id: Ie615aa86c4958310785392f18ee7bddaf64706a9
2021-03-16 15:10:34 +09:00
Joe Onorato
2c1aa47057 Add dirmods command to envsetup.sh
It will query module-info.json for modules inside a given directory.

Test: . build/envsetup.sh ; dirmods frameworks/base
Change-Id: Iad3dcb038315f49c156764e34fb5f52ec3ad29be
2021-02-26 08:57:23 -08:00