Commit Graph

51386 Commits

Author SHA1 Message Date
Paul Duffin
e917d3ae4c Merge "Add custom java_sdk_library info to the SDK info file" am: e73d52cb9b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2096802

Change-Id: I608304c52aeabde76f1104670016decb99acb17a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 15:52:12 +00:00
Paul Duffin
e73d52cb9b Merge "Add custom java_sdk_library info to the SDK info file" 2022-05-20 13:59:19 +00:00
Md Shahriar Hossain Sajib
85b58b0eb9 Merge "Revert "Turn gtest isolated true by default"" am: cf5161be7c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2100876

Change-Id: Icf65911e0001c248b57a041c0e876b788596e17d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:51:43 +00:00
Md Shahriar Hossain Sajib
cf5161be7c Merge "Revert "Turn gtest isolated true by default"" 2022-05-20 08:16:01 +00:00
Md Shahriar Hossain Sajib
d8b58663ff Revert "Turn gtest isolated true by default"
This reverts commit d2a9d88410.

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_master&target=aosp_bramble-userdebug&lkgb=8618360&lkbb=8620137&fkbb=8618374, bug b/233280626

Bug: 233280626
Change-Id: If56b36ea1c883415b90bd2153707cb69df29776e
2022-05-20 08:02:50 +00:00
Yi Kong
b2c1ea9749 Merge "Rename modulesAddedWall to modulesWarningsAllowed" am: 8e836ba4b7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2098612

Change-Id: Ic4d45bffa9df32faacae2dfe83d31ede9b55cc93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 00:29:10 +00:00
Yi Kong
8e836ba4b7 Merge "Rename modulesAddedWall to modulesWarningsAllowed" 2022-05-20 00:26:18 +00:00
Colin Cross
e00639d4ba Merge "Don't call dexpreopter methods on host modules" am: 6c04c66b7e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1908174

Change-Id: Ic826a4d3dff2b9a8efbb31421bfca1a3e4484440
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 20:53:28 +00:00
Julien Desprez
c05fce0836 Merge "Turn gtest isolated true by default" am: 754edfa660
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2092883

Change-Id: I5a003ed4c17da3db19140b54a2273482543f9c42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 20:53:18 +00:00
Colin Cross
6c04c66b7e Merge "Don't call dexpreopter methods on host modules" 2022-05-19 20:46:23 +00:00
Julien Desprez
754edfa660 Merge "Turn gtest isolated true by default" 2022-05-19 20:38:45 +00:00
Bob Badour
15aba3f5e0 Merge "Add gen_notice module." am: 335a4333fe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2095028

Change-Id: I272348571bf762de155909c48c453136a4228e00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 18:47:56 +00:00
Bob Badour
335a4333fe Merge "Add gen_notice module." 2022-05-19 18:03:09 +00:00
Jingwen Chen
4dd02853bd Merge "bp2build: keep existing build files for prebuilts/build-tools recursively." am: 37232d819a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2101510

Change-Id: Ie9fd3af3807407e32e24e6e44c2b6d811b014fcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 15:49:04 +00:00
Jingwen Chen
37232d819a Merge "bp2build: keep existing build files for prebuilts/build-tools recursively." 2022-05-19 15:27:52 +00:00
Lukács T. Berki
0907ebaf1e Merge "Keep a "sanitizer dependency" flag for each sanitizer." am: 913b3c7585
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2098988

Change-Id: Icdca165a5807d56888fecc16b615d0c91b586f1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 12:31:43 +00:00
Lukács T. Berki
913b3c7585 Merge "Keep a "sanitizer dependency" flag for each sanitizer." 2022-05-19 12:14:04 +00:00
Yi Kong
de936474bc Rename modulesAddedWall to modulesWarningsAllowed
MODULES_ADDED_WALL is deceiving and it actually meant which modules are
allowed to have warnings (do not automatically append -Werror flag).

Test: presubmit
Bug: 233183337
Change-Id: Ibd21e269eba04d01f13026d70a9e34ccb1cf26d7
2022-05-19 20:11:10 +08:00
Jingwen Chen
23ca2d2d26 bp2build: keep existing build files for prebuilts/build-tools recursively.
This lets us test https://cs.android.com/android/platform/superproject/+/master:prebuilts/build-tools/tests/BUILD.bazel;l=2;drc=d3dc3d5f20dee2a67dabc1a89dcc9ce93d6f5d44

Test: CI
Change-Id: Ic7c43e3ca655a222ed9113b31761f3cb0d8a45f3
2022-05-19 09:53:56 +00:00
Yi Kong
6dc7f37b34 Merge "Only set -Wall once." am: 6769323a44
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2099056

Change-Id: Ic3e70c84cd63178651d680d7617469e00359474c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 07:59:48 +00:00
Chih-Hung Hsieh
60351d1944 Reduce default global google-* clang-tidy checks am: 8212621410
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2099984

Change-Id: Ic91834f4805e0b102fea08c9e414198577aae94c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 07:55:49 +00:00
Lukacs T. Berki
2da6c3cc86 Keep a "sanitizer dependency" flag for each sanitizer.
This is so that we can avoid mutating state in sanitizerMutator, as
would be necessary if we only had a single bit for every sanitizer
together.

Test: Presubmits.
Change-Id: I5576367c12972fbea64342ab123118ec5a2cfeec
2022-05-19 09:48:57 +02:00
Yi Kong
6769323a44 Merge "Only set -Wall once." 2022-05-19 07:43:08 +00:00
Bob Badour
eef4c1c563 Add gen_notice module.
Refactor notices to support notices for multiple modules.

Enforce visibility and handle missing dependencies.

Bug: 213388645

Change-Id: Id6a81987f087419ad37d0cce57a71e8a7c4cd6e0
2022-05-18 16:38:19 -07:00
Chih-Hung Hsieh
8212621410 Reduce default global google-* clang-tidy checks
Now only keep the ones that do not have thousands of warnings.
We can add more such checks locally or when more warnings
are fixed or suppressed in source files.

Bug: 112478838
Bug: 218759304
Test: make tidy-soong_subset
Change-Id: Iac93310441cdc64ed80e8c30159a08f95e1e9ebc
2022-05-18 14:49:31 -07:00
Elliott Hughes
ed4a27b2e1 Only set -Wall once.
We set -Wall in the global cflags, and then again at the point where we
decide whether or not to add -Werror. The trouble with this is that it
undoes the effect of any attempt to disable a warning implied by -Wall.

Discovered while trying to enable -Wmisleading-indentation (which is
part of -Wall) in a way that doesn't apply to external/ or vendor/.

Test: treehugger
Change-Id: I68d74fb05922dd9f6bd4c8423ca69b485c15e3d2
2022-05-18 13:15:00 -07:00
Lukács T. Berki
2928c292e6 Merge "Make java_fuzz_host not implement Sanitizeable." am: 53c6c67cbb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2096734

Change-Id: Ic100bd6c127db9c22e5d57a930b9621f4eb23226
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 07:11:40 +00:00
Lukács T. Berki
53c6c67cbb Merge "Make java_fuzz_host not implement Sanitizeable." 2022-05-18 06:43:42 +00:00
Treehugger Robot
5015558a51 Merge "bp2build: add support for planting unresolved symlinks in the symlink forest." am: 478db1a882
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2096573

Change-Id: I6acc0803e0789ed177275720a26086de58b44907
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-17 20:34:42 +00:00
Treehugger Robot
7a8e610703 Merge "Fix prebuilts of overridden apps" am: 822029166d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2099730

Change-Id: I8e00672797535abfe4ba46470d7e183c57180622
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-17 20:34:22 +00:00
Colin Cross
61df14acce Don't call dexpreopter methods on host modules
Only call the dexpreopter methods on device modules so broken
dexpreopt configs don't break host-only unbundled builds.

Bug: 207813628
Test: tradefed branch builds
Change-Id: I41deb765a29c5cef9130a4d26aad7f956f75cdd5
2022-05-17 13:15:39 -07:00
Treehugger Robot
478db1a882 Merge "bp2build: add support for planting unresolved symlinks in the symlink forest." 2022-05-17 19:39:42 +00:00
Treehugger Robot
822029166d Merge "Fix prebuilts of overridden apps" 2022-05-17 19:03:42 +00:00
Jingwen Chen
d4b1dc8b2a bp2build: add support for planting unresolved symlinks in the symlink forest.
In the isDir check, there's a possibility that the Stat check fails
because the path is an unresolved symlink. Verify it with Lstat (which
would succeed, since it doesn't follow links), and treat it like a file
if Lstat succeeds.

Test: new integration test
Fixes: 232370097
Change-Id: I9807ca363a5dbdc20639b489b54627bd2cc1ca60
2022-05-17 12:17:53 +00:00
Lukacs T. Berki
8c77ae369a Make java_fuzz_host not implement Sanitizeable.
Also remove a tiny bit of state mutation from sanitizerMutator. Every
little bit helps!

Test: Prebuilts + comparing soong/build.ninja .
 Your branch is up to date with 'aosp/master'.

Change-Id: I73b28b660b572610242765d87b70ab081b0b43df
2022-05-17 11:25:28 +02:00
Treehugger Robot
1232d39289 Merge "Make "overrides" attribute of Android_app overridable" am: 7583481570
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2099732

Change-Id: I6d890192430ce34ccb7553e2c2668c5eff7ac6d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-17 07:03:46 +00:00
Treehugger Robot
7583481570 Merge "Make "overrides" attribute of Android_app overridable" 2022-05-17 06:38:19 +00:00
Colin Cross
aaa0c1ffcd Fix prebuilts of overridden apps
AndroidApp had its own HideFromMake method and flag that shadowed
the one in ModuleBase.  This caused performOverrideMutator to set the
AndroidApp flag, but ModuleBase.skipInstall to read the ModuleBase
flag, resulting in a conflicting install rule being created.  Remove
AndroidApp's HideFromMake in favor of the ModuleBase one.

Bug: 232788722
Test: TestOverrideAndroidAppWithPrebuilt
Change-Id: I8c0dfcb50ff4dc1e4d0574f150b10d79908f46aa
2022-05-16 18:27:00 -07:00
zhidou
198f589222 Make "overrides" attribute of Android_app overridable
Move overrides attribute from appProperties to overridableAppProperties

Bug: 220029162
Test: m
Change-Id: I6f527df3173f142311734333ad37018c83d5e279
Merged-In: I6f527df3173f142311734333ad37018c83d5e279
(cherry picked from commit a2ce78f80d)
2022-05-16 18:26:52 -07:00
Mark Dacek
0ad31129c3 Merge "Grammar nit. Test: N/A" am: 0de6fdde4d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2097638

Change-Id: Icb1699e13b7bdcc9e209ef6c02c1f4422485ddcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 20:16:40 +00:00
Mark Dacek
0de6fdde4d Merge "Grammar nit. Test: N/A" 2022-05-16 19:37:07 +00:00
Paul Duffin
958806b8c8 Add custom java_sdk_library info to the SDK info file
Previously the SDK info file only contained basic common information
about each member. This change adds support for each member to
provide custom information to add to the info file.

It uses that mechanism to add the following:
* "dist_stem"
* "scopes" object containing:
  * for each scope a:
    "<scope>" object containing:
    * "current_api" - the path within the snapshot for the API's .txt
                      file.
    * "removed_api" - the path within the snapshot for the removed
                      API's .txt file.
    * "latest_api" - the path within the build to the latest finalized
                     API .txt file.
    * "latest_removed_api" - the path within the build to the latest
                             finalized removed API .txt file.

In order to access the latest API files it was necessary to add and
resolve dependencies on the module that makes them available. In order
to do that safely the code for creating the names of the modules was
refactored to avoid duplicating the name creation logic.

Bug: 204763318
Test: m nothing
Change-Id: Ica68abbd2b2c7c2b2b7877b502f96cc89f06fd68
2022-05-16 17:09:10 +00:00
Alix Espino
be2d27b673 Merge "convert Dynamic_list property" am: 5b75bf1d7e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2078468

Change-Id: I9bf7b93f4b71f45abb54dfb7be1484b8a9fa2fe9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 16:57:43 +00:00
Alix Espino
5b75bf1d7e Merge "convert Dynamic_list property" 2022-05-16 16:33:51 +00:00
Paul Duffin
fe844bb3f8 Merge "Pass pointer to dependencyTag instead of copying struct" am: 4dd76eb26c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2096446

Change-Id: I8c4217c56e3d11f3d39780931dd6603dc0770b9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 22:20:53 +00:00
Paul Duffin
4dd76eb26c Merge "Pass pointer to dependencyTag instead of copying struct" 2022-05-13 21:46:11 +00:00
MarkDacek
7564127cf2 Grammar nit.
Test: N/A

Change-Id: Ied10037b662cd49573680d392cddd11b628618ff
2022-05-13 20:44:07 +00:00
Christopher Parsons
1bf08694c8 Merge "Deterministic aquery details in mixed builds" am: 58c43e9694
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2097673

Change-Id: I0b47451d66a970de114628385ca856d77d02a78f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 18:28:30 +00:00
Sam Delmerico
ec2519b0b9 Merge "disable usage of plugins as static libs" am: 1cb1c45e8c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2076860

Change-Id: If7f1bd6e9b866acecc65cb615e0d2324d78c9bc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 18:27:56 +00:00
Christopher Parsons
58c43e9694 Merge "Deterministic aquery details in mixed builds" 2022-05-13 18:04:23 +00:00