summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Escande <wescande@google.com>2022-08-23 02:44:46 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-08-23 02:44:46 +0000
commitf639676cbcb10567a0eb1cdf820a940271f7c1ac (patch)
treea68bf73dd85364883f19fae6f81f334b87711458
parent88d8f50a531b2fd8e8bc422d7817e1c795de2bea (diff)
parentc331a272a0698d8189f73c6a0f28cefaab205b88 (diff)
downloadgrpcio-sys-main-16k-with-phones.tar.gz
[Bluetooth apex] Use new apex name am: dbcf042c12 am: 895cd2f17d am: adb41769ba am: c331a272a0android-u-beta-1-gplmain-16k-with-phones
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/grpcio-sys/+/2192262 Change-Id: I694f1b913d94128286056711a956857fffa19a8c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp4
-rw-r--r--patches/Android.bp.patch4
2 files changed, 4 insertions, 4 deletions
diff --git a/Android.bp b/Android.bp
index 399a8c0b..861f5036 100644
--- a/Android.bp
+++ b/Android.bp
@@ -61,7 +61,7 @@ rust_library {
],
apex_available: [
"//apex_available:platform",
- "com.android.bluetooth",
+ "com.android.btservices",
],
min_sdk_version: "29",
}
@@ -75,7 +75,7 @@ cc_defaults {
shared_libs: ["libgrpc++"],
apex_available: [
"//apex_available:platform",
- "com.android.bluetooth",
+ "com.android.btservices",
],
min_sdk_version: "29",
}
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
index d97431fd..38f7cca4 100644
--- a/patches/Android.bp.patch
+++ b/patches/Android.bp.patch
@@ -66,7 +66,7 @@ index 45707bc..d0369e6 100644
- shared_libs: ["libstdc++"],
apex_available: [
"//apex_available:platform",
- "com.android.bluetooth",
+ "com.android.btservices",
],
min_sdk_version: "29",
}
@@ -80,7 +80,7 @@ index 45707bc..d0369e6 100644
+ shared_libs: ["libgrpc++"],
+ apex_available: [
+ "//apex_available:platform",
-+ "com.android.bluetooth",
++ "com.android.btservices",
+ ],
+ min_sdk_version: "29",
+}