aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-07-07 04:47:07 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-07-07 04:47:07 +0000
commitc91f011acc450b26d09952d9f58f05ee3ec4e215 (patch)
tree6c8f99caa41441d024d8d75c5b99ccc241ce94a0
parent2b722f90329c278100d70f78ad5c3dec29e21dac (diff)
parent2a413cbc07fe27b4daf3f04f44efe3102e221b50 (diff)
downloadnanopb-c-android14-mainline-conscrypt-release.tar.gz
Snap for 10453563 from 2a413cbc07fe27b4daf3f04f44efe3102e221b50 to mainline-conscrypt-releaseaml_con_341614000aml_con_341511080aml_con_341410300aml_con_341310090aml_con_341110000android14-mainline-conscrypt-release
Change-Id: I431563bd3f8edffd35391c9893c1383a7fd075f3
-rw-r--r--Android.bp2
-rw-r--r--generator/Android.bp6
2 files changed, 2 insertions, 6 deletions
diff --git a/Android.bp b/Android.bp
index e942ad9..4515e03 100644
--- a/Android.bp
+++ b/Android.bp
@@ -76,7 +76,7 @@ cc_library_static {
defaults: ["libprotobuf-c-nano-defaults"],
apex_available: [
"//apex_available:platform",
- "com.android.bluetooth",
+ "com.android.btservices",
],
min_sdk_version: "30",
}
diff --git a/generator/Android.bp b/generator/Android.bp
index cd7516c..343b0ca 100644
--- a/generator/Android.bp
+++ b/generator/Android.bp
@@ -22,12 +22,8 @@ python_binary_host {
},
libs: ["libprotobuf-python"],
version: {
- py2: {
- enabled: true,
- embedded_launcher: true,
- },
py3: {
- enabled: false,
+ embedded_launcher: true,
},
},
}