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

Commit e88e2384 authored by William Escande's avatar William Escande Committed by Gerrit Code Review
Browse files

Merge changes from topics "apk_in_apex-burndown", "apk_in_apex-burndown-fwk-bluetooth" into main 

* changes:
  Fix Bluetooth app dependency
  Jarjar to prevent conflict w fwk-bluetooth.jar
  Jarjar to prevent conflict w system/framework.jar
parents 7960b7fe 5811bbb3

android/app/Android.bp

+3 −1
Original line number Diff line number Diff line
@@ -232,6 +232,9 @@ android_app { 
        "framework-statsd.stubs.module_lib",

        "framework-tethering.stubs.module_lib",

        "unsupportedappusage",



        // Need to link the class at runtime

        "framework-bluetooth",

    ],

    static_libs: [

        "android.hardware.radio-V1.0-java",
@@ -254,7 +257,6 @@ android_app { 
        "modules-utils-backgroundthread",

        "modules-utils-bytesmatcher",

        "modules-utils-statemachine",

        "modules-utils-synchronous-result-receiver",

        "net-utils-services-common",

        "networkstack-client",

        "sap-api-java-static",

android/app/tests/unit/src/com/android/bluetooth/sap/SapRilReceiverHidlTest.java

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ import static org.mockito.Mockito.eq; 
import static org.mockito.Mockito.timeout;

import static org.mockito.Mockito.verify;



import android.hardware.radio.V1_0.ISap;

import com.android.bluetooth.x.android.hardware.radio.V1_0.ISap;

import android.os.Handler;

import android.os.HandlerThread;

import android.os.Message;

framework/jarjar-rules.txt

+4 −0
Original line number Diff line number Diff line
@@ -5,3 +5,7 @@ rule com.android.modules.utils.** com.android.bluetooth.x.@0 
# Use our statically linked PlatformProperties library

rule android.sysprop.** com.android.bluetooth.x.@0



## used by /system/framework/framework.jar ##

rule android.hardware.radio.V1_0.** com.android.bluetooth.x.@0

rule com.google.android.mms.** com.android.bluetooth.x.@0

rule com.android.internal.util.** com.android.bluetooth.x.@0