commit a09737a7fc9bd3c72f09c07f1eb867d8c278ed7e
author Neha Pattan <npattan@google.com> Fri Jun 23 17:09:02 2023 +0000
committer Neha Pattan <npattan@google.com> Thu Jun 29 23:26:30 2023 +0000
tree c609850c5a680215696dd890faaac14d31e2e5cf
parent 901bfbe20fa105a5e3b2a4b9a6a8c48519d2fc63

(udc-mp) Add AdServices to ExtServices apk.

Test: atest
Bug: 287259822

Change-Id: I3bbde87448b6172e63ed4c893a85602f39666882

Android.bp

diff --git a/Android.bp b/Android.bp
index abdab3c..baeffd3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -89,3 +89,32 @@
         "test_com.android.extservices",
     ],
 }
+
+android_app {
+    name: "ExtServices-sminus",
+    sdk_version: "module_current",
+    min_sdk_version: "30",
+    manifest: "AndroidManifest.xml",
+    optimize: {
+        optimize: true,
+        shrink_resources: true,
+        proguard_compatibility: false,
+        proguard_flags_files: ["proguard.proguard"],
+    },
+    privileged: true,
+    privapp_allowlist: ":privapp_allowlist_android.ext_sminus.services.xml",
+    static_libs: [
+        "ExtServices-core",
+        "AdServices-core",
+    ],
+    jarjar_rules: "jarjar-rules.txt",
+    jni_libs: ["libtextclassifier", "libextservices_jni"],
+    libs: ["android.ext.adservices"],
+    optional_uses_libs: ["android.ext.adservices"],
+    use_embedded_native_libs: true,
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.extservices",
+        "test_com.android.extservices",
+    ],
+}

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 354ea51..83604f3 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -54,6 +54,9 @@
             <process android:process=":modelDownloaderServiceProcess">
                 <allow-permission android:name="android.permission.INTERNET" />
             </process>
+            <process android:process=".adservices">
+                <allow-permission android:name="android.permission.INTERNET" />
+            </process>
         </processes>
 
         <service android:name=".storage.CacheQuotaServiceImpl"
@@ -162,9 +165,10 @@
             tools:node="remove" />
 
         <!-- Boot completed receiver sends privileged startup broadcast. -->
+        <!-- TODO: Remove BootCompletedReceiver. -->
         <receiver android:name=".common.BootCompletedReceiver"
-                  android:enabled="@bool/enableBootCompletedReceiver"
-                  android:exported="true">
+                  android:enabled="false"
+                  android:exported="false">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED"/>
             </intent-filter>

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index b98fab6..b234743 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -32,7 +32,7 @@
     name: "com.android.extservices_sminus",
     apex_available_name: "com.android.extservices",
     defaults: ["com.android.extservices-defaults"],
-    apps: ["ExtServices", "AdExtServicesApk"],
+    apps: ["ExtServices-sminus"],
     java_libs: ["android.ext.adservices"],
     jni_libs: ["libtflite_support_classifiers_native", "libhpke_jni"],
 }