From deec280bbb79d4471f700d9dd08518cd70763caa Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Thu, 27 Sep 2018 11:07:38 +0100
Subject: [PATCH] Add preopt scripts to mainline.

These scripts support art preopting in system_other, which is
a generically useful thing to keep on mainline.

Note that the preloads_copy script should also be added, but
that needs some work to be done (b/116714695).

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: I693e17ac0f61f2417ced639d1fdfe164c54341a9
---
 target/product/mainline_system.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/target/product/mainline_system.mk b/target/product/mainline_system.mk
index 80efa4c310..cbd37a96cd 100644
--- a/target/product/mainline_system.mk
+++ b/target/product/mainline_system.mk
@@ -18,11 +18,16 @@
 $(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system.mk)
 
-# OTA support.
+# OTA support
 PRODUCT_PACKAGES += \
     update_engine \
     update_verifier \
 
+# system_other support
+PRODUCT_PACKAGES += \
+    cppreopts.sh \
+    otapreopt_script \
+
 # Enable dynamic partition size
 PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true