Commit Graph

66495 Commits

Author SHA1 Message Date
Colin Cross
286806fe61 Merge "Avoid extra copy of JNI libs zip" into main am: a706cc8c15
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2678496

Change-Id: I4b3483fc0ca17cb963a62bb194d6c9389304f5e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 20:43:53 +00:00
Colin Cross
a706cc8c15 Merge "Avoid extra copy of JNI libs zip" into main 2023-07-27 20:11:20 +00:00
Steven Moreland
fb423b5d6e Merge "Linker: no demangle." into main am: c8a5d7c7df
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2672235

Change-Id: Ieeb3c12e2e0127a07c9104c99ebccd8dffacf4e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 19:08:28 +00:00
Treehugger Robot
83290c0614 Merge changes from topic "reland-hack-rv64-libc++" into main am: db195fd4cb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2677916

Change-Id: I37fa812ea97514441b41a3394df05326ccf88592
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 19:08:11 +00:00
Prashanth Swaminathan
04cc93c7e1 Revert "Revert "Use prebuilt NDK libc++ for rv64."" am: 08e634d5ce
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2677915

Change-Id: Iaa4372f32bc33f12b92bd2cede1d781ce0376da6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 19:08:06 +00:00
Steven Moreland
c8a5d7c7df Merge "Linker: no demangle." into main 2023-07-27 18:19:09 +00:00
Treehugger Robot
db195fd4cb Merge changes from topic "reland-hack-rv64-libc++" into main
* changes:
  Revert "Revert "Set VIC as minimum SDK version for riscv64""
  Revert "Revert "Use prebuilt NDK libc++ for rv64.""
2023-07-27 18:17:35 +00:00
Ivan Lozano
ba1e3a5756 Merge "Revert "rust: Add SCS sanitizer option."" into main am: 7e377d045e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2679415

Change-Id: I93e790922089abe24780f42cc30b401bdfabfe3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 15:27:07 +00:00
Colin Cross
b3168bac7f Avoid extra copy of JNI libs zip
Don't call merge_zips if there are no prebuilt JNI libraries to
merge with.

Test: builds
Change-Id: Ife5386fbbfcff35bdea2914519a78dfd89163a25
2023-07-27 08:09:37 -07:00
Ivan Lozano
7e377d045e Merge "Revert "rust: Add SCS sanitizer option."" into main 2023-07-27 15:08:50 +00:00
Ivan Lozano
083130ebf7 Merge "rust: Add SCS sanitizer option." into main am: c7c29b9b8e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2677557

Change-Id: Ic8944725bbd3f0dfa495e0704acfefafc86a69d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 15:05:00 +00:00
Ivan Lozano
f9780422b3 Revert "rust: Add SCS sanitizer option."
This reverts commit 447f5b1ea9.

Reason for revert: b/293445283

Change-Id: Iadc6c7ed196be2a65329f86423730ba7f851002c
2023-07-27 14:52:20 +00:00
Ivan Lozano
c7c29b9b8e Merge "rust: Add SCS sanitizer option." into main 2023-07-27 14:23:33 +00:00
Kiyoung Kim
502be69c12 Merge "APEXes contain VNDK libraries when VNDK is deprecated" into main am: f97a42e5f2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2676779

Change-Id: I8ff443360272932b8c232c76f29973eed7757732
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 02:29:27 +00:00
Kiyoung Kim
f97a42e5f2 Merge "APEXes contain VNDK libraries when VNDK is deprecated" into main 2023-07-27 01:24:53 +00:00
Treehugger Robot
4f89221695 Merge "Denylist new libart modules" into main am: 68dbdda54c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2678255

Change-Id: I387ac3c103f2fdbb52b9c6f949edfed68d770e2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 00:40:19 +00:00
Treehugger Robot
68dbdda54c Merge "Denylist new libart modules" into main 2023-07-26 23:42:21 +00:00
Devin Moore
211e090d28 Merge "Add new Release_aidl_use_unfrozen soong variable" into main am: 1579a72d78
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2652369

Change-Id: I1a5d2bdd78a5042421e41d76cd279c22770bfc92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 22:15:32 +00:00
Devin Moore
1579a72d78 Merge "Add new Release_aidl_use_unfrozen soong variable" into main 2023-07-26 21:42:52 +00:00
Liz Kammer
466447a891 Merge "Handle xsd config more like other partitions" into main am: c796de83c8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2662518

Change-Id: I2dfd5345f6b7ee38df2e974cd01b2051f67b656c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 19:52:35 +00:00
Liz Kammer
c796de83c8 Merge "Handle xsd config more like other partitions" into main 2023-07-26 19:18:52 +00:00
Chris Parsons
c149e81e0f Denylist new libart modules
These new modules were created in aosp/2638970. They have unconverted
dependencies (like their originating module, libart), and thus need to be
denylisted so that bp2build continues to build.

Fixes: 293295490
Test: Manually built broken package with `b`
Test: Treehugger

Change-Id: I3542d16c19d179193660767c91a59221854b7889
2023-07-26 18:57:38 +00:00
Spandan Das
bd70589ab3 Merge changes from topic "support_libgtest_isolated" into main am: a263005e30
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2670011

Change-Id: I5b515253ed510d4df592833d07072fca96cb209f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 18:47:05 +00:00
Spandan Das
a263005e30 Merge changes from topic "support_libgtest_isolated" into main
* changes:
  Support cc_test.isolated in bp2build
  Fix difference in default `cc_test.isolated` in soong and bp2build
2023-07-26 18:35:40 +00:00
Ivan Lozano
4edcc69bbf Merge "rust: Add BTI/PAC for supported targets." into main am: 3eca04b39b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2676135

Change-Id: I6f81239ed195cd61076e9af7be665491badb3aeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 18:22:30 +00:00
Ivan Lozano
3eca04b39b Merge "rust: Add BTI/PAC for supported targets." into main 2023-07-26 18:11:17 +00:00
Treehugger Robot
37f54166dd Merge "Disable RBE env variable when we cannot support RBE" into main am: 4b3001a59e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2673755

Change-Id: I86b5ebd0abc60c1a0721afcd3ffd87bd981c6b1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 18:04:43 +00:00
Ivan Lozano
447f5b1ea9 rust: Add SCS sanitizer option.
SCS has been supported in Rust since 1.64.0.

This adds SCS as a sanitizer option in Rust.

Bug: 168914033
Test: Built module with sanitize: { scs: true }
Change-Id: Ibdc116a335339af6d0b0d6dd0bb82c0358fa9087
2023-07-26 13:34:55 -04:00
Treehugger Robot
4b3001a59e Merge "Disable RBE env variable when we cannot support RBE" into main 2023-07-26 17:24:45 +00:00
Spandan Das
d1cd3518a8 Support cc_test.isolated in bp2build
This property implicitly adds `libgtest_isolated_main` to the static
libs of the test. bp2build will make this and `liblog` explicit in BUILD
files

Since the deps are made explicit in BUILD files, `isolated` becomes a
no-op for cc_test. Remove this property from cc_test.

Test: unit tests
Bug: 244432609
Change-Id: I189a7b6b62d9064f4b2abad49ac4975468046498
2023-07-26 17:06:27 +00:00
Spandan Das
f5a8655cd8 Fix difference in default cc_test.isolated in soong and bp2build
Soong defaults to false, while bp2build defaults to true. This CL fixes
bp2build's default to false to match Soong.

To prevent future differences, bp2build now uses the `isolated()`
function used by Soong. The type of the context object has been changed
to EarlyModuleContext so that the ctx object does not depend on
mutations that might not run in bp2build.

Test: TH
Bug: 244432609
Change-Id: I15346107896312961e8d12270cf2f9a2a48827e1
2023-07-26 17:06:27 +00:00
Prashanth Swaminathan
81532c2762 Revert "Revert "Set VIC as minimum SDK version for riscv64""
This reverts commit 02f4e6f559.

Change-Id: I9fb87e2789bbc8437da56faa335de49865e08350
2023-07-26 09:47:10 -07:00
Prashanth Swaminathan
08e634d5ce Revert "Revert "Use prebuilt NDK libc++ for rv64.""
This reverts commit 967e16f3d8.

Change-Id: I78cb0176fd21a8c0c376bee76631621712aeddaa
2023-07-26 09:43:15 -07:00
Trevor Radcliffe
f048fe4170 Merge "Revert "Revert "add media.swcodec to Bazel prod allowlist""" into main am: ed83eba40f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2652361

Change-Id: Ifb665bb6ac77a77d1575c53770274a9f91b2ab2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 15:52:13 +00:00
Trevor Radcliffe
ed83eba40f Merge "Revert "Revert "add media.swcodec to Bazel prod allowlist""" into main 2023-07-26 14:55:14 +00:00
Mark White
63e028a8ea Merge "Revert "Set VIC as minimum SDK version for riscv64"" into main am: f6d7cc94c6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2676780

Change-Id: I654ba5482618e6d845972bd6b988d03641586363
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 09:35:16 +00:00
Mark White
d12c1342a9 Merge "Revert "Use prebuilt NDK libc++ for rv64."" into main am: 634828f3f9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2675417

Change-Id: I134d0d7cd2891dd3c7b4fc0a907956e554e72efc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 09:35:13 +00:00
Mark White
f6d7cc94c6 Merge "Revert "Set VIC as minimum SDK version for riscv64"" into main 2023-07-26 08:44:04 +00:00
Mark White
634828f3f9 Merge "Revert "Use prebuilt NDK libc++ for rv64."" into main 2023-07-26 08:44:04 +00:00
Kiyoung Kim
8269cee6e2 APEXes contain VNDK libraries when VNDK is deprecated
Currently vendor APEX can link to VNDK when 'use_vndk_as_stable'
property is set as true. However, when VNDK is deprecated, all former
VNDK libraries should be included in the vendor APEX despite of property
value. This change ignores use_vndk_as_stable when VNDK is set as
deprecated.

Bug: 290318998
Test: aosp_cf_x86_64_phone with WITH_VNDK=false build checked that
Vendor APEX contains all required VNDK libraries within the APEX

Change-Id: I648277d734274e7852b3effc24e7780e55089f75
2023-07-26 13:23:35 +09:00
NaYoung Yun
02f4e6f559 Revert "Set VIC as minimum SDK version for riscv64"
This reverts commit a96a2677b6.

Reason for revert: build break

Reverted changes: /q/submissionid:2676418-hack-rv64-libc%252B%252B
Bug: 293214158
Bug: 293214503
Bug: 293214158
Bug: 293219471

Change-Id: I6eaa1f7c9f498159db4d50840dd91e246314153f
2023-07-26 04:15:47 +00:00
NaYoung Yun
967e16f3d8 Revert "Use prebuilt NDK libc++ for rv64."
Revert submission 2676418-hack-rv64-libc++

Reason for revert: build break

Reverted changes: /q/submissionid:2676418-hack-rv64-libc%252B%252B

Change-Id: Idd7a5fd3b1687e2a31aa3c036d5d851fb5bbe283
Bug: 293214158
Bug: 293214503
Bug: 293214158
Bug: 293219471
2023-07-26 03:36:47 +00:00
Treehugger Robot
7c6f0b456a Merge "Create build settings for all product config variables" into main am: 8fbc42cfd7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2673486

Change-Id: I76032892354cfe9a4f816f9153e7f52cd62b7b11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 03:15:02 +00:00
Treehugger Robot
8fbc42cfd7 Merge "Create build settings for all product config variables" into main 2023-07-26 02:41:46 +00:00
Treehugger Robot
88a36f4e66 Merge changes from topic "hack-rv64-libc++" into main am: 5dbed51365
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2676418

Change-Id: Id1092de948ce87969bc059a913f083cbf6ce3056
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 01:25:10 +00:00
Treehugger Robot
55983f9772 Merge "Revert "Enable R8 full mode by default for apps"""" into main am: 06c246c1af
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2675620

Change-Id: Ibec16512a6768297f2fd467e95bf6b94996a92b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 01:24:48 +00:00
Treehugger Robot
af3ea2d9c0 Merge "Move android_library resource handling to Bazel's ResourceProcessorBusyBox" into main am: 245482e039
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2604130

Change-Id: I8afbd3eac252ea6e410e613e8a97760903dba356
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 01:22:26 +00:00
Treehugger Robot
5dbed51365 Merge changes from topic "hack-rv64-libc++" into main
* changes:
  Use prebuilt NDK libc++ for rv64.
  Set VIC as minimum SDK version for riscv64
2023-07-26 01:09:19 +00:00
Treehugger Robot
06c246c1af Merge "Revert "Enable R8 full mode by default for apps"""" into main 2023-07-26 00:42:06 +00:00
Treehugger Robot
245482e039 Merge "Move android_library resource handling to Bazel's ResourceProcessorBusyBox" into main 2023-07-26 00:34:57 +00:00