Commit Graph

72 Commits

Author SHA1 Message Date
Christopher Ferris
9bb722f0a2 Merge "Switch to IGNORE_PREFER32_ON_DEVICE." am: 9c2cdd2219 am: 566efdc77c
Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2303576

Change-Id: Iccbffa5eefffbec4eacc995140fc2753760446e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 23:02:47 +00:00
Christopher Ferris
566efdc77c Merge "Switch to IGNORE_PREFER32_ON_DEVICE." am: 9c2cdd2219
Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2303576

Change-Id: Ie362b2c64fd8fe8fc27aac9e0e547357392b3339
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 21:45:46 +00:00
Christopher Ferris
7a257f0090 Switch to IGNORE_PREFER32_ON_DEVICE.
In aosp, the name of the variable changed from
FORCE_MULTILIB_FIRST_ON_DEVICE to IGNORE_PREFER32_ON_DEVICE.

So actually modify this so the new devices don't have 32 bit
servers.

Test: Verified that drmserver/mediaserver are 64 bit processes.
Change-Id: I282f5129bcc91d99e924f514b01fc4e7e37e9ea9
2022-11-15 18:49:05 -08:00
Robin Peng
8c13e590cc gs201: remove prebuilt boot-user.img usage am: 0272b56e05
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/20381688

Change-Id: I874f93ffeab6e0f22cb562ecf03ccae6842bee19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 06:47:13 +00:00
Robin Peng
0272b56e05 gs201: remove prebuilt boot-user.img usage
When $(TARGET_KERNEL_DIR) contains:
* boot.img

then use those as prebuilt boot images for the target build.

Bug: 242812258
Change-Id: I10ccfaacfc77cc37eee085b27575fae515ceb088
2022-11-04 06:49:05 +00:00
Daniel Mentz
f1985e9641 Import prebuilt kernel modules like fips140.ko am: 3b533e5227
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/19386114

Change-Id: I55fa8fc698b7f460c19e7a7103740122522b3702
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-31 20:26:11 +00:00
Daniel Mentz
3b533e5227 Import prebuilt kernel modules like fips140.ko
Add support for copying prebuilt kernel modules like fips140.ko into the
vendor kernel ramdisk. These kernel modules are different in the following
ways:

- They do not appear in vendor_kernel_boot.modules.load provided by the
  kernel build system.
- We want to put their names at the very beginning of the output
  modules.load file to ensure that they are loaded prior to all other
  modules.

We define a new Makefile variable named
BOARD_PREBUILT_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES. For every filename
on this list, we verify that the file exists in $(KERNEL_MODULE_DIR),
and if it does, we include its name in the modules.load for the vendor
kernel boot ramdisk.

Bug: 194712883
Change-Id: I91a1d834b32717d32621d0a67da9052324cab20c
2022-10-31 19:30:13 +00:00
Taehwan Kim
0366079060 BoardConfig.mk: add BOARD_SUPPORT_MFC_ENC_BT2020 am: edfbe0ff75
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/20195100

Change-Id: Ia0a7aa8b0bb7f98acb00915ce352c722b5e31a12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-31 13:22:47 +00:00
Taehwan Kim
edfbe0ff75 BoardConfig.mk: add BOARD_SUPPORT_MFC_ENC_BT2020
Bug: 239912381
Test: atest android.mediav2.cts.EncoderColorAspectsTest
Change-Id: I68be5ef52d60d65886cf9e1dae5069e7daa60775
Signed-off-by: Taehwan Kim <t_h.kim@samsung.com>
2022-10-31 12:17:47 +00:00
Yi-Yo Chiang
ef642a7fd3 Remove references to BOARD_BUILD_SYSTEM_ROOT_IMAGE am: 71263e27a9
Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2261404

Change-Id: I9023519ce28abee805c6d956b9e6568157d37f54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 13:44:01 +00:00
Yi-Yo Chiang
71263e27a9 Remove references to BOARD_BUILD_SYSTEM_ROOT_IMAGE
This variable is always false or empty now.
Remove it so we can mark it as deprecated later.

Bug: 241346584
Test: Presubmit
Change-Id: I110a1e1c07a1debd2c1ce75c70261e62eac8ec5c
Merged-In: I110a1e1c07a1debd2c1ce75c70261e62eac8ec5c
(cherry picked from commit f9b02ea439)
2022-10-19 19:05:30 +08:00
Yi-Yo Chiang
a8038a8171 Remove references to BOARD_BUILD_SYSTEM_ROOT_IMAGE
This variable is always false or empty now.
Remove it so we can mark it as deprecated later.

Bug: 241346584
Test: Presubmit
Change-Id: I110a1e1c07a1debd2c1ce75c70261e62eac8ec5c
Merged-In: I110a1e1c07a1debd2c1ce75c70261e62eac8ec5c
(cherry picked from commit f9b02ea439)
2022-10-14 07:30:57 +00:00
Jeffrey Carlyle
24c9524b72 dck: pick up recovery mode library for digital car key wiping
This is done by conditionally including the makefile under vendor so
that AOSP builds where vendor is not present do not faile.

(cherry picked from commit a3a42642f3)

Bug: 203234558
Test: data wipe in Android recovery mode on raven
Test: data wipe in Android recovery mode on c10
Test: data wipe in user mode fastbootd mode on raven
Test: data wipe in user mode fastbootd mode on c10
Signed-off-by: Jeffrey Carlyle <jcarlyle@google.com>
Change-Id: I0ef9dd1ea9eae90ed4feabd19bf9edc7434a572b
2022-09-08 21:58:52 +00:00
Jeffrey Carlyle
63e9c666f2 Revert "dck: pick up recovery mode library for digital car key w..."
Revert "move digital car key wiping to gs-common"

Revert "clear secure element of Digital Car Keys during factory ..."

Revert "dck: switch to gs--common implementation of digital car ..."

Revert submission 19734547-b203234558-qpr1

Reason for revert: see b/243864778
Reverted Changes:
I53967a5e8:dck: pick up recovery mode library for digital car...
I8fd944c60:dck: switch to gs--common implementation of digita...
I6e8c80818:move digital car key wiping to gs-common
I60052ca58:Support calling WipeKeys with out a ui object
I459d81800:clear secure element of Digital Car Keys during fa...

Change-Id: Ic3f42d0d2c6c78be47cacf9794e7727e6ee5475f
2022-08-26 06:36:57 +00:00
Jeffrey Carlyle
a3a42642f3 dck: pick up recovery mode library for digital car key wiping
This is done by pick optionally including a Makefile so that aosp builds
in which the library is not present will pass.

Bug: 203234558
Test: adb reboot recovery; wipe data via menu; verify keys removed
Signed-off-by: Jeffrey Carlyle <jcarlyle@google.com>
Change-Id: I53967a5e8ea0327d6467623929902b90eb2c85da
2022-08-24 12:25:12 -07:00
Jaegeuk Kim
83e0b84caf Use EXT4 for /persist
Bug: 239632964
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: Idf41e3b71fec50029b77951550def1b8c750a42d
2022-08-01 18:00:49 +00:00
Christopher Ferris
f60ad6f3dd Force build everything as 64 bit.
When building the 64 bit and the 32 bit executables, there
are a few targets that are prefer32. Using this option forces
those executables to be built as 64 bit.

Bug: 229787331

Test: With this option, drmserver/mediaserver are built as 64 bit.
Test: Without this option, drmserver/mediaserver are built as 32 bit.
Change-Id: Ie76ffe17f14b5157983796a616436bfa12987136
2022-07-15 20:06:52 +00:00
Christopher Ferris
377294ed9d Enable 32 bit building, but only 64 bit zygote.
Bug: 229787331
Test: Build/Boot in progress.
Change-Id: I4686b567fd96a6cd7c3f6e269f0424811c0b3d6a
2022-07-13 12:20:58 -07:00
Lucas Wei
9dc497283c Rename first stage module list to vendor_kernel_boot.modules.load
Bug: 234554094
Signed-off-by: Lucas Wei <lucaswei@google.com>
Merged-In: Ie46ff0ef2db81169f519bc0266b8298a79712870
Change-Id: Ie46ff0ef2db81169f519bc0266b8298a79712870
2022-06-15 10:11:53 +08:00
Lucas Wei
03495e41e2 Enable vendor_kernel_boot partition for gs201
- Disable dlkm ramdisk fragment from vendor_boot
 - Enable vendor_kernel_boot and OTA support
 - Set partition size to 64MB

Bug: 214409109
Change-Id: I4a6ee0b2f1c44a4d257cc51cf408f6f7cf295471
Signed-off-by: Lucas Wei <lucaswei@google.com>
2022-05-26 13:51:34 +00:00
Jaegeuk Kim
453105b5cc Revert "use erofs for RO partitions" am: 0c024a7f2b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18494501

Change-Id: If2a1d4fde080cd0c838494812933196e1114abf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 22:31:03 +00:00
Jaegeuk Kim
0c024a7f2b Revert "use erofs for RO partitions"
This reverts commit 554e90c439.

It turned out EROFS has app-launch time regression.

FS			Total image	App-launch	OTA size (MB)
			    size (MB)	    Time (AVG)
ext4			4040 (0%)	403.77		2252
erofs (compression)	2754 (-32%)	540.98 (+34%)	2528 (+12%)
erofs (no-compression)	4126 (+2%)	476.23 (+18%)	2277 (+1%)

Bug: 231934752
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: I33f68a426ff655a9282fec66c0fa54215954aa45
Merged-In: I33f68a426ff655a9282fec66c0fa54215954aa45
2022-05-23 21:00:19 +00:00
Martin Liu
14e8f21c6a Disable zone dma32
As HW doesn't have 32 bit address limitation, we can disable
zone dma32 to simplify memory management and improve performance.

Bug: 224535283
Test: boot, test basic wifi, faceauth, camera, UDFP features
Signed-off-by: Martin Liu <liumartin@google.com>
Change-Id: Ia7c1098ddd4b91738702dd99552661dbe18cfaa5
2022-05-23 07:31:39 +00:00
Yichi Chen
09fd09985b Revert "Revert "[Gralloc] Remove the conditional configs for Gralloc"" am: 6155b7811a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18329096

Change-Id: I32622d69436bce7ea3bff03180b87d885799eece
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 23:31:20 +00:00
Yichi Chen
6155b7811a Revert "Revert "[Gralloc] Remove the conditional configs for Gralloc""
This reverts commit 184562c0f8.

Reason for revert: The cache coherency shouldn't be reverted. This will cause the function break.

Change-Id: I9a62e507911a3eaed704f029546e81770ef3d199
2022-05-12 22:23:35 +00:00
Jay Wang
3257de1670 Revert "[Gralloc] Remove the conditional configs for Gralloc" am: 184562c0f8
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18310586

Change-Id: I03a0b0c52448be3874c4e6d28451073e74a252f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 07:05:13 +00:00
Jay Wang
184562c0f8 Revert "[Gralloc] Remove the conditional configs for Gralloc"
This reverts commit 15dd6c2272.

Reason for revert: Caused the power regression b/231537621

Change-Id: Ie8d74127a16cf0a938201cf5e1cb7a76fa9ade0e
2022-05-11 15:56:07 +00:00
Yichi Chen
d9ed4ff223 [Gralloc] Remove the conditional configs for Gralloc am: 15dd6c2272
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17987925

Change-Id: I046735b7c5018cebcb01a870e708eaef828f9fa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 19:15:36 +00:00
Yichi Chen
15dd6c2272 [Gralloc] Remove the conditional configs for Gralloc
Since GRALLOC_VERSION control has been totally removed, the
corresponding conditional configs should be removed to avoid wrong
configurations.

Bug: 224911573
Test: gralloc sync function can work to avoid noise in tiktok
Change-Id: I7d48f0271a251dfef2abc13dea59b92c541a497e
2022-05-02 18:45:16 +00:00
Vincent Palomares
e6c32d5165 Add p10c10 perf setup script
Bug: 204892459
Test: none
Change-Id: Ic5e21f982ad8da2fe83279eaba7b8b31d3f8ff5a
Signed-off-by: Vincent Palomares <paillon@google.com>
2022-04-30 00:20:33 +00:00
Chung-Kai (Michael) Mei
7260497897 Revert "Enable load kernel modules in parallel"
Revert "fix path for i2c peripheral device"

Revert submission 17338969-gs201_parallel_load_enable

Reason for revert: b/229241620 RamdumpTest failed
Reverted Changes:
Ib0b4f19f4:Enable load kernel modules in parallel

Change-Id: I1dfea73fc9cd1549721201916fbf6e1184d56e56
2022-04-20 02:57:08 +00:00
chungkai
7bb2178bc3 Enable load kernel modules in parallel
Test: boot successfully
Bug: 223463247
Signed-off-by: chungkai <chungkai@google.com>
Change-Id: Ib0b4f19f46a029113bd71371e50c318218b517fd
2022-04-08 02:20:40 +00:00
Kyle Lin
2db72b9aee BoardConfig: Target arm v8.2a and A55
This will let bionic use 8.2a atomics which helps scudo locking.

Bug: 224756824
Test: build , boot and check by getprop

Change-Id: Ie5f55071af5b8aff293224665ca68942f3e86625
2022-04-05 18:00:59 +00:00
Martin Liu
3bcb448aea Keep minimium amount of swiotlb
Keep 2MB swiotlb for devices that not support 36bit access.

Bug: 226578178
Test: boot
Signed-off-by: Martin Liu <liumartin@google.com>
Change-Id: I88deb288e326880b0328c06f5d1b32777cc1ccb9
2022-03-25 12:57:43 +00:00
Petri Gynther
19c92aa321 gs201: use prebuilt GKI boot.img for production builds
When $(TARGET_KERNEL_DIR) contains:
* boot.img
* boot-user.img

then use those as prebuilt boot images for the target build.

Note that debug kernels (e.g. $(TARGET_KERNEL_DIR)/kasan) only have
Image.lz4, so the debug build ends up building boot.img from source

Bug: 223663549
Change-Id: If9d2b1041108cec8fc0481e4b633502371d6f987
2022-03-24 16:53:48 +00:00
Martin Liu
b8b02bc357 set swiotlb as noforce
As dma devices are 36bit bounded, we don't need SWIOTLB
bounce buffers. Set swiotlb=noforce to disable this and
make the minimum amount of memory allocation.

Bug: 207573157
Test: check total memory and io_tlb_nslabs
Signed-off-by: Martin Liu <liumartin@google.com>
Change-Id: I21eac64f57505c14e12fed50980aad4d818b34cb
2022-03-23 17:08:18 +08:00
Martin Liu
1c697c5df3 Enable page pinner
Enable page pinner to catch long pin pages' history so
we can root cause issues.

Bug: 224771748
Test: check kernel cmdline
Signed-off-by: Martin Liu <liumartin@google.com>
Change-Id: I3b384d427ac0ba48841d9a13e8f5565d9a83fb72
2022-03-16 05:44:23 +00:00
Martin Liu
66fe1adedd sync RCU settings
sync RCU settings to improve overall RCU latency

Bug: 224756824
Test: check cmdline
Signed-off-by: Martin Liu <liumartin@google.com>
Change-Id: I1d320a308009111a0598bbda3f5c5da9e447e17e
2022-03-16 01:00:26 +00:00
Martin Liu
e00a9b2099 Disable memcg
Pixel kernel don't use MEMCG, let's disable it to
minimize the overhead.

Bug: 224521042
Test: check cmdline
Signed-off-by: Martin Liu <liumartin@google.com>
Change-Id: I60681fb04e4f9a41814eda5988b6c1a0d4fb127c
2022-03-15 01:05:11 +00:00
Ramji Jiyani
f53de92c92 Pixel T launch devices: Enable system_dlkm
Set flags to enable system_dlkm dynmaic partition
for GKI Modules for T launch pixel devices.

Partition will be empty as of now but this adds
enough support to pass the vts for feature.

Bug: 222334390
Test: TH, manual build, Code testing gs101 & R6
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
Change-Id: Ic56dd711ab97f3ae993cc5c543fabc8cbe3f347c
Merged-In: Ic56dd711ab97f3ae993cc5c543fabc8cbe3f347c
2022-03-04 01:42:47 +00:00
Devin Moore
2b15c10b02 Build init_boot for new devices
Builds a new init_boot.img with the ramdisk that was previously in
boot.img.
Removes the ramdisk from boot.img.
Change fstab to make sure the /dev/block/by-name/init_boot_* entries are
created in first stage init for Verified Boot.
Add init_boot.img to the list of OTA images so it is picked up for OTA
updates.

Test: unpack_bootimg --boot_img=boot.img
Test: unpack_bootimg --boot_img=init_boot.img
Test: Build and boot new device with required bootloader changes
Bug: 211823573

Merged-In: Idbd700b17d862f48ea568d1274a6550b965763ea
Change-Id: Idbd700b17d862f48ea568d1274a6550b965763ea
2022-02-24 23:32:46 +00:00
Michael Wright
55730686f5 Revert "Revert "Turn on SELinux""
This reverts commit 077aaa107b.

Reason for revert: SELinux issues are fixed

Change-Id: I90f32b8b633988ab6f79606ac8464cbb07a861dd
2022-02-23 02:41:40 +00:00
Aurimas Liutikas
077aaa107b Revert "Turn on SELinux"
This reverts commit 3923566e2c.

Reason for revert: causing com.android.pixellogger crashes

Bug: 220935985
Change-Id: If97dd3585651167762890b98c2446f3b5222f9d4
2022-02-23 02:39:55 +00:00
Adam Shih
3923566e2c Turn on SELinux
Bug: 214923175
Test: Boot to home, OTA, adb connection, wifi, phone call, SMS, Bluetooth,
LTE, camera, video, audio, GPS, lock screen, sensor, fingerprint,
bugreport, no crash loops

Change-Id: I23adacc6f3d68becd86d238046a0458baacd122d
2022-02-22 01:27:53 +00:00
Andrew Scull
661151aa2b Remove BOARD_PREBUILT_PVMFWIMAGE from the common board config
The pvmfw image is included by setting PRODUCT_BUILD_PVMFW_IMAGE in
device.mk and there shouldn't be this prebuilt override.

Bug: 199717422
Test: build
Change-Id: I0ba022e7b222ff89a4b2f991900abb3b4589396c
2022-02-01 13:21:37 +00:00
Krzysztof Kosiński
d185483165 Fix builds where LyricCameraHAL is not present.
This file contained incorrect commented-out conditionals that
were apparently copied and pasted from somewhere. Fix them to
match gs101 configuration.

Bug: 212047904
Test: build master-without-vendor
Change-Id: Ibecd05d6e5cf1ee94be57203b63c6aec3cab8aa6
2022-01-26 15:53:11 +00:00
Robin Peng
bf4d3bf612 Migrate vendor_dlkm modules.blocklist from android side to kernel side
Moving vendor_dlkm.modules.blocklist to the source repo and picking to
/<DEVICE>-kernel, the development experience can be aligned between
Kernel and Android codebase.

Bug: 214017561
Change-Id: Ia9994121309a8a0e5a664b64c51ffb3ad9110747
2022-01-21 11:56:22 +00:00
Cole Faust
6cb8985947 Remove usage of intermediates-dir-for
intermediates-dir-for relies on several variables that
haven't been set at the time the board configuration
runs. The board configuration got around that by using
deferred expansion, but deferred expansion is something
that starlark doesn't support. Remove intermediates-dir-for
and switch to TARGET_RECOVERY_FSTAB_GENRULE.

Bug: 201700692
Test: m RBC_BOARD_CONFIG=1 nothing on gs201 products
Change-Id: I74bf8700161f6519d29b2b3634a286c4e758d136
2022-01-12 22:15:00 +00:00
Pat Tjin
ab3f2562aa Remove 64-bit-only configs and default to 64-bit-only
Remove option for _64 and default to 64-bit only builds.
Removes the (out of date) manifest_64 files.
Removes OMX since it is not supported for 64-bits.

Bug: 213924541
Test: Build, Boot, YouTube playback, Play store, Camera
Signed-off-by: Pat Tjin <pattjin@google.com>
Change-Id: I1e97903b598a2fff46d912a009b2bc73f1b0f466
2022-01-12 21:44:31 +00:00
Sasha Smundak
9cbef8afd5 Use soong_config_ macros to set Soong config variables.
Bug: 198503843
Test: treehugger
Merged-In: Ifd1aed04267d952a13cfd9b93933e500ba07dbad
Change-Id: I4fa1d4f3e1c5a965696f78244bcf58360e0ce1c7
2021-12-29 18:31:41 +00:00