aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2023-10-05 15:39:23 -0700
committerXin Li <delphij@google.com>2023-10-05 15:39:23 -0700
commitf75c53a3c07cfd3fcb283840137614928ca082c9 (patch)
tree5528ebf957c91068e9541cddad99e9ca57fda535
parentf89a845c40aaaa687aff3475854d3cfbdfbeec0c (diff)
parent33e6584e34032727dcda6ceda7348a2af357437a (diff)
downloadopencensus-java-f75c53a3c07cfd3fcb283840137614928ca082c9.tar.gz
Merge Android 14
Bug: 298295554 Merged-In: I2c337d980643dfbe7518fe78f21aa01d8999b090 Change-Id: I8525fc0b57581ebb3a2cc5f208e9f12a4a1c7988
-rw-r--r--api/Android.bp4
-rw-r--r--contrib/grpc_metrics/Android.bp4
2 files changed, 8 insertions, 0 deletions
diff --git a/api/Android.bp b/api/Android.bp
index b4f9716d..2bc74ad1 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -42,4 +42,8 @@ java_library {
java_version: "11",
sdk_version: "current",
min_sdk_version: "33",
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.devicelock",
+ ],
}
diff --git a/contrib/grpc_metrics/Android.bp b/contrib/grpc_metrics/Android.bp
index 931a5055..7184c1ff 100644
--- a/contrib/grpc_metrics/Android.bp
+++ b/contrib/grpc_metrics/Android.bp
@@ -37,4 +37,8 @@ java_library {
java_version: "11",
sdk_version: "current",
min_sdk_version: "33",
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.devicelock",
+ ],
}