Snap for 10209341 from e99b7707772edfceba41f13be61d477c57264146 to mainline-healthfitness-release

Change-Id: Ia9443dd3dc6bb119cc7c0913a6bbee491bb6bd89

gsi_arm.mk

diff --git a/gsi_arm.mk b/gsi_arm.mk
index 1a28cc8..6272fb5 100644
--- a/gsi_arm.mk
+++ b/gsi_arm.mk
@@ -29,6 +29,9 @@
 # Enable mainline checking
 PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := true
 
+# Always build modules from source
+MODULE_BUILD_FROM_SOURCE := true
+
 #
 # All components inherited here go to system_ext image
 #

gsi_arm64.mk

diff --git a/gsi_arm64.mk b/gsi_arm64.mk
index 81b0a3e..ceb2e94 100644
--- a/gsi_arm64.mk
+++ b/gsi_arm64.mk
@@ -30,6 +30,9 @@
 # Enable mainline checking
 PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := true
 
+# Always build modules from source
+MODULE_BUILD_FROM_SOURCE := true
+
 #
 # All components inherited here go to system_ext image
 #

gsi_system_ext.mk

diff --git a/gsi_system_ext.mk b/gsi_system_ext.mk
index 8fcb3d9..ff487e2 100644
--- a/gsi_system_ext.mk
+++ b/gsi_system_ext.mk
@@ -22,7 +22,6 @@
 PRODUCT_PACKAGES += \
     Launcher3QuickStep \
     Provision \
-    RemoteProvisioner \
     Settings \
     StorageManager \
     SystemUI

gsi_x86.mk

diff --git a/gsi_x86.mk b/gsi_x86.mk
index 0dfde63..030d9b4 100644
--- a/gsi_x86.mk
+++ b/gsi_x86.mk
@@ -22,6 +22,9 @@
 # Enable mainline checking
 PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := true
 
+# Always build modules from source
+MODULE_BUILD_FROM_SOURCE := true
+
 #
 # All components inherited here go to system_ext image
 #

gsi_x86_64.mk

diff --git a/gsi_x86_64.mk b/gsi_x86_64.mk
index b45184c..d21d0b9 100644
--- a/gsi_x86_64.mk
+++ b/gsi_x86_64.mk
@@ -23,6 +23,9 @@
 # Enable mainline checking
 PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := true
 
+# Always build modules from source
+MODULE_BUILD_FROM_SOURCE := true
+
 #
 # All components inherited here go to system_ext image
 #