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

Commit 469740c5 authored by Oriol Prieto Gascó's avatar Oriol Prieto Gascó Committed by Automerger Merge Worker
Browse files

Merge "Rename Bluetooth apex and APK" into tm-dev am: 288cc620 am: a13e54d4 am: 06578893 

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



Change-Id: Id48dfa4feff7aca6f24e832b6a4d0e40777ff91e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 69010598 06578893

android/app/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ android_app { 
        ":statslog-bluetooth-java-gen",

    ],

    aaptflags: [ "--custom-package", "com.android.bluetooth" ],

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

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



    jarjar_rules: ":bluetooth-jarjar-rules",
@@ -192,6 +192,6 @@ genrule { 
}



android_app_certificate {

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

    certificate: "certs/com.android.bluetooth.services"

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

    certificate: "certs/com.android.bluetooth"

}

android/app/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>



<manifest xmlns:android="http://schemas.android.com/apk/res/android"

  package="com.android.bluetooth.services"

  package="com.android.bluetooth"

  android:sharedUserId="android.uid.bluetooth">



    <!-- Allows access to the Bluetooth Share Manager -->

android/app/tests/unit/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ android_test { 
    name: "BluetoothInstrumentationTests",



    // We only want this apk build for tests.

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

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

    defaults: ["framework-bluetooth-tests-defaults"],



    min_sdk_version: "current",