Replace supplementalprocess with sdksandbox
And also remove supplementalprocess APEX
Bug: 220320098
Test: m
Change-Id: I7d92d48173baf0d55a12c710f2e494442d7feeaa
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 5ecd053..b59a84f 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -71,7 +71,6 @@
com.android.scheduling \
com.android.sdkext \
com.android.sepolicy \
- com.android.supplementalprocess \
com.android.tethering \
com.android.tzdata \
com.android.uwb \
diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk
index bdb082d..d39dc6d 100644
--- a/target/product/default_art_config.mk
+++ b/target/product/default_art_config.mk
@@ -52,6 +52,7 @@
# Note: For modules available in Q, DO NOT add new entries here.
PRODUCT_APEX_BOOT_JARS := \
com.android.adservices:framework-adservices \
+ com.android.adservices:framework-sdksandbox \
com.android.appsearch:framework-appsearch \
com.android.auxiliary:framework-auxiliary \
com.android.bluetooth:framework-bluetooth \
@@ -66,7 +67,6 @@
com.android.permission:framework-permission-s \
com.android.scheduling:framework-scheduling \
com.android.sdkext:framework-sdkextensions \
- com.android.supplementalprocess:framework-sdksandbox \
com.android.tethering:framework-connectivity \
com.android.tethering:framework-connectivity-t \
com.android.tethering:framework-tethering \
@@ -78,11 +78,11 @@
# Note: For modules available in Q, DO NOT add new entries here.
PRODUCT_APEX_SYSTEM_SERVER_JARS := \
com.android.adservices:service-adservices \
+ com.android.adservices:service-sdksandbox \
com.android.appsearch:service-appsearch \
com.android.art:service-art \
com.android.media:service-media-s \
com.android.permission:service-permission \
- com.android.supplementalprocess:service-sdksandbox \
PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION += art/build/boot/boot-image-profile.txt
