Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 336353eb authored by Etienne Ruffieux's avatar Etienne Ruffieux Committed by Automerger Merge Worker
Browse files

Merge "Renamed bluetooth apex name to com.android.bluetooth" am: 455b7906... 

Merge "Renamed bluetooth apex name to com.android.bluetooth" am: 455b7906 am: fa4c03f0 am: d3ae3f4a

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1924421

Change-Id: Ic097d0a5804b74ead0744df8b19ba2005925aa46
parents afaf6feb d3ae3f4a

android/app/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ android_app { 
    required: ["libbluetooth"],

    apex_available: [

        "//apex_available:platform",

        "com.android.bluetooth.updatable",

        "com.android.bluetooth",

    ],

    errorprone: {

        javacflags: [

apex/Android.bp

+8 −8
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ package { 
}



apex {

    name: "com.android.bluetooth.updatable",

    name: "com.android.bluetooth",

    enabled: false,



    manifest: "apex_manifest.json",
@@ -21,17 +21,17 @@ apex { 


    compile_multilib: "both",



    key: "com.android.bluetooth.updatable.key",

    certificate: ":com.android.bluetooth.updatable.certificate",

    key: "com.android.bluetooth.key",

    certificate: ":com.android.bluetooth.certificate",

}



apex_key {

    name: "com.android.bluetooth.updatable.key",

    public_key: "com.android.bluetooth.updatable.avbpubkey",

    private_key: "com.android.bluetooth.updatable.pem",

    name: "com.android.bluetooth.key",

    public_key: "com.android.bluetooth.avbpubkey",

    private_key: "com.android.bluetooth.pem",

}



android_app_certificate {

    name: "com.android.bluetooth.updatable.certificate",

    certificate: "com.android.bluetooth.updatable",

    name: "com.android.bluetooth.certificate",

    certificate: "com.android.bluetooth",

}

apex/apex_manifest.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "com.android.bluetooth.updatable",

  "name": "com.android.bluetooth",

  "version": 2

}