From 2a3110cd73300a14e537078fb895e318e2527073 Mon Sep 17 00:00:00 2001
From: Calin Juravle <calin@google.com>
Date: Tue, 18 May 2021 08:36:36 -0700
Subject: [PATCH] Add pm.dexopt.cmdline mapping in product config

Test: boot
Bug: 188655918
Merged-In: I527a71d0acec0ba6593b2da1fd13818cba3b4832
(cherry picked from commit ccb4cdc7f6c0b2037250f1ec488a4f86c54bd9e1)
Change-Id: Iaf4d76c44e7bd46f78fd507cd5d6af26d691a7f1
---
 target/product/runtime_libart.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk
index 4f14ddd404..d65f180d73 100644
--- a/target/product/runtime_libart.mk
+++ b/target/product/runtime_libart.mk
@@ -99,6 +99,9 @@ endif
 # The install filter is speed-profile in order to enable the use of
 # profiles from the dex metadata files. Note that if a profile is not provided
 # or if it is empty speed-profile is equivalent to (quicken + empty app image).
+# Note that `cmdline` is not strictly needed but it simplifies the management
+# of compilation reason in the platform (as we have a unified, single path,
+# without exceptions).
 PRODUCT_SYSTEM_PROPERTIES += \
     pm.dexopt.post-boot?=extract \
     pm.dexopt.install?=speed-profile \
@@ -110,6 +113,7 @@ PRODUCT_SYSTEM_PROPERTIES += \
     pm.dexopt.bg-dexopt?=speed-profile \
     pm.dexopt.ab-ota?=speed-profile \
     pm.dexopt.inactive?=verify \
+    pm.dexopt.cmdline?=verify \
     pm.dexopt.shared?=speed
 
 # Pass file with the list of updatable boot class path packages to dex2oat.