commit 4b534c1f49b3aaff608060cd22d533eccaa8819b
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Jul 21 17:34:19 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 21 17:34:19 2023 +0000
tree b9a903b9a308f1ba7a982c83f8fce5f658aa6f28
parent 78e4846376d3e2c8178a22f1e82941f7ad1f6f0d
parent 8cf237754b429c74189ec04d2ee760ec0ae30f5c

Merge "Make apex_available to com.android.extservices explicit." into main

java/Android.bp

diff --git a/java/Android.bp b/java/Android.bp
index 5948a17..46ada4a 100644
--- a/java/Android.bp
+++ b/java/Android.bp
@@ -81,6 +81,10 @@
     aaptflags: [
         "-0 .model",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.extservices",
+    ],
 
 }
 
@@ -91,6 +95,10 @@
     srcs: [
         ":statslog-textclassifier-java-gen",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.extservices",
+    ],
 }
 
 genrule {

jni/Android.bp

diff --git a/jni/Android.bp b/jni/Android.bp
index 4300d8e..35ee441 100644
--- a/jni/Android.bp
+++ b/jni/Android.bp
@@ -27,4 +27,8 @@
     static_libs: ["guava"],
     sdk_version: "system_current",
     min_sdk_version: "28",
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.extservices",
+    ],
 }

notification/Android.bp

diff --git a/notification/Android.bp b/notification/Android.bp
index 782d5cb..efe2ec5 100644
--- a/notification/Android.bp
+++ b/notification/Android.bp
@@ -43,4 +43,8 @@
     sdk_version: "system_current",
     min_sdk_version: "30",
     manifest: "LibNoManifest_AndroidManifest.xml",
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.extservices",
+    ],
 }