commit e8ea6bff45a2aac27a9d79252621023d4d3a29fb
author Anton Hansson <hansson@google.com> Tue Jan 15 13:23:15 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 15 13:23:15 2019 +0000
tree 6cdafaa3a88020d3ff57f55bd6823d31feef0bee
parent 93068a3c584e2f6c39239b0cccb26330bf5e634e
parent 3278a8e2347712c472f541081552cae1964549bf

Merge "Move Provision to /product"

Android.bp

diff --git a/Android.bp b/Android.bp
index 15377f0..a0cd786 100644
--- a/Android.bp
+++ b/Android.bp
@@ -2,8 +2,10 @@
     name: "Provision",
     srcs: ["**/*.java"],
     platform_apis: true,
+    product_specific: true,
     certificate: "platform",
     privileged: true,
+    required: ["privapp_whitelist_com.android.provision"],
     optimize: {
         proguard_flags_files: ["proguard.flags"],
     },

CleanSpec.mk

diff --git a/CleanSpec.mk b/CleanSpec.mk
index b84e1b6..09891be 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -43,6 +43,7 @@
 #$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
 #$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
 #$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/Provision)
 
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST