From c3c7e46821fa0e77b5af3c2d9414a9584dcef0a5 Mon Sep 17 00:00:00 2001
From: Tony Mak <tonymak@google.com>
Date: Fri, 20 Sep 2024 20:54:41 +0000
Subject: [PATCH] Preload the sidecar jar when the flag is on

Ignore-AOSP-First: The jar was developed in internal git, so this change must be also in internal git.


Test: Build
Bug: 360864791
Flag: RELEASE_APPFUNCTION_SIDECAR
Change-Id: Iaafc3cbf0842fe61c8364d04f7f47cd4698d03cf
---
 target/product/app_function_extensions.mk | 22 ++++++++++++++++++++++
 target/product/media_system_ext.mk        |  5 +++++
 2 files changed, 27 insertions(+)
 create mode 100644 target/product/app_function_extensions.mk

diff --git a/target/product/app_function_extensions.mk b/target/product/app_function_extensions.mk
new file mode 100644
index 0000000000..a61afdc5ab
--- /dev/null
+++ b/target/product/app_function_extensions.mk
@@ -0,0 +1,22 @@
+#
+# Copyright (C) 2024 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# The app function sidecar extensions
+
+# /system_ext packages
+PRODUCT_PACKAGES += \
+    com.google.android.appfunctions.sidecar \
+    appfunctions.sidecar.xml
diff --git a/target/product/media_system_ext.mk b/target/product/media_system_ext.mk
index 30dd2e2711..34d8de3f32 100644
--- a/target/product/media_system_ext.mk
+++ b/target/product/media_system_ext.mk
@@ -26,3 +26,8 @@ PRODUCT_PACKAGES += \
 
 # Window Extensions
 $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions_base.mk)
+
+# AppFunction Extensions
+ifneq (,$(RELEASE_APPFUNCTION_SIDECAR))
+    $(call inherit-product, $(SRC_TARGET_DIR)/product/app_function_extensions.mk)
+endif