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

Commit 33517174 authored by Anton Hansson's avatar Anton Hansson Committed by Gerrit Code Review
Browse files

Merge changes If81cda01,I1df8b8e0 

* changes:
  Suppress [CallbackInterface] metalava rule for mainline modules.
  Limit build visibility of modules in apex/...
parents d4caba4d bab38321

apex/Android.bp

+16 −0
Original line number Original line Diff line number Diff line
@@ -12,9 +12,14 @@ 
// See the License for the specific language governing permissions and

// See the License for the specific language governing permissions and

// limitations under the License.

// limitations under the License.





package {

    default_visibility: [":__subpackages__"],

}



mainline_stubs_args =

mainline_stubs_args =

    "--error UnhiddenSystemApi " +

    "--error UnhiddenSystemApi " +

    "--hide BroadcastBehavior " +

    "--hide BroadcastBehavior " +

    "--hide CallbackInterface " +

    "--hide DeprecationMismatch " +

    "--hide DeprecationMismatch " +

    "--hide HiddenSuperclass " +

    "--hide HiddenSuperclass " +

    "--hide HiddenTypedefConstant " +

    "--hide HiddenTypedefConstant " +
@@ -139,6 +144,13 @@ java_defaults { 
        enabled: true,

        enabled: true,

        sdk_version: "module_current",

        sdk_version: "module_current",

    },

    },

    defaults_visibility: [

        ":__subpackages__",

        "//frameworks/base/libs/hwui",

        "//frameworks/base/wifi",

        "//packages/modules:__subpackages__",

        "//packages/providers/MediaProvider:__subpackages__",

    ],

}

}





// Defaults for mainline module system server provided java_sdk_library instances.

// Defaults for mainline module system server provided java_sdk_library instances.
@@ -150,6 +162,10 @@ java_defaults { 
        enabled: true,

        enabled: true,

        sdk_version: "module_current",

        sdk_version: "module_current",

    },

    },

    defaults_visibility: [

        ":__subpackages__",

        "//packages/modules:__subpackages__",

    ],

}

}





stubs_defaults {

stubs_defaults {

apex/blobstore/framework/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ filegroup { 
        "java/**/*.aidl"

        "java/**/*.aidl"

    ],

    ],

    path: "java",

    path: "java",

    visibility: ["//frameworks/base"],

}

}





java_library {

java_library {

apex/blobstore/service/Android.bp

+5 −0
Original line number Original line Diff line number Diff line
@@ -25,4 +25,9 @@ java_library { 
        "services.core",

        "services.core",

        "services.usage",

        "services.usage",

    ],

    ],

    visibility: [

        // These are required until blobstore is properly unbundled.

        "//frameworks/base/services",

        "//frameworks/base/services/tests/mockingservicestests",

    ],

}
 
}

apex/jobscheduler/framework/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -8,6 +8,7 @@ filegroup { 
        "java/android/os/IDeviceIdleController.aidl",

        "java/android/os/IDeviceIdleController.aidl",

    ],

    ],

    path: "java",

    path: "java",

    visibility: ["//frameworks/base"],

}

}





java_library {

java_library {

apex/jobscheduler/service/Android.bp

+8 −0
Original line number Original line Diff line number Diff line
@@ -13,4 +13,12 @@ java_library { 
        "framework",

        "framework",

        "services.core",

        "services.core",

    ],

    ],

    visibility: [

        "//frameworks/base/apex/jobscheduler:__subpackages__",

        // These are required until jobscheduler is properly unbundled.

        "//frameworks/base/services",

        "//frameworks/base/services/tests/mockingservicestests",

        "//frameworks/base/services/tests/servicestests",

        "//frameworks/base/tests/JobSchedulerPerfTests",

    ],

}
 
}