Commit Graph

62236 Commits

Author SHA1 Message Date
Wei Li
667f8e8e61 Merge "Fix the following issues in bazel_handler:" am: c33c2e732a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2304953

Change-Id: I7bfc46505ca84057478cd87c881873897c538484
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 23:51:45 +00:00
Treehugger Robot
7db19f9485 Merge "Make htmlGzNotice an internal variable instead of apexBundle field." am: 3d99948e29
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2305471

Change-Id: I58654133c2d27b6d50dbd3716388e68c92233b17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 23:51:23 +00:00
Wei Li
c33c2e732a Merge "Fix the following issues in bazel_handler:" 2022-11-16 23:45:47 +00:00
Treehugger Robot
3d99948e29 Merge "Make htmlGzNotice an internal variable instead of apexBundle field." 2022-11-16 23:19:44 +00:00
Jihoon Kang
0ac87c21bd Create java_api_contribution and java_api_library module
Context
- Droidstubs module is currently responsible not only for java api stubs
  generation, but also for checking api equality and compatibility.
- Generating stubs with incomplete api text file that does not list
  entire api surface is done through metalava implicitly adding unlisted
  methods from java source files to the stubs in droidstubs module.
- These factors make java stubs generation harder to debug, thus
  introduce `java_api_contribution` and `java_api_library` modules to make java
  api stubs and jar generation more explicit in Android.bp level and
  eventually easier to debug.

Implementation
- `java_api_contribution` module is included in api domains' directory and
  lists api text file directory to be added to the api surface
- `java_api_library` collects all api text file that forms the api surface
  and creates stubs invoking metalava. Generated java stub files are
  converted into `.srcjar`, and eventually `.jar` file which is the complete
  api surface.

Test: m
Change-Id: I86f097cc8592334a5eaa900cec12764c5fcc09e7
2022-11-16 23:05:41 +00:00
Sam Delmerico
c4366480fd Merge "export neverallow include dir list to Bazel" am: 775f2cb3cd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2302771

Change-Id: I37de03d396e32015aece499219e8ef3e33056ea9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 21:19:19 +00:00
Treehugger Robot
511723d322 Merge "go.mod readability improvement" am: b70f746eac
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2301543

Change-Id: I366045778a729ee77aeab5e7ca5f5dafa688730c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 21:19:01 +00:00
Sam Delmerico
775f2cb3cd Merge "export neverallow include dir list to Bazel" 2022-11-16 20:52:17 +00:00
Treehugger Robot
b70f746eac Merge "go.mod readability improvement" 2022-11-16 20:49:05 +00:00
Ulya Trofimovich
545835d5e9 Merge "Do not assume that boot image profile exists when building ART apex." am: a672771df9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2304851

Change-Id: Icec9811bdfee0183f46992a59a0f0899f5bbe9ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 19:54:15 +00:00
Ulya Trofimovich
a672771df9 Merge "Do not assume that boot image profile exists when building ART apex." 2022-11-16 19:36:31 +00:00
Jingwen Chen
4a9630b4ad Make htmlGzNotice an internal variable instead of apexBundle field.
It's not read outside of the function / action generation logic, so keep
it inside the function.

Test: presubmits
Fixes: 190817312
Change-Id: I0626e6c86adc584abb2a251cbc7ffb1bec2c7f59
2022-11-16 19:12:35 +00:00
Colin Cross
49cce1bcc7 Merge "Remove modules that don't exist from legacyCorePlatformApiModules" am: bf29be8f19
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2299978

Change-Id: Ic4a9cedbc2488d2ace0d1dd9709a28b97a69ed4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 18:36:21 +00:00
Colin Cross
bf29be8f19 Merge "Remove modules that don't exist from legacyCorePlatformApiModules" 2022-11-16 18:09:07 +00:00
Colin Cross
02983c7f72 Merge changes I0886baa4,I584f98f9 am: e4b131a5da
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2299977

Change-Id: I0d4ae5b77be73956619b2b92c7741a3646b967a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 17:35:27 +00:00
Colin Cross
e4b131a5da Merge changes I0886baa4,I584f98f9
* changes:
  Sort legacyCorePlatformApiModules
  Remove SystemUI from legacyCorePlatformApiModules
2022-11-16 17:02:01 +00:00
Wei Li
cbd181c8e8 Fix the following issues in bazel_handler:
1) Convert coverage path wildcard to regex values for --instrumentation_filter to Bazel.
2) Handle the error properly when aquery commmand returns error.

Bug: 258397103
Test: CIs
Change-Id: Ie7485c2c45f2eb0e1ca0dc60478aae04ab151b61
2022-11-16 08:59:23 -08:00
Alix Espino
65d96e5423 Merge "bp2build for java_library with .kt srcs or common_srcs" am: 3044987181
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2302599

Change-Id: I2bcf2ce97ecfe01c3b019bc78aa2cf2462fb57d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 15:46:25 +00:00
Treehugger Robot
c3b766343f Merge "remove dead Bazel code from soong_ui" am: bd12239355
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2302772

Change-Id: Ia3a300d39e9c51ea1b2f37c4c2dd3b8513249adc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 15:46:15 +00:00
Alix Espino
3044987181 Merge "bp2build for java_library with .kt srcs or common_srcs" 2022-11-16 15:40:55 +00:00
Treehugger Robot
bd12239355 Merge "remove dead Bazel code from soong_ui" 2022-11-16 15:27:42 +00:00
Sam Delmerico
43a71dbaab Merge "export clang-tidy extraArgFlags to Bazel" am: d87f61ba18
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2298242

Change-Id: I681af3477a9cfd6646092bbf0342775d530c7d33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 15:10:05 +00:00
Ulya Trafimovich
f5c548db17 Do not assume that boot image profile exists when building ART apex.
If the apex is built without boot images, profile may not exist.

Test: treehugger
Change-Id: I0824100d0ac38f4b7b71b302b401a0c66c3ff3cf
2022-11-16 14:59:05 +00:00
Sam Delmerico
d87f61ba18 Merge "export clang-tidy extraArgFlags to Bazel" 2022-11-16 14:17:43 +00:00
Jiakai Zhang
616be0695e Pass "-Xgc:CMC" to dex2oat when userfaultfd GC is enabled.
This change is a no-op change. It doesn't enable userfaultfd GC by
default. ENABLE_UFFD_GC=true can be passed to the build system to enable
userfaultfd GC for testing purposes.

Bug: 242553398
Test: -
  1. lunch aosp_oriole-userdebug
  2. ENABLE_UFFD_GC=true m
  3. See "--runtime-arg -Xgc:CMC" in .invocation files.
Change-Id: I789b49a71b9604fd41bf1ef77d0ac5bac4cbdf25
2022-11-16 12:04:53 +00:00
Usta Shrestha
ea9996411d ShouldKeepExistingBuldFileForDir look up by dir
instead of scanning every entry in the map for prefix-match, search each ancestor of the dir

Bug: N/A
Test: bazel_test.go#TestShouldKeepExistingBuildFileForDir()
Change-Id: I7c9afa456cca5a70624ae1e9c9b96c43b0110c1e
2022-11-15 21:39:37 -05:00
Usta Shrestha
914bbebc13 go.mod readability improvement
Bug: N/A
Test: Verified by loading the project in IntelliJ
Change-Id: I9fa16fbea108436a52fc3bb4b39d9a2c1a73bee5
2022-11-15 21:35:39 -05:00
Sam Delmerico
46d08b4e39 export neverallow include dir list to Bazel
Bazel needs to recreate the neverallow behavior for absolute includes,
so export the list of include dirs to soong_injection.

Bug: 250931909
Test: aosp/2302925
Change-Id: I3bd345ea4cfb3181f07e4570466f2fc8c5fe32da
2022-11-15 17:33:21 -05:00
Sam Delmerico
d9a34353cf remove dead Bazel code from soong_ui
Test: CI
Change-Id: Ie9b56c59440ab63d421d19b382cf4f669a5ea215
2022-11-15 17:29:27 -05:00
Spandan Das
88b39aea80 Merge changes from topics "nested-nsjail", "ro-api-surfaces-dir" am: ed9729727c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2286094

Change-Id: I05d6f9c26bb31b270c76190448b2e1941e47d160
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 20:43:32 +00:00
Alix
8062f4dee7 bp2build for java_library with .kt srcs or common_srcs
java_library modules with .kt srcs or common_srcs will be converted into
module type kt_jvm_library

Test: m bp2build, manually inspected build files for allowlisted modules
Bug: 258688914
Change-Id: I8293a11c8247b4b76358d0991f82c6b61b58adc3
2022-11-15 20:01:29 +00:00
Spandan Das
ed9729727c Merge changes from topics "nested-nsjail", "ro-api-surfaces-dir"
* changes:
  Special-case Soong finder to look in out/api_surfaces
  nsjail support verification should respect BUILD_BROKEN* flag for SrcDir
2022-11-15 19:56:23 +00:00
Usta (Tsering) Shrestha
aa7a0d418b Merge "re-trigger symlink-forest if bazel.list changes" am: 4b67bb3013
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2302601

Change-Id: Id818bde94016b54ee630a925fab8eda51ce4e3a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 16:22:44 +00:00
Usta (Tsering) Shrestha
4b67bb3013 Merge "re-trigger symlink-forest if bazel.list changes" 2022-11-15 16:09:56 +00:00
Parth Sane
a657ef5094 Merge "Add android.SdkModule to Sdk Versions that have AIDL traces generated" am: d96735d5cc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2297797

Change-Id: I8a3a9d957b43802f1141c3c783b88072ff3fd0ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 13:28:07 +00:00
Parth Sane
d96735d5cc Merge "Add android.SdkModule to Sdk Versions that have AIDL traces generated" 2022-11-15 13:04:42 +00:00
Paul Duffin
624b9d884a Merge "Build mode function should return output file" am: c467a98bc0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2287720

Change-Id: Ib71e4029b2ef0ef7de391d0bc377473c3d54e7a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 09:59:56 +00:00
Paul Duffin
c467a98bc0 Merge "Build mode function should return output file" 2022-11-15 09:37:52 +00:00
Treehugger Robot
05133ce112 Merge "Remove a flag from riscv64 that was copied from arm64." am: ccb63ce404
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2302602

Change-Id: I452826e516d5d7443a9374758017640a1c0af640
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 03:37:45 +00:00
Treehugger Robot
ccb63ce404 Merge "Remove a flag from riscv64 that was copied from arm64." 2022-11-15 03:25:03 +00:00
Treehugger Robot
d84901ed2c Merge "Only generated notices for built variants." am: c8a06ca8c8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2302372

Change-Id: I26eebbbad72f2b3d5fb7220aa4c0594cd79e7713
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 01:21:28 +00:00
Elliott Hughes
9f0c951862 Remove a flag from riscv64 that was copied from arm64.
This causes us to align the text section to 4KiB, not just the data
section. From the bug that added this for arm64, there was an admission
that it costs 17MiB across the tree, and a not entirely convincing claim
of a performance improvement (undermined by the fact that "some stuff
was faster, some stuff was slower"). See http://b/150506341 for that.

Anyway, let's assume we don't want this for riscv64 for now.

Test: `mm -j` in bionic and readelf on the resulting libtest_empty.so
Change-Id: I0ed592a97ef705175191d9c66271a599af4eb18f
2022-11-15 00:56:04 +00:00
Treehugger Robot
c8a06ca8c8 Merge "Only generated notices for built variants." 2022-11-15 00:53:45 +00:00
Treehugger Robot
8f63d417d2 Merge "Ignore bazel-generated paths in dangling rule test" am: 7436b78cf2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2300898

Change-Id: I8a50866b483013ee113b4cdfb12e92eaccaff0d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 23:09:05 +00:00
Paul Duffin
dd251aa3bd Merge "Stop creating unnecessary Context objects" am: 54616f20b0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2287719

Change-Id: Ie005f45830fddd7bc9e8653e098b6069649fd25f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 23:08:55 +00:00
Paul Duffin
aa11933338 Merge "Avoid writing soong_build_metrics.pb multiple times" am: 2335544ef2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2287718

Change-Id: I1c71d7aa23d4ab546300f943e4b504a7517fa80f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 23:08:45 +00:00
Paul Duffin
c2c648949c Merge "Group mixed mode and normal soong build" am: 3d12f4e997
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2287717

Change-Id: I2b4a13e3f4f59fe66b32c79a438a51f1a4a56f97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 23:08:17 +00:00
usta
40a8159a06 re-trigger symlink-forest if bazel.list changes
Bug: b/258870895
Test: run `m --bazel-mode nothing && touch bionic/docs/BUILD.bazel && m --bazel-mode nothing` Then verify symlink_forest reran and `out/soong/workspace/bionic/docs/BUILD.bazel` does NOT exist
Change-Id: I49797fe52b3e0fb6ffe17ed57b8da0b69628fd7e
2022-11-14 17:50:08 -05:00
Treehugger Robot
7436b78cf2 Merge "Ignore bazel-generated paths in dangling rule test" 2022-11-14 22:41:42 +00:00
Paul Duffin
54616f20b0 Merge "Stop creating unnecessary Context objects" 2022-11-14 22:30:53 +00:00