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

Commit fa4c03f0 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

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

Change-Id: I2e25022f2dff7405db438ab8447ed39c1416e145
parents a9b735c6 455b7906
Loading
Loading
Loading
Loading
+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: [
+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",
}
+1 −1
Original line number Diff line number Diff line
{
  "name": "com.android.bluetooth.updatable",
  "name": "com.android.bluetooth",
  "version": 2
}
Loading