commit f139b8ca43938af61fc399039d30a2d0335f4ab8
author Anton Hansson <hansson@google.com> Fri Jan 11 15:04:32 2019 +0000
committer Anton Hansson <hansson@google.com> Tue Jan 15 10:18:37 2019 +0000
tree ee5c79815bfc14e21fec0034a7be9ee344752949
parent 16fc826a4d69ed26d79e1070809a26dd558fe1c4

Move SettingsIntelligence to /product

This app is frequently overriden by proprietary apps
on shipping devices, so move it to /product.

Also make the app inherit its privapp permission grant.

Bug: 122353713
Test: launch settings on aosp_arm64 emulator
Change-Id: Ice1e4147cf5402b88c900c669615c45e40f331bc

Android.mk

diff --git a/Android.mk b/Android.mk
index 1622f84..37d0b68 100644
--- a/Android.mk
+++ b/Android.mk
@@ -21,7 +21,9 @@
 LOCAL_PROGUARD_FLAG_FILES := proguard.cfg
 
 LOCAL_SDK_VERSION := system_current
+LOCAL_PRODUCT_MODULE := true
 LOCAL_PRIVILEGED_MODULE := true
+LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.settings.intelligence
 
 LOCAL_STATIC_ANDROID_LIBRARIES := \
     androidx.legacy_legacy-support-v4 \
@@ -47,4 +49,4 @@
 # Use the following include to make our test apk.
 ifeq (,$(ONE_SHOT_MAKEFILE))
 include $(call all-makefiles-under,$(LOCAL_PATH))
-endif
\ No newline at end of file
+endif