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

Commit 455b7906 authored by Etienne Ruffieux's avatar Etienne Ruffieux Committed by Gerrit Code Review
Browse files

Merge "Renamed bluetooth apex name to com.android.bluetooth"

parents 8643c899 7d5a5f1b

android/app/Android.bp

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

    required: ["libbluetooth"],

    apex_available: [

    apex_available: [

        "//apex_available:platform",

        "//apex_available:platform",

        "com.android.bluetooth.updatable",

        "com.android.bluetooth",

    ],

    ],

    errorprone: {

    errorprone: {

        javacflags: [

        javacflags: [

apex/Android.bp

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

}





apex {

apex {

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

    name: "com.android.bluetooth",

    enabled: false,

    enabled: false,





    manifest: "apex_manifest.json",

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




    compile_multilib: "both",

    compile_multilib: "both",





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

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

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

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

}

}





apex_key {

apex_key {

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

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

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

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

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

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

}

}





android_app_certificate {

android_app_certificate {

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

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

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

    certificate: "com.android.bluetooth",

}
 
}

apex/apex_manifest.json

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

{

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

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

  "version": 2

  "version": 2

}
 
}