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

Commit eeda57ab authored by Matt Gilbride's avatar Matt Gilbride
Browse files

Re-enable dropboxmanager_aidl-java 

The original change introducing the aidl_interface omitted
additional_libs: ["unsupportedappusage"] which is required for the .aidl
to use the annotation.

Bug: 424186512
Test: TH
Flag: EXEMPT trivial build-time change
Change-Id: I8b5bbe689df439d2a9100df5f5d1605c1387a5e6
parent d7b3bd7a

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -399,6 +399,7 @@ java_defaults { 
        "com.android.sysprop.foldlockbehavior",

        "com.android.sysprop.view",

        "framework-internal-utils",

        "dropboxmanager_aidl-java",

        "dynamic_instrumentation_manager_aidl-java",

        // If MimeMap ever becomes its own APEX, then this dependency would need to be removed

        // in favor of an API stubs dependency in java_library "framework" below.

core/java/Android.bp

+9 −2
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ filegroup { 
    // Exactly one MessageQueue.java will be added to srcs by messagequeue-gen

    exclude_srcs: [

        "**/*_ravenwood.java",

        ":dropboxmanager_aidl_sources",

        ":dynamic_instrumentation_manager_aidl_sources",

        "android/os/*MessageQueue/**/*.java",

        "android/ranging/**/*.java",
@@ -106,11 +107,12 @@ release_package_messagequeue_implementation_srcs { 


aidl_interface {

    name: "dropboxmanager_aidl",

    srcs: ["com/android/internal/os/IDropBoxManagerService.aidl"],

    srcs: [":dropboxmanager_aidl_sources"],

    unstable: true,

    backend: {

        java: {

            enabled: false, // TODO(b/424186512) switch frameworks/base to using this as well, it uses core build **/*.aidl glob now

            additional_libs: ["unsupportedappusage"],

            enabled: true,

        },

        rust: {

            enabled: true,
@@ -122,6 +124,11 @@ aidl_interface { 
    },

}



filegroup {

    name: "dropboxmanager_aidl_sources",

    srcs: ["com/android/internal/os/IDropBoxManagerService.aidl"],

}



filegroup {

    name: "IBinaryTransparencyService.aidl",

    srcs: ["com/android/internal/os/IBinaryTransparencyService.aidl"],