Merge "Explicitly depend on privapp config" into qt-dev
am: 9b5a58c20c
Change-Id: I3319f63e8d396084f1a84aa8b07b3a219e03b397
diff --git a/car-cluster-logging-renderer/Android.mk b/car-cluster-logging-renderer/Android.mk
index 0f0435a..5d88b48 100644
--- a/car-cluster-logging-renderer/Android.mk
+++ b/car-cluster-logging-renderer/Android.mk
@@ -35,5 +35,7 @@
LOCAL_STATIC_ANDROID_LIBRARIES += \
androidx.car_car-cluster
+LOCAL_REQUIRED_MODULES := privapp_whitelist_android.car.cluster.loggingrenderer
+
include $(BUILD_PACKAGE)
endif
diff --git a/car-usb-handler/Android.mk b/car-usb-handler/Android.mk
index 4d1a577..c764897 100644
--- a/car-usb-handler/Android.mk
+++ b/car-usb-handler/Android.mk
@@ -35,6 +35,8 @@
LOCAL_JAVA_LIBRARIES += android.car
+LOCAL_REQUIRED_MODULES := privapp_whitelist_android.car.usb.handler
+
include $(BUILD_PACKAGE)
endif
diff --git a/service/Android.mk b/service/Android.mk
index f16877e..f9d6032 100644
--- a/service/Android.mk
+++ b/service/Android.mk
@@ -60,6 +60,8 @@
androidx.preference_preference \
EncryptionRunner
+LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.car
+
include $(BUILD_PACKAGE)
#####################################################################################
diff --git a/tests/DirectRenderingClusterSample/Android.mk b/tests/DirectRenderingClusterSample/Android.mk
index 28a5a78..aca5a75 100644
--- a/tests/DirectRenderingClusterSample/Android.mk
+++ b/tests/DirectRenderingClusterSample/Android.mk
@@ -43,6 +43,8 @@
car-telephony-common \
car-apps-common
+LOCAL_REQUIRED_MODULES := privapp_whitelist_android.car.cluster.sample
+
include $(BUILD_PACKAGE)
# Use the following include to make our test apk.
diff --git a/tests/EmbeddedKitchenSinkApp/Android.mk b/tests/EmbeddedKitchenSinkApp/Android.mk
index a0b27ab..65de56e 100644
--- a/tests/EmbeddedKitchenSinkApp/Android.mk
+++ b/tests/EmbeddedKitchenSinkApp/Android.mk
@@ -53,6 +53,8 @@
LOCAL_JAVA_LIBRARIES += android.car
+LOCAL_REQUIRED_MODULES := privapp_whitelist_com.google.android.car.kitchensink
+
include $(BUILD_PACKAGE)
include $(CLEAR_VARS)
diff --git a/tests/ThemePlayground/Android.mk b/tests/ThemePlayground/Android.mk
index 3f13576..1247765 100644
--- a/tests/ThemePlayground/Android.mk
+++ b/tests/ThemePlayground/Android.mk
@@ -44,4 +44,6 @@
LOCAL_JAVA_LIBRARIES += android.car
+LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.car.themeplayground
+
include $(BUILD_PACKAGE)