Commit Graph

96063 Commits

Author SHA1 Message Date
Treehugger Robot
a9747bc748 Merge changes from topics "revert-2897484-revert-2897682-dont_limit_systemsdk-JCOOOXGAIF-BSJGJAJAWC", "revert-2897568-revert-2894701-limit_systemsdk-WNEMOTGMRS-ROJNXPXKUV" into main am: 32fd2dee4f am: 6ed485ed67 am: 4248a4b727
Original change: https://android-review.googlesource.com/c/platform/build/+/2897686

Change-Id: Ic55b43eed11649f1bcb46eef6a27b70d20bacd69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-06 18:53:05 +00:00
Treehugger Robot
fbda6b3ee9 Merge "Change default lunch target" into main am: a8becbc144 am: 29190f5b96 am: 8f411096ce
Original change: https://android-review.googlesource.com/c/platform/build/+/2898150

Change-Id: Ifb56a6e0aac5d24042406b9e21f776e1893d536c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-06 18:52:49 +00:00
Treehugger Robot
4248a4b727 Merge changes from topics "revert-2897484-revert-2897682-dont_limit_systemsdk-JCOOOXGAIF-BSJGJAJAWC", "revert-2897568-revert-2894701-limit_systemsdk-WNEMOTGMRS-ROJNXPXKUV" into main am: 32fd2dee4f am: 6ed485ed67
Original change: https://android-review.googlesource.com/c/platform/build/+/2897686

Change-Id: I539fa80234b0d752af7d0bad603654950ad81d43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-06 18:16:53 +00:00
Treehugger Robot
8f411096ce Merge "Change default lunch target" into main am: a8becbc144 am: 29190f5b96
Original change: https://android-review.googlesource.com/c/platform/build/+/2898150

Change-Id: I110ce93f3354002de50b8ad3d68371373c949942
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-06 18:16:35 +00:00
Treehugger Robot
6ed485ed67 Merge changes from topics "revert-2897484-revert-2897682-dont_limit_systemsdk-JCOOOXGAIF-BSJGJAJAWC", "revert-2897568-revert-2894701-limit_systemsdk-WNEMOTGMRS-ROJNXPXKUV" into main am: 32fd2dee4f
Original change: https://android-review.googlesource.com/c/platform/build/+/2897686

Change-Id: I0f51e35077ee01c4447bb2715cd4a31aca2a8007
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-06 18:02:10 +00:00
Treehugger Robot
32fd2dee4f Merge changes from topics "revert-2897484-revert-2897682-dont_limit_systemsdk-JCOOOXGAIF-BSJGJAJAWC", "revert-2897568-revert-2894701-limit_systemsdk-WNEMOTGMRS-ROJNXPXKUV" into main
* changes:
  Revert^2 "Add BUILD_BROKEN_DONT_CHECK_SYSTEMSDK"
  Revert "Revert "Limit System SDK to 34 for Java modules in the v..."
2024-01-06 17:53:41 +00:00
Treehugger Robot
29190f5b96 Merge "Change default lunch target" into main am: a8becbc144
Original change: https://android-review.googlesource.com/c/platform/build/+/2898150

Change-Id: I43ea24edc8ab4484d1af20b958392ee2dc770f59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-06 17:46:25 +00:00
Treehugger Robot
a8becbc144 Merge "Change default lunch target" into main 2024-01-06 17:26:16 +00:00
Jag
638d98fc0f [automerger skipped] Add respective modules to the list of individually toggleable modules. am: e14f4862bb -s ours
am skip reason: Merged-In I4854e1b1e3c032fb9d3fadf34f596e8e7480ea94 with SHA-1 6b2dd79f40 is already in history

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

Change-Id: I81161f9da9dc45935edcbc8b1cc00e093da0b4c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-06 06:31:06 +00:00
Jag
e14f4862bb Add respective modules to the list of individually toggleable modules.
This is safe since GTS tests already exist to check for mandatory modules, which these modulea are a part of.

Test: packages/modules/common/build/mainline_modules_sdks.sh
Bug: 238203992
Ignore-AOSP-First: changes in topics with internal-first/internal-only projects.
Change-Id: Ica19b306bdbd67a86d2cf73478d0f886f782118c
Merged-In: I4854e1b1e3c032fb9d3fadf34f596e8e7480ea94
2024-01-06 05:22:40 +00:00
Treehugger Robot
757478d913 Merge "Add respective modules to the list of individually toggleable modules." into main 2024-01-05 22:38:25 +00:00
Fabián Cañas
03dd0283bc Fix numeric selection from lunch menu
Bug: 318871826
Test: 'lunch' with no arguments, then select a lunch target with a
number.

Change-Id: I8418ef0415437548d1429ec7a2c239d8c5b615d5
2024-01-05 16:57:39 -05:00
Jag
6b2dd79f40 Add respective modules to the list of individually toggleable modules.
This is safe since GTS tests already exist to check for mandatory modules, which these modulea are a part of.

Test: packages/modules/common/build/mainline_modules_sdks.sh
Bug: 238203992
Ignore-AOSP-First: changes in topics with internal-first/internal-only projects.
Change-Id: I4854e1b1e3c032fb9d3fadf34f596e8e7480ea94
2024-01-05 21:31:26 +00:00
Vladimír Marko
48fb5cbbcc Merge "Add a new x86(_64) arch variant "goldmont-without-xsaves"" into main am: 415fdddd98 am: 5fde6b741d am: acb6cd4fa1
Original change: https://android-review.googlesource.com/c/platform/build/+/2875197

Change-Id: I31221e1f612386cff671326319b197ab0f3c3407
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-05 14:01:34 +00:00
Vladimír Marko
acb6cd4fa1 Merge "Add a new x86(_64) arch variant "goldmont-without-xsaves"" into main am: 415fdddd98 am: 5fde6b741d
Original change: https://android-review.googlesource.com/c/platform/build/+/2875197

Change-Id: I28a2f2747c7c31c75b6a4aff53c452af672a64ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-05 13:28:58 +00:00
Vladimír Marko
5fde6b741d Merge "Add a new x86(_64) arch variant "goldmont-without-xsaves"" into main am: 415fdddd98
Original change: https://android-review.googlesource.com/c/platform/build/+/2875197

Change-Id: I6bdb1827c790eb18db5be7c0d91fdbf6ec6f052d
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
415fdddd98 Merge "Add a new x86(_64) arch variant "goldmont-without-xsaves"" into main 2024-01-05 12:29:33 +00:00
Tongbo Liu
5bdb4e37d0 Merge "Enable building whole MCTS and partial MCTS test suites." into main 2024-01-05 05:54:35 +00:00
Greg Kaiser
bae4c57b7b Change default lunch target
We keep this as "trunk_staging" and "eng".  However, we switch
from "aosp_arm" to "aosp_cf_x86_64_phone".  This switches us
away from 32-bit development, and gives us a project (the
cuttlefish ("cf") emulator) at the end of the build which is
runnable with reasonable performance, and able to run all 32-bit
and 64-bit tests.

Bug: 318749634
Test: lunch

Change-Id: I920cdd413cbcecd4300bc46c719e5788244a924e
2024-01-04 16:36:07 -07:00
Jiyong Park
885b004547 Revert^2 "Add BUILD_BROKEN_DONT_CHECK_SYSTEMSDK"
5ef2634d5a

Change-Id: I4430ac4b2411baf3f33695ba3b1520345d7f493d
2024-01-04 23:23:38 +00:00
Jiyong Park
7a66924a60 Revert "Revert "Limit System SDK to 34 for Java modules in the v..."
Revert submission 2897568-revert-2894701-limit_systemsdk-WNEMOTGMRS

Reason for revert: Forward fix was merged

Reverted changes: /q/submissionid:2897568-revert-2894701-limit_systemsdk-WNEMOTGMRS

Change-Id: Ia103db05bfaebdfd301dbf84183a89d01f58eb67
2024-01-04 23:20:49 +00:00
Sebastian Pickl
283f9a5cff Merge "Revert "Limit System SDK to 34 for Java modules in the vendor pa..."" into main am: 04591b6315 am: df98f5e1b2 am: 9fcb435508
Original change: https://android-review.googlesource.com/c/platform/build/+/2897568

Change-Id: I422b0cf914428d7eb4cdab314e0dfd445b4c55df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-04 21:22:47 +00:00
Sebastian Pickl
caac332211 Merge "Revert "Add BUILD_BROKEN_DONT_CHECK_SYSTEMSDK"" into main am: 8d0d963070 am: 8b3c8aa546 am: c906b7a543
Original change: https://android-review.googlesource.com/c/platform/build/+/2897484

Change-Id: Ifaea358e8cb04b296de2710863cafcda2049597e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-04 21:21:54 +00:00
Sebastian Pickl
9fcb435508 Merge "Revert "Limit System SDK to 34 for Java modules in the vendor pa..."" into main am: 04591b6315 am: df98f5e1b2
Original change: https://android-review.googlesource.com/c/platform/build/+/2897568

Change-Id: I8748e935b48ec93d866f7b855ef9e9a370504d2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-04 20:33:29 +00:00
Sebastian Pickl
c906b7a543 Merge "Revert "Add BUILD_BROKEN_DONT_CHECK_SYSTEMSDK"" into main am: 8d0d963070 am: 8b3c8aa546
Original change: https://android-review.googlesource.com/c/platform/build/+/2897484

Change-Id: I8d65eb0a913111d06feef61e5113d33dba49c7ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-04 20:33:07 +00:00
Sebastian Pickl
df98f5e1b2 Merge "Revert "Limit System SDK to 34 for Java modules in the vendor pa..."" into main am: 04591b6315
Original change: https://android-review.googlesource.com/c/platform/build/+/2897568

Change-Id: I611ea9d8c5a367da38358a0f1fc96c3b690b7c48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-04 20:02:57 +00:00
Sebastian Pickl
8b3c8aa546 Merge "Revert "Add BUILD_BROKEN_DONT_CHECK_SYSTEMSDK"" into main am: 8d0d963070
Original change: https://android-review.googlesource.com/c/platform/build/+/2897484

Change-Id: I33784f61cc82ae6e38647a479c9e9d0ff441de84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-04 20:02:34 +00:00
Joe Onorato
477c287bbf Merge "Add BUILD_BROKEN_DONT_CHECK_SYSTEMSDK" into main am: 3309714a2a am: fd19d96b12 am: dae8acbb04
Original change: https://android-review.googlesource.com/c/platform/build/+/2897441

Change-Id: Ib599ef3657f8c40b6af26c9cd717d41f01d3e678
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-04 19:34:38 +00:00
Treehugger Robot
8e24afbb22 Merge "Set BOARD_SYSTEMSDK_VERSIONS even if PRODUCT_SHIPPING_API_LEVEL is unset" into main am: 7968bc4f39 am: fdb1137a95 am: fb5ded844e
Original change: https://android-review.googlesource.com/c/platform/build/+/2897500

Change-Id: I2a3f7dda00babb4cf5744724b60685bbc21c9c64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-04 19:34:25 +00:00
Sebastian Pickl
04591b6315 Merge "Revert "Limit System SDK to 34 for Java modules in the vendor pa..."" into main 2024-01-04 19:30:31 +00:00
Sebastian Pickl
78c6e1368b 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: Idfaec65ddfbb0091672993d6c857a06e9cfdfb13
2024-01-04 19:28:02 +00:00
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
fd19d96b12 Merge "Add BUILD_BROKEN_DONT_CHECK_SYSTEMSDK" into main am: 3309714a2a
Original change: https://android-review.googlesource.com/c/platform/build/+/2897441

Change-Id: Ibdba6f46705da7dc48fbcba128f82dc17b498672
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-04 18:31:20 +00:00
Treehugger Robot
fdb1137a95 Merge "Set BOARD_SYSTEMSDK_VERSIONS even if PRODUCT_SHIPPING_API_LEVEL is unset" into main am: 7968bc4f39
Original change: https://android-review.googlesource.com/c/platform/build/+/2897500

Change-Id: Ie583f473f4ff1bd3a2f5056a107a0232e250a037
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-04 18:31:04 +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
Dennis Shen
e59313185f aconfig: create flag.map storage file
Add flag_table module for the creation of flag.map file. This is a hash
table in file similar to package.map hash table in file. This is created
per each container. It stores a mapping from a composite key (package id
and flag name) to its flag id (within package index of a flag).

This hash table allows us to look up the within package offset for a
specific flag. Along with the package offset obtained from package.map,
we will be able to find the global offset of a flag in the flag value
file.

Added unit tests to lock down the table creation and serialization.

Bug: b/312243587
Test: atest aconfig.test
Change-Id: I6e9d07bef05131cb06cfb4aa2ef29985578a6949
2024-01-04 16:17:34 +00:00
Dennis Shen
b65b350fc1 aconfig: update storage unit test case
merge storage_test_1_part_1.aconfig and storage_test_1_part_2.aconfig
into one aconfig file: storage_test_1.aconfig

remove two flags from test_1 package so the total number of flags across
three aconfig package is now 8, which is easier to test in unit test.

Bug: b/312243587
Test: atest aconfig.test
Change-Id: Idd249a8dcddfbae09b211e6310d74697763618f4
2024-01-04 16:08:17 +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
48f7b3201d Merge "Limit System SDK to 34 for Java modules in the vendor partition" into main am: e67e0dda48
Original change: https://android-review.googlesource.com/c/platform/build/+/2894701

Change-Id: Ib99f0cfaf8656d915bb4807d4e55f34a47efb4ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-04 10:12:29 +00:00
Justin Yun
95d89d961d New LLNDK libvendorsupport.so for vendor api level
To handle the vendor API level, provide a new LLNDK library.

Bug: 315056516
Test: atest libvendorsupport-tests
Change-Id: Ide8a88aa22e7722b82faf3a71b62c3cf90fe05bd
2024-01-04 18:39:49 +09: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