Commit Graph

73000 Commits

Author SHA1 Message Date
Jihoon Kang
b06d8a51ea Denylist "bouncycastle-test-lib" to resolve build failures
aosp/2711135 adds `bouncycastle-test-lib` module, which is a
reverse dependency of the denylisted `bouncycastle`, causing
bp2build failure. This change denylists the module to resolve the
failure.

Test: TH
Bug: 297039097
Change-Id: Idbb8f5a17bd5727c53686ba16fe3ff1215e0d0ed
2023-08-22 18:30:05 +00:00
Tomislav Novak
f734f00898 soong: HWASan exclude path support
Adds the ability to centrally disable HWASan for multiple modules when
building with SANITIZE_TARGET=hwaddress. Soong version of the patchset.

HWASan takes precedence over CFI and several other sanitizers that it's
incompatible with[1], which can be problematic for modules that require
those sanitizers (e.g. those that depend on vendor prebuilts where only
sanitized variants are provided). This patch adds an easy way to disable
HWASan for such modules while still keeping it globally enabled.

Test: build with HWASAN_EXCLUDE_PATHS set and verify with readelf that
      relevant modules have no references to __hwasan symbols

[1] bb31ca1168/core/config_sanitizers.mk (236)

Change-Id: I5824f71f2a400c64cde29e2c7afdd167d851d337
2023-08-22 18:15:14 +00:00
Yu Liu
d136a6aa01 Support dynamic config file for cc_test.
Bug: 280028705
Test: local build
Change-Id: Ife445f6a7642bf08651ed7a9501a60950f05f9c4
2023-08-22 17:33:20 +00:00
Motomu Utsumi
44591557f4 Add package/modules/Connectivity bpf_headers path
Following CLs will move frameworks/libs/net to packages/modules/Connectivity.
This CL is a preparation for that.

Bug: 296014682
Test: m
Change-Id: Ie6483d1e5dfbf6c4745c10d3bb031344368c8c8f
2023-08-22 19:24:24 +09:00
Jeongik Cha
5391578b04 Merge "Reland "Make glob output include product name"" into main am: 962bcdb18e am: 208785ebe0 am: 2cf2db5ddd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2693106

Change-Id: I4a4c4b9e447293f8670d248514bc51e107ab0daf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22 06:33:35 +00:00
Jeongik Cha
2cf2db5ddd Merge "Reland "Make glob output include product name"" into main am: 962bcdb18e am: 208785ebe0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2693106

Change-Id: I00b5f8c05c7aba48a3b09cd5fa020a3b348998e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22 05:56:59 +00:00
Jeongik Cha
208785ebe0 Merge "Reland "Make glob output include product name"" into main am: 962bcdb18e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2693106

Change-Id: I774ffb1c052ef45e64036a6edb318bf0f68bd212
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22 05:19:21 +00:00
Jeongik Cha
962bcdb18e Merge "Reland "Make glob output include product name"" into main 2023-08-22 04:41:43 +00:00
Chun-Yi Lee
54bf447cad Merge "Revert "Add apex compat symlinks to LOCAL_SOONG_INSTALL_SYMLINKS"" into main am: 516a188206 am: adafb24027 am: 99696fd3a2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2720713

Change-Id: I08a0606fff923e2a2ce4f43c38590854e3996d37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22 04:09:09 +00:00
Treehugger Robot
8efe864294 Merge "Add BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN" into main am: 4f53e94198 am: c17e5b8ac8 am: 8fb44deb48
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2714999

Change-Id: I4a135d444d5395f4b86f2a0a6611e532dce040f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22 04:08:47 +00:00
Chun-Yi Lee
99696fd3a2 Merge "Revert "Add apex compat symlinks to LOCAL_SOONG_INSTALL_SYMLINKS"" into main am: 516a188206 am: adafb24027
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2720713

Change-Id: I3e26cf6c74166f2cadfb1c503e94a23abdb944a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22 03:33:12 +00:00
Treehugger Robot
8fb44deb48 Merge "Add BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN" into main am: 4f53e94198 am: c17e5b8ac8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2714999

Change-Id: Iff789d76b56d51d33340d00080fc8387d89c43db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22 03:32:47 +00:00
Chun-Yi Lee
adafb24027 Merge "Revert "Add apex compat symlinks to LOCAL_SOONG_INSTALL_SYMLINKS"" into main am: 516a188206
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2720713

Change-Id: I4c20d486f27ee4350732d647495ed42efc0ee017
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22 02:56:57 +00:00
Treehugger Robot
c17e5b8ac8 Merge "Add BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN" into main am: 4f53e94198
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2714999

Change-Id: I897917496fdb3acc0edc52facdff1d7d03a8fdde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22 02:55:58 +00:00
Chun-Yi Lee
516a188206 Merge "Revert "Add apex compat symlinks to LOCAL_SOONG_INSTALL_SYMLINKS"" into main 2023-08-22 02:11:23 +00:00
Treehugger Robot
4f53e94198 Merge "Add BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN" into main 2023-08-22 02:09:45 +00:00
Chun-Yi Lee
0a693c5b5c Revert "Add apex compat symlinks to LOCAL_SOONG_INSTALL_SYMLINKS"
Revert submission 2718295-colefaust_track_apex_compat_symlinks

Reason for revert: To validate if this change is causing the build breakage.

Reverted changes: /q/submissionid:2718295-colefaust_track_apex_compat_symlinks

Change-Id: I1896530219cf984efdf9ca7f4b14d8784367f242
2023-08-22 01:18:45 +00:00
Justin Yun
74217d9177 Use vndk snapshot libraries txt files if exist
For the trunk stable next build, we have duplicated modules for the
vndk libraries txt files: one from the generated list, the other from
the prebuilt vndk snapshot files.
If the current vndk version provided by the vndk snapshots, use the
txt file from the prebuilt vndk snapshot.

Bug: 296777146
Test: lunch cf_x86_64_phone-next-userdebug && m nothing
Change-Id: I18bd7b7c77bd37c26c5e0b15cb020a59d50f4f2f
2023-08-22 10:11:52 +09:00
Krzysztof Kosiński
4353fab901 Enable -Wgnu-designator
Bug: 296606895
Test: presubmit
Change-Id: I2ef67807fef8376ea08f65f60439b7c3b6f73e83
2023-08-21 23:55:44 +00:00
Cole Faust
2c67aad06d Merge "Add apex compat symlinks to LOCAL_SOONG_INSTALL_SYMLINKS" into main am: f36d157ce7 am: 24935919a1 am: 8a19a7ec0c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2718295

Change-Id: Icfd2f160fbc70902c1b05aef3a1d561b95b6fff8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 23:26:36 +00:00
Cole Faust
8a19a7ec0c Merge "Add apex compat symlinks to LOCAL_SOONG_INSTALL_SYMLINKS" into main am: f36d157ce7 am: 24935919a1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2718295

Change-Id: Ibc3e54a3148793aa35a86c6f2caa6d87d142fa15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 22:52:21 +00:00
Treehugger Robot
c5d8b8e7a5 Merge "Handle proto.include_dirs in bp2build for CC" into main am: 4147e5c1d1 am: 8224ccfa09 am: e9173113b6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2711114

Change-Id: I56e07d4ecbb17cf9f57a4f43905135dabb131a70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 22:17:45 +00:00
Treehugger Robot
d84d0a5325 Merge "Document why certain warnings are disabled." into main am: 0415285596 am: 5fa60b81d7 am: 68b321aeb5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2717854

Change-Id: I566e947973a20ecc9e1958945cd7c39fbf3beb01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 22:17:26 +00:00
Treehugger Robot
93c9e61bc9 Merge changes I8ee7e5c7,Ibfcd2bc5 into main am: 97048ab022 am: 0ef92f4dde am: 60e94b3e1d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2719834

Change-Id: I71f8bc08308fa53202b5bc9783c648c0376226a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 22:17:06 +00:00
Cole Faust
24935919a1 Merge "Add apex compat symlinks to LOCAL_SOONG_INSTALL_SYMLINKS" into main am: f36d157ce7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2718295

Change-Id: I1250f20a99766b5adf244700c1dabc36f36eeb28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 22:15:24 +00:00
Cole Faust
f36d157ce7 Merge "Add apex compat symlinks to LOCAL_SOONG_INSTALL_SYMLINKS" into main 2023-08-21 21:54:37 +00:00
Treehugger Robot
e9173113b6 Merge "Handle proto.include_dirs in bp2build for CC" into main am: 4147e5c1d1 am: 8224ccfa09
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2711114

Change-Id: Ib4c116dad7b660b4ae519d549c066661238ad1a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 21:43:23 +00:00
Treehugger Robot
68b321aeb5 Merge "Document why certain warnings are disabled." into main am: 0415285596 am: 5fa60b81d7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2717854

Change-Id: I7ab781dae641a79470acd9c33d4051e306c550d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 21:43:08 +00:00
Treehugger Robot
60e94b3e1d Merge changes I8ee7e5c7,Ibfcd2bc5 into main am: 97048ab022 am: 0ef92f4dde
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2719834

Change-Id: I99a53d5aca7e841aab84510f726735328397887a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 21:42:34 +00:00
Treehugger Robot
8224ccfa09 Merge "Handle proto.include_dirs in bp2build for CC" into main am: 4147e5c1d1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2711114

Change-Id: Id41a9f2d4e0acbfce0a1a81041fdeeeb9ef394e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 21:08:33 +00:00
Treehugger Robot
5fa60b81d7 Merge "Document why certain warnings are disabled." into main am: 0415285596
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2717854

Change-Id: I6b3b35865855cfe1aec508e3b6e816db9c5ef850
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 21:07:24 +00:00
Treehugger Robot
0ef92f4dde Merge changes I8ee7e5c7,Ibfcd2bc5 into main am: 97048ab022
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2719834

Change-Id: I79eb54f666dad6cfa763ddcd9a81ade9e5cd2336
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 21:07:11 +00:00
Treehugger Robot
4147e5c1d1 Merge "Handle proto.include_dirs in bp2build for CC" into main 2023-08-21 20:43:02 +00:00
Treehugger Robot
0415285596 Merge "Document why certain warnings are disabled." into main 2023-08-21 20:42:00 +00:00
Elliott Hughes
e4363e549e Merge "Switch to toybox dd." into main am: b98da95f1b am: fd1157fdaa am: 5a2d576832
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1192988

Change-Id: I99182aec5da8114700288656461751ec38413c67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 20:35:25 +00:00
Yu Liu
3b8b0d23b2 Merge "Fix a bug where the default AndroidTest.xml was not picked up." into main am: ae2f16e9f7 am: 8ca82ba45d am: 462706076b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2717344

Change-Id: I703b2290d9c29bb0302ec8645233e0522904f031
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 20:35:09 +00:00
Treehugger Robot
97048ab022 Merge changes I8ee7e5c7,Ibfcd2bc5 into main
* changes:
  Add bazelbuild-rules_rust and tinyjson to soong_integration_tests
  Add bazelbuild-rules_cc to soong_integration_tests
2023-08-21 20:31:58 +00:00
Elliott Hughes
5a2d576832 Merge "Switch to toybox dd." into main am: b98da95f1b am: fd1157fdaa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1192988

Change-Id: I76c5d05a25cf68a74311660fc167781bf58411ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 20:02:57 +00:00
Yu Liu
462706076b Merge "Fix a bug where the default AndroidTest.xml was not picked up." into main am: ae2f16e9f7 am: 8ca82ba45d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2717344

Change-Id: I746102439772430ddb6234b5152cdc9716565d61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 20:02:42 +00:00
Elliott Hughes
fd1157fdaa Merge "Switch to toybox dd." into main am: b98da95f1b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1192988

Change-Id: I4ffb7a0e41631b77f568412a8b3821d1dfbd8bff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 19:59:29 +00:00
Elliott Hughes
b98da95f1b Merge "Switch to toybox dd." into main 2023-08-21 19:30:29 +00:00
Yu Liu
8ca82ba45d Merge "Fix a bug where the default AndroidTest.xml was not picked up." into main am: ae2f16e9f7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2717344

Change-Id: I54bee6048e9d3f6a4d36c5fc4883bce7d579d28a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 19:25:21 +00:00
Yu Liu
ae2f16e9f7 Merge "Fix a bug where the default AndroidTest.xml was not picked up." into main 2023-08-21 18:44:37 +00:00
Treehugger Robot
2ad90706b3 Merge changes from topic "aconfig_framework_circle" into main am: a9dbd27afa am: a8a24d90dc am: 603a5b7415
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2717352

Change-Id: I9179ce831f5125f304f65ac93edf216c495c3a25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 18:17:24 +00:00
Joe Onorato
532a227e15 Allow access to the generated srcjars for GeneratedJavaLibrary am: ffac9be887 am: 4eff29bafc am: 3e6bc32eb4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2717351

Change-Id: I2e04828dd6fd2c0a1e543468a7743628ed15c25b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 18:17:21 +00:00
Krzysztof Kosiński
982c588c35 Document why certain warnings are disabled.
Bug: 296606895
Test: presubmit
Change-Id: I0227eb216ddc59cfe2c3b785376cfb8f9ccab441
2023-08-21 17:50:07 +00:00
Treehugger Robot
603a5b7415 Merge changes from topic "aconfig_framework_circle" into main am: a9dbd27afa am: a8a24d90dc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2717352

Change-Id: I2cefb9a141b01a8e6fde6bff3a431bbfed58cc87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 17:43:42 +00:00
Joe Onorato
3e6bc32eb4 Allow access to the generated srcjars for GeneratedJavaLibrary am: ffac9be887 am: 4eff29bafc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2717351

Change-Id: I17de87348cd61d105b0f9c494005ab5b78c873ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 17:43:39 +00:00
Vinh Tran
d007cead3f Add bazelbuild-rules_rust and tinyjson to soong_integration_tests
aosp/2709668 registers Bazel repos using these directories so we need to symlink them for soong integration tests to pass.

Test: build/soong/tests/bp2build_bazel_test.sh
Change-Id: I8ee7e5c702bd0bfa24eb3778371f497a67bf815a
2023-08-21 13:35:08 -04:00
Vinh Tran
4f79359d80 Add bazelbuild-rules_cc to soong_integration_tests
This fixes breakage currently on CI.

Bug: 296628826
Test: build/soong/tests/bp2build_bazel_test.sh
Change-Id: Ibfcd2bc5d2b107879281075ab994f1e9a8f5da0e
2023-08-21 13:30:40 -04:00