Commit Graph

37476 Commits

Author SHA1 Message Date
Sebastian Pickl
8d0d963070 Merge "Revert "Add BUILD_BROKEN_DONT_CHECK_SYSTEMSDK"" into main 2024-01-04 19:27:24 +00:00
Joe Onorato
dae8acbb04 Merge "Add BUILD_BROKEN_DONT_CHECK_SYSTEMSDK" into main am: 3309714a2a am: fd19d96b12
Original change: https://android-review.googlesource.com/c/platform/build/+/2897441

Change-Id: Ic4f583e2c88fb7870c6bb1b87737b5199565e778
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-04 19:01:33 +00:00
Sebastian Pickl
5ef2634d5a 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: Ic4a63fe81434ddb9cb57519bd11c1924224111c6
2024-01-04 19:01:29 +00:00
Treehugger Robot
fb5ded844e Merge "Set BOARD_SYSTEMSDK_VERSIONS even if PRODUCT_SHIPPING_API_LEVEL is unset" into main am: 7968bc4f39 am: fdb1137a95
Original change: https://android-review.googlesource.com/c/platform/build/+/2897500

Change-Id: I236cac7b470367a2a482aa411245e1cbe2aa253e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-04 19:01:21 +00:00
Joe Onorato
3309714a2a Merge "Add BUILD_BROKEN_DONT_CHECK_SYSTEMSDK" into main 2024-01-04 17:40:50 +00:00
Treehugger Robot
7968bc4f39 Merge "Set BOARD_SYSTEMSDK_VERSIONS even if PRODUCT_SHIPPING_API_LEVEL is unset" into main 2024-01-04 17:39:28 +00:00
Jiyong Park
7a0e042276 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: Ie70ce428ec3df8580099efd99e5c7c9c4f9daecb
2024-01-04 23:48:27 +09:00
Jiyong Park
0284ba297c Set BOARD_SYSTEMSDK_VERSIONS even if PRODUCT_SHIPPING_API_LEVEL is unset
Previously, we checked if PRODUCT_SHIPPING_API_LEVEL >= 28, but that no
longer is needed because upgrading from 29 to 35 is not expected. All
devices running Android V are expected to be shipped after 28.

Furthermore, this fixes non-device targets (like sdk) where
PRODUCT_SHIPPING_API_LEVEL is unset.

Bug: 318634417
Test: build with sdk target
Change-Id: I8f8337fb76312334777e621ae5870d953167ad49
2024-01-04 21:14:58 +09:00
Jiyong Park
c7f29bdc4d Merge "Limit System SDK to 34 for Java modules in the vendor partition" into main am: e67e0dda48 am: 48f7b3201d am: d04946ceb3
Original change: https://android-review.googlesource.com/c/platform/build/+/2894701

Change-Id: I84b012adcf5a53c08b2a12fbafad5da5ecea53ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-04 11:31:48 +00:00
Jiyong Park
d04946ceb3 Merge "Limit System SDK to 34 for Java modules in the vendor partition" into main am: e67e0dda48 am: 48f7b3201d
Original change: https://android-review.googlesource.com/c/platform/build/+/2894701

Change-Id: I6a032d4a9e78387b9bb53118002f6c81d0741e34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-04 10:58:41 +00:00
Jiyong Park
e67e0dda48 Merge "Limit System SDK to 34 for Java modules in the vendor partition" into main 2024-01-04 09:37:36 +00:00
Jooyung Han
0699820726 Merge "Pass LOCAL_MIN_SDK_VERSION to clang triple" into main am: aaab9b5026 am: c1da098856 am: d887a8641c
Original change: https://android-review.googlesource.com/c/platform/build/+/2896860

Change-Id: I8a1267d25edc8c908ce165239daf89602a314a6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-04 09:06:08 +00:00
Tongbo Liu
e1052fd939 Enable building whole MCTS and partial MCTS test suites.
Bug: 318608673
Test: m mcts
Change-Id: I2af74e319c40b0e36d8a71e1da3c6934f66a51be
2024-01-04 16:51:03 +08:00
Jooyung Han
d887a8641c Merge "Pass LOCAL_MIN_SDK_VERSION to clang triple" into main am: aaab9b5026 am: c1da098856
Original change: https://android-review.googlesource.com/c/platform/build/+/2896860

Change-Id: I0e208c44c1393bb13459ee9e404539dc7c2b23af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-04 07:45:43 +00:00
Jooyung Han
aaab9b5026 Merge "Pass LOCAL_MIN_SDK_VERSION to clang triple" into main 2024-01-04 06:43:11 +00:00
Jooyung Han
358875fbe6 Pass LOCAL_MIN_SDK_VERSION to clang triple
Like soong modules, pass LOCAL_MIN_SDK_VERSION to clang when it's set.

Bug: 317676192
Test: manual check (set LOCAL_MIN_SDK_VERSION as 34 for wpa_supplicant
  and see if generated build commands has android34)
Change-Id: I48928e54417f47f2e0c2417f04e5893764c3edb9
2024-01-04 10:48:51 +09:00
Colin Cross
b9859d0dd8 Merge "Support Soong-generated module-info.json entries" into main am: 7f91599457 am: 99edf49d08 am: 350450c7a6
Original change: https://android-review.googlesource.com/c/platform/build/+/2881408

Change-Id: Iaf98172011497671efcf457aaf0394dec091dcc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 18:31:03 +00:00
Colin Cross
350450c7a6 Merge "Support Soong-generated module-info.json entries" into main am: 7f91599457 am: 99edf49d08
Original change: https://android-review.googlesource.com/c/platform/build/+/2881408

Change-Id: I6a53c7c429755797d51c885efbc65bda0fdfe3e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 18:28:45 +00:00
Colin Cross
74f85c731f Merge "Don't install vintf and init.rc from Soong" into main am: 01ede583ea am: 104fbae909 am: 32c2dc8aee
Original change: https://android-review.googlesource.com/c/platform/build/+/2881407

Change-Id: I6257af35f82b076cdd78b9f4731bddcfaac78356
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 18:28:32 +00:00
Colin Cross
32c2dc8aee Merge "Don't install vintf and init.rc from Soong" into main am: 01ede583ea am: 104fbae909
Original change: https://android-review.googlesource.com/c/platform/build/+/2881407

Change-Id: I06d7e34bb17e08ba299202d9766d2d0d14e1f09d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 17:59:10 +00:00
Colin Cross
7f91599457 Merge "Support Soong-generated module-info.json entries" into main 2024-01-03 17:55:47 +00:00
Colin Cross
01ede583ea Merge "Don't install vintf and init.rc from Soong" into main 2024-01-03 16:53:45 +00:00
Jiyong Park
e3c278844d 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.

This CL implements the "Make" part of the restriction. The "Soong" part
will follow.

Note that LOCAL_SDK_VERSION := current or LOCAL_SDK_VERSION :=
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: The following Android.mk module fails as expected.
some/Android.mk:

include $(CLEAR_VARS)
LOCAL_MODULE := example_module
LOCAL_VENDOR_MODULE := true
LOCAL_SDK_VERSION := system_35
LOCAL_SRC_FILES := Foo.java
include $(BUILD_JAVA_LIBRARY)

FAILED:
some/Android.mk: error: example_module: Incompatible
LOCAL_SDK_VERSION 'system_35'. System SDK version '35' is not supported.
Supported versions are: 28 29 30 31 32 33 34

Change-Id: I44c29c6dc45b91a9a30b8a21cd2baae685fa27fb
2024-01-03 16:35:08 +09:00
Colin Cross
3b89c6532a Support Soong-generated module-info.json entries
Allow Soong modules to generate their own module-info.json entries
by merging Soong's module-info.json file into the one generated in
Make.

Skip collecting unnecessary ALL_MODULES.$(my_register_name).*
that are only used for module-info.json if the module was already
handled by Soong via the LOCAL_SOONG_MODULE_INFO_JSON property.

Bug: 309006256
Test: Compare module-info.json
Change-Id: I2c9db3c7c7bae7bd6cb889d7ebc2e383c278c82d
2024-01-02 17:21:22 -08:00
Steven Moreland
211777b269 Merge "PRODUCT_FULL_TREBLE disabled warning" into main am: ec74316f8f am: dafdbfcada am: 448398b2f0
Original change: https://android-review.googlesource.com/c/platform/build/+/2892202

Change-Id: I201c58072b89d0d32ced5888138a8f5a53fe7d18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-02 22:50:57 +00:00
Colin Cross
b2063049f8 Don't install vintf and init.rc from Soong
Soong is now handling installing init.rc and vintf fragment files,
don't install them in Make for Soong modules.

Bug: 309006256
Test: Compare installed files
Change-Id: Ied43c207c6ae158d3f41d81c7fe16688331bf13c
2024-01-02 14:33:20 -08:00
Steven Moreland
448398b2f0 Merge "PRODUCT_FULL_TREBLE disabled warning" into main am: ec74316f8f am: dafdbfcada
Original change: https://android-review.googlesource.com/c/platform/build/+/2892202

Change-Id: Idf05213eb03e0fcd83451aa5e6fc61afcc09ce47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-02 22:19:31 +00:00
Steven Moreland
fb1160d0b8 PRODUCT_FULL_TREBLE disabled warning
Treble is like so 2016, but it's 2023.

Bug: 307369186
Test: build
Change-Id: Icb24e218d0dbc5f76f0c83f809728d33dc67719e
2023-12-28 21:39:10 +00:00
Seungjae Yoo
7d5a984ad6 Merge "Append root digest information of microdroid vendor into vendor.img" into main am: a79329678d am: d53dd61fe9 am: b9f308c10b
Original change: https://android-review.googlesource.com/c/platform/build/+/2877541

Change-Id: Iceefd30978eda0d661ce42e262995567611d5e00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-28 03:00:41 +00:00
Seungjae Yoo
b9f308c10b Merge "Append root digest information of microdroid vendor into vendor.img" into main am: a79329678d am: d53dd61fe9
Original change: https://android-review.googlesource.com/c/platform/build/+/2877541

Change-Id: I6862637301ba9a81ad335dd7d85173fd3ea4ddd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-28 02:28:01 +00:00
Seungjae Yoo
a79329678d Merge "Append root digest information of microdroid vendor into vendor.img" into main 2023-12-28 01:17:36 +00:00
Steven Moreland
bbc8442149 Merge "Force PRODUCT_NOTICE_SPLIT." into main am: 6b5b3b40bd am: c6b5ea519d am: edfdf41255
Original change: https://android-review.googlesource.com/c/platform/build/+/2889079

Change-Id: If97ebee84975600cab0599eb1b3971da6e3bf02d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-27 20:13:27 +00:00
Steven Moreland
edfdf41255 Merge "Force PRODUCT_NOTICE_SPLIT." into main am: 6b5b3b40bd am: c6b5ea519d
Original change: https://android-review.googlesource.com/c/platform/build/+/2889079

Change-Id: Ia63d425b13329bd6f6f051b757bfb1a3b2fe0022
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-27 19:41:44 +00:00
Steven Moreland
6b5b3b40bd Merge "Force PRODUCT_NOTICE_SPLIT." into main 2023-12-27 18:40:17 +00:00
Steven Moreland
5c11308f60 Force PRODUCT_NOTICE_SPLIT.
Bug: 307369186
Test: N/A
Change-Id: I9d7810422cd8c34e84d755cfc14aded633a5baad
2023-12-27 01:09:36 +00:00
Seungjae Yoo
939d37b88c Append root digest information of microdroid vendor into vendor.img
Instead appending public key information into vendor partition,
append root digest of microdroid-vendor's hashtree descriptor. The root
digest would be extracted in build time with avbtool.

Bug: 285855436
Test: avbtool info_image --image $ANDROID_PRODUCT_OUT/vendor/etc/avf/microdroid/microdroid_vendor.img
Test: avbtool info_image --image $ANDROID_PRODUCT_OUT/vendor.img
Change-Id: I930b09774a1024a2e5d30f474f1589fc1b8aa25a
2023-12-26 17:21:41 +09:00
Treehugger Robot
2fd458a1b2 Merge "Change sepolicy version format for vFRC" into main am: d7298ff414 am: 6db5d88034 am: faf9dd4488
Original change: https://android-review.googlesource.com/c/platform/build/+/2867998

Change-Id: I745f644308bdc1a064f803de8ce1f5a17a24e74c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-22 04:00:31 +00:00
Treehugger Robot
faf9dd4488 Merge "Change sepolicy version format for vFRC" into main am: d7298ff414 am: 6db5d88034
Original change: https://android-review.googlesource.com/c/platform/build/+/2867998

Change-Id: Ia0f8ee94101b420911179168ec92098482905c75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-22 03:27:32 +00:00
Treehugger Robot
d7298ff414 Merge "Change sepolicy version format for vFRC" into main 2023-12-22 02:25:15 +00:00
Julien Desprez
c520c6a119 Merge "Use sha256 when zipping target_files" into main am: 2538c86562 am: c89956a3e5 am: 57ecf17d23
Original change: https://android-review.googlesource.com/c/platform/build/+/2881406

Change-Id: I7ba502dff28e251e6826ad0dc65381f753e3dd2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-19 04:25:38 +00:00
Julien Desprez
57ecf17d23 Merge "Use sha256 when zipping target_files" into main am: 2538c86562 am: c89956a3e5
Original change: https://android-review.googlesource.com/c/platform/build/+/2881406

Change-Id: Ibad4bdc6e8375c55baf469aea05e38086081e3af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-19 03:51:53 +00:00
Julien Desprez
eebf6dcd1a Use sha256 when zipping target_files
similar to general-tests.mk, this will avoid recomputing sha256 when
uploading target files to RBE.

Test: presubmit
Bug: 316952196
Change-Id: I879214ac79f5c269f337fafcede8513c1e90e60e
2023-12-18 22:39:04 +00:00
Dmitrii Merkurev
aa069668d3 Merge "Revert "Revert "Allow to override fastboot-info.txt for specific..."" into main am: ecabf893a0 am: 9f2bf543b9 am: fd02c7660b
Original change: https://android-review.googlesource.com/c/platform/build/+/2875335

Change-Id: Iac8bba0df1f95b6aa7f8978097b422d19bfcb85f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-14 19:55:38 +00:00
Dmitrii Merkurev
fd02c7660b Merge "Revert "Revert "Allow to override fastboot-info.txt for specific..."" into main am: ecabf893a0 am: 9f2bf543b9
Original change: https://android-review.googlesource.com/c/platform/build/+/2875335

Change-Id: I55053bfb8aea3d40a607a6ea28b53c9785137ecf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-14 19:22:43 +00:00
Dmitrii Merkurev
901136e9d8 Revert "Revert "Allow to override fastboot-info.txt for specific..."
Revert submission 2871792-revert-2871156-fastboot_info-UVHXWCTZZB

Reason for revert: Some images weren't available in Android.mk

Reverted changes: /q/submissionid:2871792-revert-2871156-fastboot_info-UVHXWCTZZB

Bug: 315866782
Test: confirmed bluejay abtd build has correct fastboot-info.txt

Change-Id: Id75d879119744ab97225e5a551e8d32a1b09a356
Signed-off-by: Dmitrii Merkurev <dimorinny@google.com>
2023-12-14 13:27:38 +00:00
Satoshi Niwa
88fc7ad3a8 Add a new x86(_64) arch variant "goldmont-without-xsaves"
Its target arch is goldmont, but without xsaves support.
It can build images that run on old Intel/AMD CPUs as well as new CPUs.

Bug: 314243939
Test: Build an image with TARGET_ARCH_VARIANT:=goldmont-without-xsaves
Change-Id: I9c4bfd3928511f5b4a075f9a9337db6e1270a765
2023-12-14 17:47:56 +09:00
Dan Shi
f877c1c7c4 Merge "Revert "Allow to override fastboot-info.txt for specific board"" into main am: e8519a7bad am: c0d94d179a am: 17391cba39
Original change: https://android-review.googlesource.com/c/platform/build/+/2871792

Change-Id: I370421e6e101b3e5f078a6a7b86dc745ce7164b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-13 20:55:05 +00:00
Dan Shi
17391cba39 Merge "Revert "Allow to override fastboot-info.txt for specific board"" into main am: e8519a7bad am: c0d94d179a
Original change: https://android-review.googlesource.com/c/platform/build/+/2871792

Change-Id: I0a765845255a3eedfb86b0b92c174cbd1fe54d14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-13 20:23:04 +00:00
Dan Shi
e8519a7bad Merge "Revert "Allow to override fastboot-info.txt for specific board"" into main 2023-12-13 19:19:16 +00:00
Dan Shi
16490d3207 Revert "Allow to override fastboot-info.txt for specific board"
Revert submission 2871156-fastboot_info

Reason for revert: possble cause of b/315866782

Reverted changes: /q/submissionid:2871156-fastboot_info

Change-Id: I07baf20bd50529a36f2841350a24ba58d480f5e2
2023-12-13 18:58:49 +00:00