Commit graph

77237 commits

Author SHA1 Message Date
Treehugger Robot
b2830032de Merge changes from topics "libz-no-stubs-for-vendor", "vendor-etc-linker-config" into main am: fedbb5c3be am: 10ae393d8a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853092

Change-Id: I5dc26eaa269f5aa34277d51fba0ac459415ca0a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 07:08:29 +00:00
Jooyung Han
b5b60f9b37 Add cc_library.target.vendor.no_stubs am: 85707de8c1 am: 2f7cb3854e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853091

Change-Id: I48385e408f1aa3ca1f8c43cab47c3c791a93cbe9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 07:08:21 +00:00
Colin Cross
9a746cfd0e Merge "Move startRBE error handling to the main goroutine" into main am: 31783628ff am: 60b62f67b0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2849973

Change-Id: Id26b7417c41461bf17f19f213cdb8a21fc140a8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 07:03:18 +00:00
Jooyung Han
2034875cac Error if vendor apex adds an LLNDK library
This is a common mistake when creating a vendor apex. They often try to
list all dependencies. Adding an LLNDK results in putting a stub library
in APEX, which simply doesn't work.

This change prevents stubs from being added to APEX.

Bug: 314033460
Test: go test ./apex
Change-Id: Ic3365047028d9ab6f06992d52aece5a3890177bb
2023-12-05 15:23:56 +09:00
Treehugger Robot
10ae393d8a Merge changes from topics "libz-no-stubs-for-vendor", "vendor-etc-linker-config" into main am: fedbb5c3be
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853092

Change-Id: Idf988f0b680349f747f0145eaea4f75b033b2ca2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 06:20:08 +00:00
Jooyung Han
2f7cb3854e Add cc_library.target.vendor.no_stubs am: 85707de8c1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853091

Change-Id: I8e7aaf1d3a8e2029f75636410e97945e5339cbb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 06:19:59 +00:00
Colin Cross
60b62f67b0 Merge "Move startRBE error handling to the main goroutine" into main am: 31783628ff
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2849973

Change-Id: I3243f7ad08000dcaa889bd8388f80d8980c422ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 06:06:53 +00:00
Treehugger Robot
d43082e6ca Merge changes from topics "libz-no-stubs-for-vendor", "vendor-etc-linker-config" into main am: fedbb5c3be am: e4be5409a9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853092

Change-Id: I61dc551e4daf2029ba220956dcdda752cb027407
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 06:05:30 +00:00
Jooyung Han
e1502b91d8 Add cc_library.target.vendor.no_stubs am: 85707de8c1 am: 578c212857
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853091

Change-Id: If20cbc49c6b623a5ebeb1b58f7b1b79d4898aaf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 06:05:23 +00:00
Colin Cross
8b23eff68d Merge "Move startRBE error handling to the main goroutine" into main am: 31783628ff am: 543c7e121c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2849973

Change-Id: I4096905518f39a1c5607fb58f9bc769784b823c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 06:05:12 +00:00
Treehugger Robot
e4be5409a9 Merge changes from topics "libz-no-stubs-for-vendor", "vendor-etc-linker-config" into main am: fedbb5c3be
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853092

Change-Id: I696ad0dadb55b47cd303069fb3f9083a4606aa69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 05:57:04 +00:00
Jooyung Han
578c212857 Add cc_library.target.vendor.no_stubs am: 85707de8c1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853091

Change-Id: I68411c3ff51a8f61f08f471cb8da31b79c252867
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 05:57:01 +00:00
Colin Cross
543c7e121c Merge "Move startRBE error handling to the main goroutine" into main am: 31783628ff
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2849973

Change-Id: Ifa2fb544ed7a0df694d77824a5a59b1d46ac4ea3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 05:56:46 +00:00
Treehugger Robot
fedbb5c3be Merge changes from topics "libz-no-stubs-for-vendor", "vendor-etc-linker-config" into main
* changes:
  Generate vendor specific STUB_LIBRARIES
  Add cc_library.target.vendor.no_stubs
2023-12-05 05:47:08 +00:00
Colin Cross
31783628ff Merge "Move startRBE error handling to the main goroutine" into main 2023-12-05 05:35:38 +00:00
Treehugger Robot
5e097af8b7 Merge "Define __ANDROID_VENDOR_API__" into main am: e0a5c5ae1d am: 53271a2489
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2851889

Change-Id: I9bd56872893e6a912005daedf51879fee0f8a7cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 04:29:20 +00:00
Yi Kong
54a987a185 Merge "Do not perform AFDO or optimizing LTO for eng builds" into main am: e2b87d7401 am: be13ad16ea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2856020

Change-Id: If3273d8cbbc39cfd1a58dc30cbcc4cef924b0f88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 04:28:44 +00:00
Treehugger Robot
b9555e56b0 Merge "Define __ANDROID_VENDOR_API__" into main am: e0a5c5ae1d am: 2438f09e0d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2851889

Change-Id: I927659b82570b526c1b502871072315367e3ac9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 04:27:13 +00:00
Yi Kong
e5994ccae1 Merge "Do not perform AFDO or optimizing LTO for eng builds" into main am: e2b87d7401 am: f4e59d2f48
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2856020

Change-Id: Ibcd2faf9eb49768529a50c4c60a5b3a0095d6122
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 04:26:35 +00:00
Treehugger Robot
53271a2489 Merge "Define __ANDROID_VENDOR_API__" into main am: e0a5c5ae1d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2851889

Change-Id: I6b457a4db55d058006ab2c0f74e825b777b0518a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 04:08:31 +00:00
Yi Kong
be13ad16ea Merge "Do not perform AFDO or optimizing LTO for eng builds" into main am: e2b87d7401
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2856020

Change-Id: If030bd3d290c3f6adfdbb67150104562ee4bb235
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 03:55:31 +00:00
Treehugger Robot
2438f09e0d Merge "Define __ANDROID_VENDOR_API__" into main am: e0a5c5ae1d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2851889

Change-Id: Ifc6b5f90684bf74f85bfe5c301572a48eb6552e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 03:50:30 +00:00
Yi Kong
f4e59d2f48 Merge "Do not perform AFDO or optimizing LTO for eng builds" into main am: e2b87d7401
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2856020

Change-Id: Ideb2e6b52f95616fdd387584d9d69d47372ebc55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 03:49:40 +00:00
Treehugger Robot
e0a5c5ae1d Merge "Define __ANDROID_VENDOR_API__" into main 2023-12-05 03:48:26 +00:00
Yi Kong
e2b87d7401 Merge "Do not perform AFDO or optimizing LTO for eng builds" into main 2023-12-05 03:00:17 +00:00
Joe Onorato
5c30a970c0 Merge "Add accessor function for bool product variables." into main am: 9390fb85f6 am: 4c4a215be3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2857545

Change-Id: Ic76c7ecf0de8cf608ff0b78967bda650cc8e687b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 02:15:01 +00:00
Colin Cross
f5855d5558 Merge "Add TestContext parameter to ContentFromFileRuleForTests" into main am: 2998c33d43 am: 078254139c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2817720

Change-Id: I3741083e31aed40a5a08edf9d91ac545212bfdcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 02:14:46 +00:00
Joe Onorato
596ce76267 Merge "Add accessor function for bool product variables." into main am: 9390fb85f6 am: 26ce228d59
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2857545

Change-Id: I5c1152136b9015e30b95b942e67d507bd2c25b58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 01:44:13 +00:00
Colin Cross
602e7436cb Merge "Add TestContext parameter to ContentFromFileRuleForTests" into main am: 2998c33d43 am: e4f28b5a03
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2817720

Change-Id: I2d072a53e04a05e59072b22f9bdb1b7857b8508a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 01:42:26 +00:00
Joe Onorato
4c4a215be3 Merge "Add accessor function for bool product variables." into main am: 9390fb85f6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2857545

Change-Id: Ib9054a8f8e0d5c2af3fc2bb7d568df1d234e5606
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 01:38:38 +00:00
Colin Cross
078254139c Merge "Add TestContext parameter to ContentFromFileRuleForTests" into main am: 2998c33d43
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2817720

Change-Id: Iaf65c68d8c427a5d991401f85bd1c220b2303a9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 01:37:56 +00:00
Joe Onorato
26ce228d59 Merge "Add accessor function for bool product variables." into main am: 9390fb85f6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2857545

Change-Id: Iebb94241b9f127458b28f7fed4e9a2c8e912a9f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 01:21:50 +00:00
Colin Cross
e4f28b5a03 Merge "Add TestContext parameter to ContentFromFileRuleForTests" into main am: 2998c33d43
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2817720

Change-Id: If970d7ed844d01913dae37cf1398248714775814
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 01:09:37 +00:00
Joe Onorato
9390fb85f6 Merge "Add accessor function for bool product variables." into main 2023-12-05 00:53:05 +00:00
Colin Cross
2998c33d43 Merge "Add TestContext parameter to ContentFromFileRuleForTests" into main 2023-12-05 00:29:10 +00:00
Jooyung Han
9582159c4d Generate vendor specific STUB_LIBRARIES
When generating vendor/etc/linker.config.pb, STUB_LIBRARIES was used.
Because it lists *all* libraries with stubs regardless of its
install location (vendor or system), using it for vendor
linker.config.pb doesn't make sense. Instead, use vendor-specific
STUB_LIBRARIES, which is named SOONG_STUB_VENDOR_LIBRARIES.

Bug: 313806237
Test: m (aosp_cf_x86_64_phone)
Test: $OUT/vendor/etc/linker.config.pb not listing libz.so
Change-Id: Icd0aaf92d9630c07f58c4739a9f0ac713516db43
2023-12-05 08:24:38 +09:00
Elliott Hughes
1f4c37ceda riscv64: disable a weird option. am: bee01f7d62 am: db91ef7070
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853594

Change-Id: Ie4a8f22cc8fa95014655672118871db6acf18980
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04 17:38:32 +00:00
Joe Onorato
3fefc23391 Add accessor function for bool product variables.
Test: treehugger
Change-Id: If6a59ba140d28696d1411ee5b5fcfc4fc0e97926
2023-12-04 17:36:22 +00:00
Elliott Hughes
cfed7e53cf riscv64: disable a weird option. am: bee01f7d62 am: 3465d10154
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853594

Change-Id: I2ce807bd9332721bba466731cae45c52a16f4508
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04 17:24:34 +00:00
Elliott Hughes
db91ef7070 riscv64: disable a weird option. am: bee01f7d62
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853594

Change-Id: Icc74914bd257d0011a01920be031e9a8ca6fa498
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04 17:04:50 +00:00
Elliott Hughes
3465d10154 riscv64: disable a weird option. am: bee01f7d62
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2853594

Change-Id: I5d38048a2be038b68f19df318e215c1c4d468b85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04 16:52:42 +00:00
Yi Kong
9723e338ee Do not perform AFDO or optimizing LTO for eng builds
Afdo creates more variants to build, and optimizing LTO is costly to
perform. Turn off these two optimizations for eng builds for a faster
build speed.

This reduces total C/C++ invocation time for aosp_arm64-eng by 6.28%.

Test: presubmit
Bug: 307753064
Change-Id: Ibac4269c66a64e896dba2074b607d71a2da37546
2023-12-04 19:04:00 +09:00
Jooyung Han
85707de8c1 Add cc_library.target.vendor.no_stubs
This is to handle libz special case. libz has stubs but not an LLNDK.
So, libz.vendor should be treated as non-stub-providing libraries and
Vendor APEX should bundle it if it's used by its contents.

libz will set no_stubs for vendor/product variants.

Bug: 313806237
Test: go tests ./apex/...
Change-Id: I10759d7073838909126f8bfe87654f11aa02fd32
2023-12-04 11:06:20 +09:00
Colin Cross
f61d03d241 Add TestContext parameter to ContentFromFileRuleForTests
The next CL will need a TestContext parameter in
ContentFromFileRuleForTests in order to retrieve the file rule contents
from the Config.  Add it and update all the tests that use it in order
to simply review of the next CL.

Bug: 306029038
Test: go test ./...
Change-Id: Ia4b4c9854017ea3472fa2f8ba42cf7f72720496e
2023-12-03 17:22:56 -08:00
Elliott Hughes
bee01f7d62 riscv64: disable a weird option.
By default clang assumes that on riscv64 jumps are really expensive.
That's probably not true for the kind of SoCs we're dealing with, but
more importantly (see the bug) it causes clang to do loads from the
right hand side of a `&&` before the left hand side has been evaluated.
This found one latent bug in libcore, and it doesn't seem like the best
use of anyone's time to have to chase similar issues if they're going
to be similarly latent for riscv64 when we get clang's default fixed.

Bug: https://github.com/google/android-riscv64/issues/124
Test: treehugger
Change-Id: I640f1b43ea3d2452366ab86e97a9189fa9f5326c
2023-12-01 17:39:20 -08:00
Elliott Hughes
d5402d7796 Merge "riscv64: stop explicitly disabling emutls." into main am: 198583ed20 am: 7114430368
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2855429

Change-Id: I53b1f850acb1f000d4b4713f78b3324cfe7d8bd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 22:23:09 +00:00
Elliott Hughes
87939abd39 Merge "riscv64: stop explicitly disabling emutls." into main am: 198583ed20 am: 2c2dd13e64
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2855429

Change-Id: I916f2fbf0365b529c8eb711be847516b8aa813fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 22:04:28 +00:00
Elliott Hughes
2c2dd13e64 Merge "riscv64: stop explicitly disabling emutls." into main am: 198583ed20
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2855429

Change-Id: I7b08bc843b215cc61adfe3477338d3d5af32a62c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 21:25:36 +00:00
Elliott Hughes
7114430368 Merge "riscv64: stop explicitly disabling emutls." into main am: 198583ed20
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2855429

Change-Id: I39a7c1c8db0eb4bfb9886feb1deb8da44a2eee45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 21:25:13 +00:00
Elliott Hughes
198583ed20 Merge "riscv64: stop explicitly disabling emutls." into main 2023-12-01 20:28:09 +00:00