From 8a5a00e0c3ef22ca6954c72b65a9773d44a623a2 Mon Sep 17 00:00:00 2001
From: Jiakai Zhang <jiakaiz@google.com>
Date: Fri, 20 May 2022 14:04:06 +0000
Subject: [PATCH] Preopt SystemUI for AOSP builds.

Bug: 232860596
Change-Id: Id00362b2dfaa7e0e4ba868988c19d215b26216ba
Test: See no dex2oat invocation on the first boot.
---
 device.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/device.mk b/device.mk
index 58e9e151..1cc0d032 100644
--- a/device.mk
+++ b/device.mk
@@ -1113,8 +1113,8 @@ PRODUCT_PACKAGES_DEBUG += BatteryStatsViewer
 DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE := device/google/gs201/device_framework_matrix_product.xml
 
 # Preopt SystemUI
-PRODUCT_DEXPREOPT_SPEED_APPS += \
-    SystemUIGoogle
+PRODUCT_DEXPREOPT_SPEED_APPS += SystemUIGoogle  # For internal
+PRODUCT_DEXPREOPT_SPEED_APPS += SystemUI  # For AOSP
 
 # Compile SystemUI on device with `speed`.
 PRODUCT_PROPERTY_OVERRIDES += \