77 Commits

Author SHA1 Message Date
Hung-ying Tyan
73e0442fec Add a GSI overlay for the framework package
This overlay is used to override the default value of the config_multiuserMaximumUsers resource in the framework package. This is necessary because the default value of this resource is 1, which is too low for CTS (like ProxyMediaRouter2HostSideTest) to add test users.

Bug: 347122747
Change-Id: I351a96c49b698570f67742b176274124c41018c9
Test: TH
2024-06-20 04:55:43 +00:00
Kiyoung Kim
69f5dbb0d0 Remove all VNDK deprecation flags
VNDK is fully deprecated, so flags to deprecate VNDK is no longer
needed. This change removes all flags deprecates VNDK.

Bug: 330100430
Test: AOSP CF build succeeded
Change-Id: Ifc918a875d7d5bed232165873ee9b0c562841594
2024-05-31 09:52:18 +09:00
Gaurav Sarode
b25c2dfc61 Fix Automotive GSI RRO configuration
Skipping config based RRO for automotive GSI builds

bug: 323238313
Test: local build
Change-Id: Ie2b6c5e10633cbd2c60b98738ee0676a49a7d21e
2024-05-23 22:49:49 +00:00
Inseob Kim
7c30e914e0 Revert "Disable build-time debugfs restrictions on GSI builds"
This reverts commit 2a2a97afba.

Reason for revert: use compat cil instead

Bug: 330671086
Test: build
Change-Id: I3f34156e228a3a52d4e05882dbb3c62320bb61a6
2024-04-15 15:32:35 +09:00
Xin Li
e693b5037e Merge Android 24Q1 Release (ab/11220357)
Bug: 319669529
Merged-In: I21eb7d5dc8cef9c1dd797ba1ab2ee830a8a5a42b
Change-Id: I42210485ad8f07e19408bef0e5a2af23f6a0e596
2024-01-30 10:33:42 -08:00
Jiakai Zhang
94c6d7a401 Force PRODUCT_ENABLE_UFFD_GC to true on GSI.
If the kernel version isn't available to the build system and
PRODUCT_ENABLE_UFFD_GC isn't explicitly set, there will be a build
warning. To address the warning and make the behavior more explicit on
GSI builds, we need this change.

Bug: 321751629
Test: lunch aosp_x86_64-trunk_staging-userdebug && m dist
Change-Id: I5b73890235827929ea3bce5a07260d6c67a00a27
2024-01-25 14:37:30 +00:00
Hongguang Chen
e068028fe7 Disable Window Extensions on TV
Window Extensions is not supported on TV. Adding it to TV GSI causes
some CTS failure.

Bug: 321898211
Test: make TV GSI, check artifacts
Test: atest CtsWindowManagerJetpackTestCases on TV GSI
Change-Id: Ice6602c7b06c2e09e557423426abaa94da55c836
2024-01-24 23:25:46 +00:00
Treehugger Robot
cdbf7a19ae Merge "Don't build VNDK on GSI" into main am: 1f9ba9c4ec am: 0049761888 am: fa2e92ad5f
Original change: https://android-review.googlesource.com/c/platform/build/+/2825192

Change-Id: Ib2e7572d27f5c3227d039e50980b867e554bc47a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 10:28:25 +00:00
Hung-ying Tyan
d116600dc1 Don't build VNDK on GSI
Bug: 308878144
Test: manual mix on T Pixel 6

Change-Id: I924d9a52f542450bdfc727d65e668e56bb89bc50
2023-11-10 08:01:59 +00:00
Hung-ying Tyan
04531b5c79 GSI: add VNDK 34/remove VNDK 29
Bug: 291204040
Test: boot GSI on U Pixel
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d4639705bdf86c8b8c1607719eab4f5791e236fe)
Merged-In: I04c50ca03a6ebd9b371a35f66faf5ea7861c6ca5
Change-Id: I04c50ca03a6ebd9b371a35f66faf5ea7861c6ca5
2023-11-10 08:00:56 +00:00
Treehugger Robot
a0db5763a1 Merge "Convert gsi_skip_mount.cfg to soong" into main am: 551570a073 am: b93e3b021e am: 11b0e7a152 am: 3292fc24df am: e3c42a48ee
Original change: https://android-review.googlesource.com/c/platform/build/+/2768739

Change-Id: I0ec15b206fbe1417ba4968e30ee0342c7cb70b90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03 05:53:57 +00:00
Cole Faust
36e089a6cc Convert gsi_skip_mount.cfg to soong
The LOCAL_POST_INSTALL_CMD is problematic for m installclean-less
builds.

Bug: 205632228
Test: presubmits
Change-Id: Id4eb2fd5fbd4f080aec89fa90583ac2ec97c5e1c
2023-10-02 17:28:59 -07:00
Cole Faust
8a2e3c9b91 Remove vndk-29 symlinks from allowlist
ag/24061450 removed version 29 from PRODUCT_EXTRA_VNDK_VERSIONS on
internal only, meaning these symlinks aren't generated anymore.

Ignore-AOSP-First: To match ag/24061450

Fixes: 296972684
Test: lunch gsi_tv_arm-userdebug, m nothing
Change-Id: If9dfb9cafb6cf1a65df1af5b444c9b0b9c61bfe7
2023-08-24 12:07:37 -07:00
Treehugger Robot
112b3225cf Merge "Ignore vndk compat symlinks in artifact path requirements" into main am: 99dc0cc49e am: 5403b178a8 am: 8676bb08af am: 7beaebe190 am: d312aaf9c5
Original change: https://android-review.googlesource.com/c/platform/build/+/2721721

Change-Id: I2c24ac3c6b084beb6fa0516cc98087d2c9d4bde1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23 08:28:07 +00:00
Cole Faust
075d9622ff Ignore vndk compat symlinks in artifact path requirements
A change is being made to properly track apex compat symlinks in
the installation logic, which causes the artifact path requirements
to start complaining about them. Exclude them from the artifact path
requirements.

Bug: 205632228
Test: m nothing
Change-Id: Ie975b7450574d41bb13bb2179edc31ba4edd413e
2023-08-22 11:58:17 -07:00
Chun-Yi Lee
935673291d Merge "Revert "Ignore vndk compat symlinks in artifact path requirements"" into main am: 6f09d105ef am: b704f738af am: 6d0f94b1f0 am: 43c81c6fda am: 6f883e4d11
Original change: https://android-review.googlesource.com/c/platform/build/+/2720714

Change-Id: I4f11c2b75871a582041adc5f9704394127036534
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22 05:21:18 +00:00
Chun-Yi Lee
ed72d33a9a Revert "Ignore vndk compat symlinks in artifact path requirements"
Revert submission 2718295-colefaust_track_apex_compat_symlinks

Reason for revert: To validate if this change is causing the build breakage.

Reverted changes: /q/submissionid:2718295-colefaust_track_apex_compat_symlinks

Change-Id: I781cd6869daaf5931c5fabb5ca109502b1b52b3e
2023-08-22 01:18:51 +00:00
Cole Faust
ecc016c8a7 Merge "Ignore vndk compat symlinks in artifact path requirements" into main am: 303e0450a6 am: 1b107d4b5f am: b023d21043 am: cf483e91fb am: b038d13fba
Original change: https://android-review.googlesource.com/c/platform/build/+/2719916

Change-Id: I64bbb91e111575195505a2694cd088c2e5675e5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-22 00:36:03 +00:00
Cole Faust
f7554e3735 Ignore vndk compat symlinks in artifact path requirements
A change is being made to properly track apex compat symlinks in
the installation logic, which causes the artifact path requirements
to start complaining about them. Exclude them from the artifact path
requirements.

Bug: 205632228
Test: m nothing
Change-Id: I46150c3b7a4eaac16c2daa80fec2a5640e32b61b
2023-08-21 11:47:39 -07:00
Hung-ying Tyan
d4639705bd GSI: add VNDK 34/remove VNDK 29
Ignore-AOSP-First: Android U hasn't been published to AOSP yet

Bug: 291204040
Test: boot GSI on U Pixel

Change-Id: I04c50ca03a6ebd9b371a35f66faf5ea7861c6ca5
2023-07-14 09:06:39 +00:00
Louis Chang
886ad7a862 Adds Window Extensions to GSI
... in order to have window extension library included
especially on large screen devices.

Bug: 288624195
Test: atest SdkAvailabilityTest
Ignore-AOSP-First: Future release
Change-Id: I8d347917f002cefb4f297930370ac7ae847f4731
2023-07-03 13:29:20 +08:00
Chris Li
ee1aca4381 Merge "Adds Window Extensions to GSI" into udc-dev am: 3eda5ebeb3 am: 6b8ad362b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23560276

Change-Id: I8855ddbd641ff8ef3592f4d53191a4e1133474bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-01 04:05:21 +00:00
Louis Chang
fb617dd880 Adds Window Extensions to GSI
... in order to have window extension library included
especially on large screen devices.

Bug: 288624195
Test: atest SdkAvailabilityTest
Ignore-AOSP-First: Future release
Change-Id: I8d347917f002cefb4f297930370ac7ae847f4731
2023-06-27 09:47:35 +00:00
Jooyung Han
8cc42f429f Remove PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES
We will deprecate flattened apexes. In this change, GSI-specific make
variable (PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES) is removed. The
variable was used to install both image/flattened apexes in the GSI, so
that it works on ro.apex.updatable devices and not-updatable devices.

Now, GSI will have only image APEXes in it.

Bug: 278826656
Test: lunch gsi_arm64-userdebug && m # no flattened apexes
Change-Id: I4702973d4ee75aa693e4e7f4e57577b77059dc09
2023-06-20 14:27:10 +09:00
Pranav Gupta
33376577bf Remove MODULE_BUILD_FROM_SOURCE for gsi_release.mk
The gsi_release.mk should be agnostic of AOSP or Android. In case of
Android builds, modules should be prebuilt, however in the case of AOSP
they can be built from source. This option should now be configured at
the product makefile level

Also update the shipping API to 34

Bug: 278607630

Test: TARGET_PRODUCT=gsi_arm64 TARGET_BUILD_VARIANT=userdebug build/soong/soong_ui.bash --dumpvar-mode MODULE_BUILD_FROM_SOURCE
returns true
TARGET_PRODUCT=gsi_arm64 TARGET_BUILD_VARIANT=userdebug MODULE_BUILD_FROM_SOURCE=false build/soong/soong_ui.bash --dumpvar-mode MODULE_BUILD_FROM_SOURCE
returns false
(cherry picked from https://android-review.googlesource.com/q/commit:105610bdf04b12404026e3b52f272688099eda93)
Merged-In: I5937764d8df307ed7547363e6ba2742828779282
Change-Id: I5937764d8df307ed7547363e6ba2742828779282
2023-04-25 00:16:16 +00:00
Pranav Gupta
105610bdf0 Remove MODULE_BUILD_FROM_SOURCE for gsi_release.mk
The gsi_release.mk should be agnostic of AOSP or Android. In case of
Android builds, modules should be prebuilt, however in the case of AOSP
they can be built from source. This option should now be configured at
the product makefile level

Also update the shipping API to 34

Bug: 278607630

Test: TARGET_PRODUCT=gsi_arm64 TARGET_BUILD_VARIANT=userdebug build/soong/soong_ui.bash --dumpvar-mode MODULE_BUILD_FROM_SOURCE
returns true
TARGET_PRODUCT=gsi_arm64 TARGET_BUILD_VARIANT=userdebug MODULE_BUILD_FROM_SOURCE=false build/soong/soong_ui.bash --dumpvar-mode MODULE_BUILD_FROM_SOURCE
returns false

Change-Id: I5937764d8df307ed7547363e6ba2742828779282
2023-04-20 19:23:35 +00:00
SzuWei Lin
1c31b049c9 Support system_dlkm in GSI
From Android 13, all devices must include a system_dlkm partition.
The patch enables system_dlkm on all GSI targets to support the devices
with system_dlkm partition, and be compatible with old devices
without a system_dlkm partition.

With patch, there is no /system/system_dlkm, and add a symlink
/system/lib/modules -> /system_dlkm/lib/modules

Bug: 256984997
Test: make gsi_arm64-user and aosp_arm64-user; check system folder
Change-Id: I2453ec43d584423cc4d5f0e23405f0ae9b6c5c90
2022-11-07 18:13:31 +08:00
Dennis Song
fe1b534f41 Add the path of GSI document in gsi_release.mk
Documents for GSI specific packages can be found at
device/generic/common/README.md.

Bug: 254392480
Test: Presubmit
Change-Id: I03e9d66462f39c0631dfcbe16902e5978e41c8b6
2022-10-24 11:28:38 +08:00
Dennis Song
a0f242ae87 Add GSI overlay for SystemUI
Use runtime resource overlay to override SystemUI resources
in case some legacy devices might have invalid settings,
and the invalid settings might cause unexpected SystemUI
errors when installing GSI on different devices.

Bug: 245806899
Test: Build and install GSI on Pixel
Change-Id: I704ba8f1a4a1d058e5e992d3ca18bdb4bda6610d
2022-10-17 16:42:16 +08:00
Hung-ying Tyan
bdce249c63 GSI: add VNDK 33/remove VNDK 28
Bug: 243530456
Test: mix GSI on Android 13 Cuttlefish
Change-Id: I7af784ac6fda2015fa7e9da8cf552755fd74d2e7
2022-08-25 08:11:42 +08:00
Yi-yo Chiang
1d7c7f674e Roll-forward the VNDK snapshot list of GSI to 32
Bug: 216414337
Test: Presubmit
Merged-In: Ic6cec82357cec8f4ad7bee62a4eaf2f7685b730f
Change-Id: I76026d6f518c51966bc652eeb617b61967af77a7
2022-03-18 04:50:48 +00:00
Yi-Yo Chiang
8d96c7303c Bump GSI PRODUCT_SHIPPING_API_LEVEL to 31
Bug: 209563751
Fixes: 209563751
Test: Presubmit
Change-Id: Ifcfe39c14a9459d75a5f8656820e1b20031ef3be
2021-12-09 06:00:07 +00:00
Yi-Yo Chiang
392a0db18d Roll-forward the VNDK snapshot list of GSI
The latest stable SDK version is 31, so add 31 to the list of VNDK
snapshots.

Bug: 196806844
Test: Presubmit
Change-Id: Ia9aab527d9c1fe1d1eb6c72ebc184a3fccad6a22
Merged-In: Ia9aab527d9c1fe1d1eb6c72ebc184a3fccad6a22
(cherry picked from commit 33fc244de5)
2021-12-08 18:12:47 +08:00
Yi-Yo Chiang
ffb366ee99 Revert "Renames boot-debug-*.img in GSI targets"
This reverts commit a2a5db4466.

Reason for revert: original change was obsoleted by
  I3161e42b00a93177a1a4cb3b22da2218d294b7a7

Bug: 202129499
Test: Presubmit; change should be noop
Change-Id: Ib7be1ed73dbf08758276666f8ce35ed9cbf18a36
2021-10-18 06:33:51 +00:00
Yi-Yo Chiang
92f08702dd Stop building boot-(debug|with-debug-ramdisk)-*.img for GSI/GKI
We don't need these anymore as we now export userdebug_plat_sepolicy.cil
to artifacts dist dir directly, so repack_bootimg don't need to use
boot-(debug|with-debug-ramdisk)-*.img as repack source anymore.

Bug: 202129499
Test: Check presubmit artifacts don't have boot-*debug*.img
Change-Id: I3161e42b00a93177a1a4cb3b22da2218d294b7a7
2021-10-15 19:26:39 +00:00
Howard Chen
95339b0d91 Make GSI target to export bootimage to DIST
This is to support a bootimage only target in AB.

Bug: 198363484
Test: lunch aosp_arm64-userdebug; make bootimage dist

Change-Id: I9a32c365f635ec4693675a1969d7a1e684c8f55a
2021-09-30 07:10:05 +00:00
Bowgo Tsai
a2a5db4466 Renames boot-debug-*.img in GSI targets
Those boot-debug-*.img is used with `repack_bootimg` for a
vendor_boot-debug.img in VTS setup. It is not for GKI boot.img
release.

  https://source.android.com/compatibility/vts/vts-on-gsi#repacking

Renames boot-debug-*.img to boot-with-debug-ramdisk-*.img to
avoid confusion with the official GKI boot.img release.

Bug: 200878300
Test: `lunch gsi_arm64-user` then `make bootimage_debug`
Change-Id: Ia1f6ba847d5b7409fb7a8534432484d2aa972494
2021-09-23 22:19:52 +08:00
Howard Chen
994e4a54f4 Disable the delete_all_keys feature for GSI
Bug: 197914756
Test: run GSI with DSU on a Pixel device

Change-Id: I78ee95f99764bee71bf3bcccb992ee35fa80603b
2021-09-08 13:18:10 +08:00
SzuWei Lin
8c63356702 Always build modules in GSI from source
GSI includes both flattened and unflattened apex at the same time.
However, a flattend apex is not built if the module is built from
prebuilt binary. So, we enable 'MODULE_BUILD_FROM_SOURCE := true'
to force GSI built all modules from source.

Bug: 194917545
Test: build gsi_gms_arm64-user
Test: check com.google.android.art exists in /system/system_ext/apex/
Change-Id: I89eef3e8d06ec1f9d3245513c2dbbff0777e2c62
2021-08-05 08:51:54 +00:00
Hridya Valsaraju
2a2a97afba Disable build-time debugfs restrictions on GSI builds
These restrictions enable macros that disable sepolicy access to debugfs
for unauthorized clients on S-launching devices. However, since the
Android S GSI build must also be fully functional on earlier devices
that could have possibly depended on debugfs, disable the build-time
restrictions on GSI builds.

Bug: 184381659
Test: make
Change-Id: I583693df5c30d9bab28f76a6c1e4e9db8e5fd89f
2021-06-14 14:32:44 -07:00
Hridya Valsaraju
329d896e52 Do not enforce debugfs restrictions on GSI builds
Devices that launched before Android S must still be able to access
debugfs.

Bug: 188022148
Test: build boot
Change-Id: I18ecec3f7daf5a1085de40606640ead63457c4b2
2021-05-13 17:28:27 -07:00
Hridya Valsaraju
b566a9e2e4 Enforce debugfs restrictions on GSI builds too.
Debugfs build-time/run-time restrictions must be enabled on GSI builds
as well.

Test: Build, boot
Bug: 184381659
Change-Id: I940b0a2f6e22086dd479004a68bf6ad1cfe9eb13
2021-04-26 22:19:27 -07:00
Yo Chiang
dd74264737 Merge "Revert^2 "Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk""" 2021-04-13 07:22:25 +00:00
Yo Chiang
d8db785ed0 Revert^2 "Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk""
This reverts commit 1178673d5e.

Reason for revert: reland after aosp/1663197 is submitted

Change-Id: I3e03e62af38f329e24c057748d1e90a09a38a3b8
2021-04-03 14:56:51 +00:00
Yo Chiang
075a6d3327 Revert^2 "Nextgen release: Don't build super_empty.img"
This reverts commit 63c65c776d.

Reason for revert: Original bug was resolved by updating branch config

Change-Id: I1136570f9bd01d050beb55705cc90040dd396ecc
2021-03-25 10:12:58 +00:00
Tianjie Xu
63c65c776d Revert "Nextgen release: Don't build super_empty.img"
Revert submission 1644988-nextgen-release-img-zip-cleanup

Reason for revert: b/183654818
Reverted Changes:
I2474e5fd6:Nextgen release: Don't build super_empty.img
I549439528:Add option to allow product makefiles to skip buil...

Change-Id: I91fb23542f7f70b0c1d6d3dabf97c0844956cfb0
2021-03-25 05:00:12 +00:00
Yi-Yo Chiang
16973880c6 Nextgen release: Don't build super_empty.img
Bug: 183068624
Test: "m dist" on GSI and check the build artifacts under OUT and DIST
      directories, and check the contents of *-img-*.zip
Change-Id: I2474e5fd69534a5890eecd0c81e10a583e4423be
2021-03-24 05:35:37 +00:00
Yi-Yo Chiang
a88d2da587 Nextgen release: Don't build images that GSI don't need
These images are never used by GSI. Building them is a waste of resource
and a potential source of confusion, for they are packaged into the
*-img-*.zip of GSI. Skip building them.

Bug: 183068624
Test: "m dist" on GSI and check the build artifacts under OUT and DIST
  directories, and check the contents of *-img-*.zip
Change-Id: Ic14cfdd10ed26d975b369ce128e4b284378219ef
2021-03-22 05:41:23 +00:00
Yo Chiang
25d0acf00f Merge "Revert "Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk"" 2021-02-13 06:09:36 +00:00
Yo Chiang
1178673d5e Revert "Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk"
This reverts commit ecaa592310.

Reason for revert: b/177495407#comment9 breaks aosp_arm

Exempt-From-Owner-Approval: Clean revert

Change-Id: If4586901fc1806c5394a385c8686ef5fd8748f24
2021-02-13 06:08:54 +00:00