Commit Graph

96063 Commits

Author SHA1 Message Date
Aditya Choudhary
16291ef6a6 Add metadata generator tool for test spec metadata generation.
Bug: 296873595
Test: Manual test (use go test inside tools/metadata/testdata)

Ignore-AOSP-First: CPing test_spec rule to udc-mainline-prod to support migration of test targets. Cherry pick of: aosp/2815214

Change-Id: I404b57224828149f26bcf4deadb662f513886231
Merged-In: I404b57224828149f26bcf4deadb662f513886231
2024-01-03 12:46:51 +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
Treehugger Robot
248182c000 Merge "dist-one flag should be a boolean, not a string" into main am: 2e137a9963 am: 439b4ce7f7 am: 63a0ad00eb
Original change: https://android-review.googlesource.com/c/platform/build/+/2893725

Change-Id: I198d852ec5ad277c95cfbc449fca548a492ff4ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 03:12:42 +00:00
Treehugger Robot
63a0ad00eb Merge "dist-one flag should be a boolean, not a string" into main am: 2e137a9963 am: 439b4ce7f7
Original change: https://android-review.googlesource.com/c/platform/build/+/2893725

Change-Id: Ic66501e7c2ae7013c62c12b295a170e2bc1d73e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 02:40:48 +00:00
Treehugger Robot
439b4ce7f7 Merge "dist-one flag should be a boolean, not a string" into main am: 2e137a9963
Original change: https://android-review.googlesource.com/c/platform/build/+/2893725

Change-Id: I0ac24d4d21d0138a8b6cd1f90a088552cb370c83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 02:03:39 +00:00
Treehugger Robot
2e137a9963 Merge "dist-one flag should be a boolean, not a string" into main 2024-01-03 01:31:49 +00: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
Joe Onorato
60c36ade0f dist-one flag should be a boolean, not a string
Test: th
Change-Id: I99a22011518b4a7a7f506b93d6a5ac9c7c4a2ef5
2024-01-02 16:36:31 -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
Dennis Shen
5098a78d2e Merge "aconfig: add assign_flag_ids function" into main am: 68570f67c1 am: 15736d6d28 am: aebe362243
Original change: https://android-review.googlesource.com/c/platform/build/+/2888807

Change-Id: I4b07a911fa3a5dbe3e2d62c6e3f468be48e19c8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-02 22:50:35 +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
Dennis Shen
aebe362243 Merge "aconfig: add assign_flag_ids function" into main am: 68570f67c1 am: 15736d6d28
Original change: https://android-review.googlesource.com/c/platform/build/+/2888807

Change-Id: I22ed92ad4574a8e024d72b2b4a882e66bc7c55a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-02 22:19:05 +00:00
Steven Moreland
dafdbfcada Merge "PRODUCT_FULL_TREBLE disabled warning" into main am: ec74316f8f
Original change: https://android-review.googlesource.com/c/platform/build/+/2892202

Change-Id: Icbb094f07504da60fdeddd961a67d24dd952ce59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-02 21:49:10 +00:00
Dennis Shen
15736d6d28 Merge "aconfig: add assign_flag_ids function" into main am: 68570f67c1
Original change: https://android-review.googlesource.com/c/platform/build/+/2888807

Change-Id: I1ba7ca72747434d7c054c103b735f0bc456c719a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-02 21:48:58 +00:00
Steven Moreland
ec74316f8f Merge "PRODUCT_FULL_TREBLE disabled warning" into main 2024-01-02 21:45:58 +00:00
Dennis Shen
68570f67c1 Merge "aconfig: add assign_flag_ids function" into main 2024-01-02 21:17:50 +00:00
Dennis Shen
ba72cc7ae1 aconfig: add assign_flag_ids function
Add a function to assign flag id for flags in a package. We first assert
that the flags should have been sorted by its name, then assign a u32 id
to each flag in order. Note this cl adds the function, it will be used
in later cls.

Bug: b/312243116
Test: atest aconfig.test
Change-Id: I843433305abecbe0cc78988fe23dcf35c6a03358
2024-01-02 19:00:44 +00:00
Roland Levillain
3a442cc088 Update OWNERS files under build/make.
Test: n/a
Change-Id: I91e6eb90c2709e64a27f069f522a11374b99c91e
2024-01-02 18:40:38 +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
d53dd61fe9 Merge "Append root digest information of microdroid vendor into vendor.img" into main am: a79329678d
Original change: https://android-review.googlesource.com/c/platform/build/+/2877541

Change-Id: I9260a2edf6d6140fea62394ea21fd2277654a7ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-28 01:56:00 +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
c6b5ea519d Merge "Force PRODUCT_NOTICE_SPLIT." into main am: 6b5b3b40bd
Original change: https://android-review.googlesource.com/c/platform/build/+/2889079

Change-Id: I1f010ae1d30359fbcbd676c11fe76ad77f91cb49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-27 19:08:47 +00:00
Steven Moreland
6b5b3b40bd Merge "Force PRODUCT_NOTICE_SPLIT." into main 2023-12-27 18:40:17 +00:00
Treehugger Robot
46a161eeaf Merge "finalization: remove 'update' scripts" into main 2023-12-27 01:51:44 +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
Steven Moreland
0f84e4b21c Split finalization scripts between vFRC and sFRC.
This splits out the AIDL/VNDK/sepolicy stuff from the SDK
finalization. However, in CI, we still do the vFRC step
as part of the first step.

We'll probably want to do some of the following:
- (maybe) add CI for the first step - a 'fina-0' branch
- add a way to do SDK finalizatoin without VINTF finalization
  because after VINTF finalization is submitted, people will
  develop in-progress interfaces that aren't done yet
- a lot of VINTF finalization is still not automated, so things
  like sepolicy and LL-NDK need to be added here.

Ignore-AOSP-First: b/304316873#comment10

Bug: 314010935
Test: N/A
Change-Id: I4831a14f5c5c3d757bd1d10a775d8cf4940d9a4a
2023-12-27 00:24:00 +00:00
Steven Moreland
5fe439eec2 finalization: remove 'update' scripts
alexbuy@ said:

    please remove both update-* scripts. they were part of r&d project
    that was never finished

Ignore-AOSP-First: b/304316873#comment10

Bug: 314010935
Test: N/A
Change-Id: Iecc22cc860ba67fec336adb0c5b93f51677dc9ce
2023-12-27 00:22:39 +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
df1352fd3e Merge "Quote the backslash in the hmm output." into main am: c77d458a7e am: c426f743f3 am: d2272c10ff
Original change: https://android-review.googlesource.com/c/platform/build/+/2889391

Change-Id: Ib8e77d77cf9ca8c8b25cf3b989e6bf6347fe4a1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-22 19:23:08 +00:00
Treehugger Robot
d2272c10ff Merge "Quote the backslash in the hmm output." into main am: c77d458a7e am: c426f743f3
Original change: https://android-review.googlesource.com/c/platform/build/+/2889391

Change-Id: Ice0ba7b59abc44cb203326ecd7b97e3b806790b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-22 18:50:32 +00:00
Treehugger Robot
c426f743f3 Merge "Quote the backslash in the hmm output." into main am: c77d458a7e
Original change: https://android-review.googlesource.com/c/platform/build/+/2889391

Change-Id: I05cc40b5d9cc031d5f60421abf15c50b51d22a05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-22 18:19:35 +00:00
Treehugger Robot
c77d458a7e Merge "Quote the backslash in the hmm output." into main 2023-12-22 17:44:19 +00:00
Martin Stjernholm
a73fe8da4b Quote the backslash in the hmm output.
Otherwise it becomes a single line with an ugly long stretch of spaces
in the middle.

Test: hmm
Bug: 179779520
Change-Id: Ia095b75248952d9bee0d6417028d04460e74ad33
2023-12-22 13:32:42 +00: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
6db5d88034 Merge "Change sepolicy version format for vFRC" into main am: d7298ff414
Original change: https://android-review.googlesource.com/c/platform/build/+/2867998

Change-Id: I7ca20c4c8951533d02c594f6257d1a225c3168ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-22 02:57:22 +00:00
Treehugger Robot
d7298ff414 Merge "Change sepolicy version format for vFRC" into main 2023-12-22 02:25:15 +00:00
Treehugger Robot
a0019e13a3 Merge "Allow filtering and sorting by tag in benchmark result formatting" into main am: 38fcbf3c8e am: 43a0639a74 am: 4612afeaf8
Original change: https://android-review.googlesource.com/c/platform/build/+/2889109

Change-Id: I1ade3de9d373f7114032d84237b7de3e92a17739
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-22 00:15:18 +00:00
Treehugger Robot
4612afeaf8 Merge "Allow filtering and sorting by tag in benchmark result formatting" into main am: 38fcbf3c8e am: 43a0639a74
Original change: https://android-review.googlesource.com/c/platform/build/+/2889109

Change-Id: I432c09027f50789ee8ef8f741cfc6d6f56b87a05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-21 23:42:11 +00:00
Treehugger Robot
43a0639a74 Merge "Allow filtering and sorting by tag in benchmark result formatting" into main am: 38fcbf3c8e
Original change: https://android-review.googlesource.com/c/platform/build/+/2889109

Change-Id: I454abf6bf91d4fa34488f2efb9ff6f455a8746aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-21 22:50:17 +00:00
Treehugger Robot
38fcbf3c8e Merge "Allow filtering and sorting by tag in benchmark result formatting" into main 2023-12-21 22:26:54 +00:00
Joe Onorato
67c944b351 Allow filtering and sorting by tag in benchmark result formatting
Test: build/make/tools/perf/format_benchmarks --tags n2d-standard-128 n2-standard-80 n2d-standard-48
Change-Id: Ie4a4e36d4bc2aab50a017acbaf3ef0e23ddae958
2023-12-21 13:29:48 -08:00
Treehugger Robot
ca5288d0d1 [automerger skipped] Merge "aconfig: adjust integration tests to correctly set flag values" into main am: df7014c202 am: 898ed5bc76 am: 4b5328899e -s ours
am skip reason: Merged-In I1acdf9442a465f20f71bcda9b15eb69058aa4b3a with SHA-1 d669fa67ed is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/2884668

Change-Id: I88d2fcc51e3f52ef835ac61801179fd62906ba88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-21 20:41:25 +00:00
Treehugger Robot
4b5328899e Merge "aconfig: adjust integration tests to correctly set flag values" into main am: df7014c202 am: 898ed5bc76
Original change: https://android-review.googlesource.com/c/platform/build/+/2884668

Change-Id: I2f1190fc1ba9bb0da1e67fd1e7af2c75752120ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-21 20:10:19 +00:00
Treehugger Robot
898ed5bc76 Merge "aconfig: adjust integration tests to correctly set flag values" into main am: df7014c202
Original change: https://android-review.googlesource.com/c/platform/build/+/2884668

Change-Id: Ifb10921a9e12d0e517edd9bfa96a37d59b776b63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-21 19:37:16 +00:00