From 16638325b06a97afdc709f905e200f09b0828ef9 Mon Sep 17 00:00:00 2001
From: William Escande <wescande@google.com>
Date: Mon, 22 Aug 2022 11:27:55 -0700
Subject: [Bluetooth apex] Use new apex name

The Bluetooth apex name is now called com.android.btservices

Bug: 243054261
Test: Build
Change-Id: I00bf318c651b8c3b8a763014808f0a56bc0ccd66
---
 Android.bp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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",
 }
-- 
cgit v1.2.3


From cd9c9aa9f1a645ab17ae97958ff7d692dabb4ad0 Mon Sep 17 00:00:00 2001
From: Cole Faust <colefaust@google.com>
Date: Tue, 6 Sep 2022 18:17:07 -0700
Subject: Convert protoc-gen-nanopb to python 3

nanopb_generator.py already had code in it to support
both python 2 and 3. Start using python 3 in the soong
build.

Bug: 203436762
Test: Presubmits
Change-Id: I99358aaa7a09e4feebc09225bf9591e38ed8957e
---
 generator/Android.bp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

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,
        },
    },
 }
-- 
cgit v1.2.3