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

Commit 293ed88b authored by Roopa Sattiraju's avatar Roopa Sattiraju
Browse files

Enabling Apex in BT 

Bug: 217736913
Test: Compile, bringup and test user journeys
Change-Id: I3e796e3618ad9a077fa5e8ac387e314e896d1051
parent b031e081

Android.bp

+4 −3
Original line number Diff line number Diff line
@@ -132,7 +132,6 @@ filegroup { 
        ":installd_aidl",

        ":libaudioclient_aidl",

        ":libbinder_aidl",

        ":libbluetooth-binder-aidl",

        ":libcamera_client_aidl",

        ":libcamera_client_framework_aidl",

        ":libupdate_engine_aidl",
@@ -273,7 +272,6 @@ java_defaults { 
    defaults: ["framework-aidl-export-defaults"],

    srcs: [

        ":framework-non-updatable-sources",

        ":framework-bluetooth-sources", // TODO(b/214988855) : Remove once framework-bluetooth jar is ready

        "core/java/**/*.logtags",

        ":apex-info-list",

    ],
@@ -287,6 +285,7 @@ java_defaults { 
            "frameworks/native/libs/permission/aidl",

            // TODO: remove when moved to the below package

            "frameworks/base/packages/ConnectivityT/framework-t/aidl-export",

            "packages/modules/Bluetooth/system/binder",

            "packages/modules/Connectivity/framework/aidl-export",

            "packages/modules/Media/apex/aidl/stable",

            "hardware/interfaces/graphics/common/aidl",
@@ -545,8 +544,9 @@ stubs_defaults { 
            "frameworks/native/libs/permission/aidl",

            // TODO: remove when moved to the below package

            "frameworks/base/packages/ConnectivityT/framework-t/aidl-export",

            "packages/modules/Media/apex/aidl/stable",

            "packages/modules/Bluetooth/system/binder",

            "packages/modules/Connectivity/framework/aidl-export",

            "packages/modules/Media/apex/aidl/stable",

            "hardware/interfaces/graphics/common/aidl",

        ],

    },
@@ -584,6 +584,7 @@ stubs_defaults { 
    name: "module-classpath-stubs-defaults",

    aidl: {

        include_dirs: [

            "packages/modules/Bluetooth/system/binder",

            "packages/modules/Connectivity/framework/aidl-export",

            "packages/modules/Media/apex/aidl/stable",

        ],

api/api.go

+0 −2
Original line number Diff line number Diff line
@@ -203,8 +203,6 @@ func createMergedSystemStubs(ctx android.LoadHookContext, modules []string) { 
func createMergedFrameworkImpl(ctx android.LoadHookContext, modules []string) {

	// This module is for the "framework-all" module, which should not include the core libraries.

	modules = removeAll(modules, core_libraries_modules)

	// TODO(b/214988855): remove the line below when framework-bluetooth has an impl jar.

	modules = remove(modules, "framework-bluetooth")

	props := libraryProps{}

	props.Name = proptools.StringPtr("all-framework-module-impl")

	props.Static_libs = transformArray(modules, "", ".impl")

boot/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -59,6 +59,10 @@ platform_bootclasspath { 
            apex: "com.android.auxiliary",

            module: "com.android.auxiliary-bootclasspath-fragment",

        },

        {

            apex: "com.android.bluetooth",

            module: "com.android.bluetooth-bootclasspath-fragment",

        },

        {

            apex: "com.android.conscrypt",

            module: "com.android.conscrypt-bootclasspath-fragment",

boot/hiddenapi/hiddenapi-max-target-o.txt

+0 −2806

File changed.

Preview size limit exceeded, changes collapsed.

boot/hiddenapi/hiddenapi-max-target-p.txt

+0 −2
Original line number Diff line number Diff line 
Landroid/app/IInstrumentationWatcher$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/IInstrumentationWatcher;

Landroid/app/ISearchManager$Stub;-><init>()V

Landroid/app/IUiModeManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/IUiModeManager;

Landroid/bluetooth/IBluetooth$Stub;-><init>()V

Landroid/bluetooth/IBluetoothA2dp$Stub;-><init>()V

Landroid/content/IIntentReceiver$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/IIntentReceiver;

Landroid/content/IIntentSender$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/IIntentSender;

Landroid/os/storage/IObbActionListener$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/storage/IObbActionListener;