From 5c0cb06ff7e2443dc6faae73f1e6df4c9bbe93fd Mon Sep 17 00:00:00 2001
From: Jiakai Zhang <jiakaiz@google.com>
Date: Fri, 20 May 2022 14:58:28 +0100
Subject: [PATCH] Preopt SystemUI for AOSP builds.

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

diff --git a/device.mk b/device.mk
index 38fa3d96..3a85217e 100644
--- a/device.mk
+++ b/device.mk
@@ -1178,8 +1178,8 @@ PRODUCT_PACKAGES_DEBUG += BatteryStatsViewer
 DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE := device/google/gs101/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 += \