Commit graph

98 commits

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

Change-Id: I0f5140bc7e6a68ae645b91626fed7172ef9f5154
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 23:49:35 +00:00
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
34516c4568 gs201: remove prebuilt boot-user.img usage am: 0272b56e05 am: 8c13e590cc
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/20381688

Change-Id: I3a4b32ecd22e29656f7d5b2a14d96be10098354f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 07:20:45 +00: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
d4345c01dc Import prebuilt kernel modules like fips140.ko am: 3b533e5227 am: f1985e9641
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/19386114

Change-Id: If9e0a16e3a8bc868e8d90404a6abc74a3842a02e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-31 20:57:45 +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
d8d365d6ab BoardConfig.mk: add BOARD_SUPPORT_MFC_ENC_BT2020 am: edfbe0ff75 am: 0366079060
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/20195100

Change-Id: I2feff1f71f3e9fde2f3c60f017d288fbc27c02a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-31 13:55:18 +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
Sam Dubey
eeb9687761 Revert "Switch GLES system driver to ANGLE"
This reverts commit 2ece1b7eb1.

Reason for revert: Platinum/DM rotation revert for likely breaking tests and causing b/253694548

Change-Id: Ie1e5a31b2a094ebec9359906665586c6de6fc882
2022-10-17 05:14:47 +00:00
Ian Elliott
2ece1b7eb1 Switch GLES system driver to ANGLE
Test: make, flash, and run applications/tests
Test: atest CtsMediaCodecTestCases:android.media.codec.cts.DecodeEditEncodeTest -- --abi arm64-v8a
Bug: 218321565
Bug: 244093320
Bug: 253049434
Change-Id: I27e8bd9fcb02ebed489a30b470764177dc627f69
2022-10-14 20:12:07 +00: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
Yi-Yo Chiang
f9b02ea439 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
2022-10-12 02:58:55 +00:00
Maddy Yip
a8682a075d Revert "Switch GLES system driver to ANGLE"
This reverts commit f88c62292b.

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/tests/view?invocationId=I87000010097116811&testResultId=TR36928312446722415, bug 252826734 

Change-Id: Idd5865a2c3b1dbca22afcff9e15da3c43da2fb3d
2022-10-11 20:27:15 +00:00
Ian Elliott
f88c62292b Switch GLES system driver to ANGLE
Test: make, flash, and run applications/tests
Bug: 218321565
Bug: 244093320
Change-Id: I6e8d393e92e4b6b145db7a55a1e458218d6f8aab
2022-10-11 15:55:18 +00:00
Jeffrey Carlyle
f946e78db6 dck: pick up recovery mode library for digital car key wiping am: 24c9524b72 am: d580bf7a58
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/19756482

Change-Id: Ida052cd7350f39e4d22efb7ff652f2243d0e0378
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 23:06:50 +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
Ian Elliott
2325f3de87 Disable ANGLE as system GLES driver
This partially reverts the following change:

  Switch GLES system driver to ANGLE

Bug: 241757590
Test: com.google.android.GoogleCamera
Change-Id: I79fee4a16eedf87aea40fd75044e065e1811e117
2022-08-26 20:59:21 +00:00
Jeffrey Carlyle
36507d50a1 Revert "dck: pick up recovery mode library for digital car key w..." am: 63e9c666f2 am: 8a128bcef1
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/19751769

Change-Id: I9b9adb1b81ae0c4c24fd18d2558bd6893d5293a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 07:30:27 +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
cfa2a2a353 dck: pick up recovery mode library for digital car key wiping am: a3a42642f3 am: b5fc24ec3f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/19704818

Change-Id: If8884b5c89f7bde6e1da46124743e1102b3c357a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25 00:01:12 +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
91a677cbe5 Use EXT4 for /persist am: 83e0b84caf am: 74ff274895 am: ca77f375ad
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/19388119

Change-Id: Iddf4a78f5a4c33055016c90d226e28e150665856
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-01 18:57:23 +00: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
Chase Wu
11403b25c9 add haptics actuator model config
Actuator models can vary across devices. Actuator models can have
different characteristics that need to be handled appropriately. Add
support to define the actuator model used in Soong makefiles.

Bug: 236202962
Test: verified that different actuator model configs are used on
different targets
Signed-off-by: Chase Wu <chasewu@google.com>
Change-Id: I4b4c5e26c52f410ec36f9b8959e8fadd2ea19b0f
2022-08-01 12:16:16 +00:00
Christopher Ferris
30f484b7f0 Force build everything as 64 bit. am: f60ad6f3dd am: c803bbc4da am: 4d669c5f0f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/19294720

Change-Id: I8051b0de31adfc613aad5f54e897e1ba365acdb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15 21:17:48 +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
90692cb9e0 Enable 32 bit building, but only 64 bit zygote. am: 377294ed9d am: 93e0af1927 am: 6ab155af37
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/19281764

Change-Id: Ib233dfa4c65347034fcf75802c8570a168bd445c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 01:36:13 +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
907e801b6a Rename first stage module list to vendor_kernel_boot.modules.load am: b2d1f99d60 am: 41c4105145
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18869517

Change-Id: I63558eded93d5fe36f4c71a78aa217cfe89c547e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 15:13:34 +00:00
Lucas Wei
b2d1f99d60 Rename first stage module list to vendor_kernel_boot.modules.load
Bug: 234554094
Signed-off-by: Lucas Wei <lucaswei@google.com>
Change-Id: Ie46ff0ef2db81169f519bc0266b8298a79712870
2022-06-15 10:12:47 +08: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
Automerger Merge Worker
ba5e63c149 Merge "Enable vendor_kernel_boot partition for gs201 am: 03495e41e2 am: 34e719958a" into tm-qpr-dev-plus-aosp am: 76ab187545
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17817307

Change-Id: I653eda61f3248104b55ec513812e6ef46cb0d0d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 16:10:13 +00: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
8c2c364d58 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
2022-05-23 21:00:19 +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
d4a81067ff Disable zone dma32 am: 14e8f21c6a am: 8491b99af6 am: ce1f44dd4b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18368632

Change-Id: I6c002b4f06516d99ee636d06b2be67dc841040f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 08:23:53 +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
Lingfeng Yang
3e9ca2c727 Switch GLES system driver to ANGLE
Test: make and flash
Bug: 218321565
Change-Id: Ia40c708254fe111726626e5744d71f949e3323ac
2022-05-18 02:59:30 +00:00
Yichi Chen
809d526c14 Revert "Revert "[Gralloc] Remove the conditional configs for Gralloc"" am: 6155b7811a am: 6e5d588f64
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18329096

Change-Id: Ibe63012f44a59c6bcdbba92e29101509d33ac3ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 23:58:15 +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
03ac9d0c3c Revert "[Gralloc] Remove the conditional configs for Gralloc" am: 184562c0f8 am: 2a1bd2dfe2
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18310586

Change-Id: If1eb226310c440bd4cb0f894ab6bd6b1ceacebb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 07:31:36 +00:00