Track RulesManagerService frameworks/base changes am: f4cc71826e am: 732a706905
am: 4d908688c3

Change-Id: I1b678da3e4aabe2adc2ad6e09b570381690fb047

oem_template/data_app/build_oem_data_app.mk

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 :=

oem_template/data_app_prebuilt/include_app_prebuilt.mk

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