DO NOT MERGE - Merge Android 10 into master
Bug: 139893257
Change-Id: Id15a0e7908a1feee86bab8cedd06024518107dd5
diff --git a/oem_template/data_app/build_oem_data_app.mk b/oem_template/data_app/build_oem_data_app.mk
index f31e5d1..0c45ff1 100644
--- a/oem_template/data_app/build_oem_data_app.mk
+++ b/oem_template/data_app/build_oem_data_app.mk
@@ -44,7 +44,12 @@
# OEM-INSTRUCTION: Modify the name, s/oemcorp/<Your company name>/
LOCAL_MODULE_OWNER := oemcorp
-LOCAL_PRIVILEGED_MODULE := true
+
+# The app build is expected to generate a prebuilt, so do not place the app in
+# the system image.
+LOCAL_UNINSTALLABLE_MODULE := true
+
+LOCAL_PRODUCT_MODULE := true
# OEM-INSTRUCTION: Configure your own certificate.
LOCAL_CERTIFICATE :=
diff --git a/oem_template/data_app_prebuilt/include_app_prebuilt.mk b/oem_template/data_app_prebuilt/include_app_prebuilt.mk
index f4c6be9..3ebc464 100644
--- a/oem_template/data_app_prebuilt/include_app_prebuilt.mk
+++ b/oem_template/data_app_prebuilt/include_app_prebuilt.mk
@@ -29,6 +29,7 @@
# OEM-INSTRUCTION: Change this
LOCAL_MODULE_OWNER := oemcorp
LOCAL_PRIVILEGED_MODULE := true
+LOCAL_PRODUCT_MODULE := true
LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
LOCAL_MODULE_CLASS := APPS
