Commit Graph

76648 Commits

Author SHA1 Message Date
Colin Cross
596302d0db Merge "Translate --custom-package aapt2 flag for ResourceProcessorBusyBox" into main am: cf132236e7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2896210

Change-Id: I57346527ee93da1e93d65d17b61845c2b8149712
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-05 18:52:55 +00:00
Colin Cross
cf132236e7 Merge "Translate --custom-package aapt2 flag for ResourceProcessorBusyBox" into main 2024-01-05 18:10:47 +00:00
Vladimír Marko
11a0b0d5a0 Merge "Add a new x86(_64) arch variant "goldmont-without-xsaves"" into main am: 80abaa85e8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2875215

Change-Id: Ibca4e4d47526837773107d7c57d282e59ebd2e51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-05 12:59:51 +00:00
Vladimír Marko
80abaa85e8 Merge "Add a new x86(_64) arch variant "goldmont-without-xsaves"" into main 2024-01-05 12:29:33 +00:00
Tongbo Liu
6b827d7a19 Merge "Enable building whole MCTS and partial MCTS test suites." into main am: 1ce76dfb4c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2896381

Change-Id: Ibfe5c6a1bbacbf17dd4ddd43e2dc303ed02a48c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-05 06:50:58 +00:00
Tongbo Liu
1ce76dfb4c Merge "Enable building whole MCTS and partial MCTS test suites." into main 2024-01-05 05:55:10 +00:00
Kiyoung Kim
b562b4a727 Merge "Generate image variation without version" into main am: 6284e0a935
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2894623

Change-Id: Ic75d4cca547b5a419d43fd77d7f7b1202f59e344
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-05 05:30:40 +00:00
Kiyoung Kim
6284e0a935 Merge "Generate image variation without version" into main 2024-01-05 04:57:26 +00:00
Kiyoung Kim
b5fdb2e966 Generate image variation without version
Current CC/Rust Image variations are generated with target VNDK version.
However, this is no longer valid if VNDK is deprecated. This change
generates image variation without version ("vendor", "product") if VNDK
is deprecated.

Bug: 316829758
Test: m nothing --no-skip-soong-tests passed
Test: aosp_cf_x86_64_phone build succeeded
Change-Id: I2387ed8a2632bfd9462621f882a947695ae1653d
2024-01-05 11:15:23 +09:00
Zi Wang
d7e008cfe9 Merge "Update TestNonExistentPropertyInSoongConfigModule" into main am: c6837a2a8c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2809726

Change-Id: Ib63d1ee43b86e65e77bed1ade6dca5be4079d247
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-05 00:07:03 +00:00
Zi Wang
c6837a2a8c Merge "Update TestNonExistentPropertyInSoongConfigModule" into main 2024-01-04 23:35:05 +00:00
Cole Faust
6a132c7d2f Merge "Use ApiLevel on min, target and compile Sdk version" into main am: ec222c4dbb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2818082

Change-Id: I0573282b220f8b098b33fcc08d3c9e732f5b38bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-04 22:44:13 +00:00
Cole Faust
ec222c4dbb Merge "Use ApiLevel on min, target and compile Sdk version" into main 2024-01-04 21:54:08 +00:00
Treehugger Robot
ace82a0f76 Merge "Don't implicitly pick up lint-baseline.xml" into main am: 5cb14e12d2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2898647

Change-Id: Ifd4c62499bcd994c44b7c74009485e49f46f72f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-04 20:03:11 +00:00
Sebastian Pickl
905ee6af83 Revert "Limit System SDK to 34 for Java modules in the vendor pa..." am: 1f1662217a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2897567

Change-Id: Ic9dc0b7b6b45a91f8ea71b00390901205f5b2038
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-04 20:02:57 +00:00
Sebastian Pickl
9145acd17a Merge "Revert "Add BUILD_BROKEN_DONT_CHECK_SYSTEMSDK"" into main am: 13c52b9963
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2897483

Change-Id: If8c6d4fbe8ff40962bf318517a30a4b5e9a21a0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-04 20:02:34 +00:00
Treehugger Robot
5cb14e12d2 Merge "Don't implicitly pick up lint-baseline.xml" into main 2024-01-04 20:00:58 +00:00
Sebastian Pickl
1f1662217a Revert "Limit System SDK to 34 for Java modules in the vendor pa..."
Revert submission 2894701-limit_systemsdk

Reason for revert: might be breaking builds at 318695834

Bug: 318695834

Reverted changes: /q/submissionid:2894701-limit_systemsdk

Change-Id: I71a87d0a026a444ea9d26f889b3421162e13fea9
2024-01-04 19:28:16 +00:00
Sebastian Pickl
13c52b9963 Merge "Revert "Add BUILD_BROKEN_DONT_CHECK_SYSTEMSDK"" into main 2024-01-04 19:27:24 +00:00
Sebastian Pickl
fbf1b5e7f1 Revert "Add BUILD_BROKEN_DONT_CHECK_SYSTEMSDK"
Revert submission 2897682-dont_limit_systemsdk

Reason for revert: blocking revert for 318695834

Bug:318695834

Reverted changes: /q/submissionid:2897682-dont_limit_systemsdk

Change-Id: I4cf7268cba21c7b81b406c91240bb98190fa4ebc
2024-01-04 19:01:27 +00:00
Cole Faust
b765d6bd46 Don't implicitly pick up lint-baseline.xml
lintable modules currently pick up files named "lint-baseline.xml" to
use as the lint baseline implicitly. This is confusing because you could
end up using the baseline files in more modules than intended. Lint also
has a feature where it requests you remove unnecessary findings from the
baseline file, so something could be necessary for one module, but
unnecessary for another that accidentally picked up the baseline.

All modules that used to pick up the baseline implicitly have been
fixed to specify it explicitly already.

Fixes: 272769514
Test: Presubmits
Change-Id: Id17202e2d119b87ab82c18cb35410b93ed8d5071
2024-01-04 10:39:33 -08:00
Spandan Das
b82ea38ffb Merge "Skip unique apex_available enforcement on libz (a stub library)" into main am: 01f17ffc54
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2896204

Change-Id: I2f80e746eb7b72d0d2630639ba4b745795a73e35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-04 18:32:02 +00:00
Spandan Das
bdf53e5aa4 Merge "Drop mediaprovider deps from implicit baselineApexAvailable map" into main am: 2c3a401c4a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2893443

Change-Id: I450bc871d4f4bc992d3035f7dc8d5195d602693d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-04 18:31:37 +00:00
Joe Onorato
6fce363b95 Merge "Add BUILD_BROKEN_DONT_CHECK_SYSTEMSDK" into main am: 7a0823fb77
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2897682

Change-Id: I7c1bad4575cd8be76e571dfb669cffb62566cd35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-04 18:31:20 +00:00
Spandan Das
01f17ffc54 Merge "Skip unique apex_available enforcement on libz (a stub library)" into main 2024-01-04 17:43:52 +00:00
Spandan Das
2c3a401c4a Merge "Drop mediaprovider deps from implicit baselineApexAvailable map" into main 2024-01-04 17:43:31 +00:00
Joe Onorato
7a0823fb77 Merge "Add BUILD_BROKEN_DONT_CHECK_SYSTEMSDK" into main 2024-01-04 17:40:49 +00:00
Jiyong Park
87312a2fac Add BUILD_BROKEN_DONT_CHECK_SYSTEMSDK
https://android-review.git.corp.google.com/q/topic:limit_systemsdk
introduced a new check for preventing the use of system SDKs above 34
from Java modules in the vendor partition.

As this may break some unprepared targets, introduce
BUILD_BROKEN_DONT_CHECK_SYSTEMSDK as a temporary escape hatch.

This flag will be deleted eventually.

Bug: 314011075
Test: Add BUILD_BROKEN_DONT_CHECK_SYSTEMSDK := true to BoardConfig.mk
Change-Id: Id7901f85c221bc03fa1c15ef15dbec14b783a79a
2024-01-04 22:33:27 +09:00
Jiyong Park
a322242b4e Merge "Limit System SDK to 34 for Java modules in the vendor partition" into main am: 77e105628f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2894861

Change-Id: I2828069cc156633ce46809e0fd0f9854f6965792
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-04 10:12:29 +00:00
Jiyong Park
77e105628f Merge "Limit System SDK to 34 for Java modules in the vendor partition" into main 2024-01-04 09:37:36 +00:00
Tongbo Liu
c5f7b96ab5 Enable building whole MCTS and partial MCTS test suites.
Bug: 318608673
Test: m mcts
Change-Id: I2af74e319c40b0e36d8a71e1da3c6934f66a51be
2024-01-04 09:04:18 +00:00
Jiyong Park
ec47e99b4d Limit System SDK to 34 for Java modules in the vendor partition
This change disallows Java modules in the vendor partition to use System
SDK that is newer than API level 34; 34 is the latest allowed.

Background 1: with Trunk Stable, the system/vendor interface is released
at Q2 whereas the system/app interface is released at Q3. In other
words, at Q2, the APIs which will be added to the system SDK at Q3 are
not available. Since the system/vendor interface (which is fronzen at
Q2) is what the modules in the vendor partition will be building
against, they can't and shouldn't use those new APIs that will be added
in the future (Q3). Using those APIs is risky because there's a chance
that those APIs get removed or changed between Q2 and Q3. For example,
2024 Q2 is technically still Android U, not Android V.

Background 2: The use of Java APIs in the vendor partition had many
issues. Most significantly, those "vendor" Java apps are categorized as
part of the system partition because all Java app processes require
access to platform internal libraries that are prohibited to vendor
processes. Furthermore, since the Project Treble, the vendor partition
was re-purposed to a partition to host SoC-dependent bits - usually
HALs. Implementing HALs in Java has never been officially supported and
has had many loop holes.

We'd like to use both background 1 and 2 as a chance to disallow any
Java code in the vendor partition. However, since there are already some
Java modules in the partition, we can't suddenly ban it. The deprecation
will be made gradually, and this CL is the start.

Note that sdk_version: "current" or "system_current" is automatically
overridden into 34 or system_34. This is to prevent sudden breakage of
vendor modules that have been targetting the latest (i.e. current) API
level. They will however fail if they use APIs newer than API level 34.

Bug: 314011075
Test: m blueprint_tests
Change-Id: I59f5ac15ce9ac2ff7cc89e9c110169359077c37c
2024-01-04 13:29:04 +09:00
Colin Cross
d3f7d1a44c Translate --custom-package aapt2 flag for ResourceProcessorBusyBox
When --custom-package is specified as an aapt2 flag translate it to
--packageForR when running ResourceProcessorBusyBox.

Bug: 294256649
Test: m javac-check
Change-Id: I2c97c760ea8a0203790feda82b98e12c2dbd7b72
2024-01-03 19:43:15 -08:00
Cole Faust
c59e17131b Merge "Check for errors in preparer.sh" into main am: b284c72d66
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2896202

Change-Id: I5b9724f41108504d5381226f9972ca8bfbcc465c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-04 02:55:58 +00:00
Cole Faust
b284c72d66 Merge "Check for errors in preparer.sh" into main 2024-01-04 02:17:51 +00:00
Spandan Das
1a0c6e19f7 Skip unique apex_available enforcement on libz (a stub library)
libz is a stub library, but needs to be available to runtime apex
because it gets statically linked into bionic linker

Bug: 281077552
Bug: 277651159
Test: m nothing
Change-Id: I04f6f13768d8f9c160ce84202e2003b195176355
2024-01-04 01:52:28 +00:00
Steven Moreland
e46869d832 Merge "validate tags for typos" into main am: 98aa78ab22
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2886370

Change-Id: I481e7da4838d529c63e1599e91ba3cd1e5f59fd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-04 00:58:04 +00:00
Steven Moreland
98aa78ab22 Merge "validate tags for typos" into main 2024-01-04 00:26:54 +00:00
Cole Faust
3b3a011408 Check for errors in preparer.sh
In case any of the commands fail.

Also skip writing out empty preparer.sh files.

Bug: 314933937
Test: Presubmits
Change-Id: Ia94d032bc4800379608d8a3cf594f25951a3ab32
2024-01-03 15:22:32 -08:00
Zhi Dou
bd378fd96d Merge "Add "force-read-only" mode to xx_aconfig_library build rules" into main am: f80405a5e5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2886728

Change-Id: I825347dce6ba11fcbe47a00ba3af3d6730a1ff8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 23:04:53 +00:00
Wei Li
add66be9aa Merge "Do not load Android.mk files from the directories defined in the list." into main am: 8ca410d72b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2893386

Change-Id: Ia0e72ea2ec80f32a91c79da6db1dec586274db5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 23:04:22 +00:00
Steven Moreland
f78bd1bdbd Merge "fuzz packaging: implement system/vendor split" into main am: 62d10495eb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2891792

Change-Id: I4ef5e46b5ef2aeeab8e03a9937a44310c180877b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 23:04:09 +00:00
Zhi Dou
f80405a5e5 Merge "Add "force-read-only" mode to xx_aconfig_library build rules" into main 2024-01-03 23:00:33 +00:00
Wei Li
8ca410d72b Merge "Do not load Android.mk files from the directories defined in the list." into main 2024-01-03 22:27:08 +00:00
Steven Moreland
62d10495eb Merge "fuzz packaging: implement system/vendor split" into main 2024-01-03 22:14:24 +00:00
Steven Moreland
8d5b9d01e9 validate tags for typos
it turns out there were typos which are now fixed :D

Bug: 317293882
Test: build tree
Change-Id: I91dc08f00e8dd2e9dcb9101307d9b04bdcadea11
2024-01-03 21:48:03 +00:00
Colin Cross
bd0268b3f7 Merge "Use ModuleInfoJSONProvider for cc modules" into main am: 36ce95848b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2880497

Change-Id: I3b7312093bc6121daffed7ac786d15dede69bb74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 20:13:43 +00:00
Colin Cross
36ce95848b Merge "Use ModuleInfoJSONProvider for cc modules" into main 2024-01-03 19:27:51 +00:00
Colin Cross
6350c8caa8 Merge "Support generating module_info.json in Soong" into main am: 138d37dd6c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2880496

Change-Id: I8670248cad9e88dc08c9155cc38899e75c66ea95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 18:17:12 +00:00
Spandan Das
9efacc931a Merge "Drop tethering deps from implicit baselineApexAvailable map" into main am: 070490ce20
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2889248

Change-Id: I513c6bbc4ba4bc1da8cd8655547f008a2a998363
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 18:16:37 +00:00