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

Commit 43bf771f authored by Paul Hu's avatar Paul Hu Committed by Android (Google) Code Review
Browse files

Merge changes from topic "cherrypick-Rename... 

Merge changes from topic "cherrypick-Rename framework-connectivity-tiramisu-sc6n16uuh1" into tm-mainline-prod

* changes:
  [automerge] Rename framework-connectivity-tiramisu to framework-connectivity-t 2p: e074dd2e
  Rename framework-connectivity-tiramisu to framework-connectivity-t
parents 08b42875 aea3b15f

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -591,7 +591,7 @@ stubs_defaults { 
    libs: [

        "art.module.public.api",

        "sdk_module-lib_current_framework-tethering",

        "sdk_module-lib_current_framework-connectivity-tiramisu",

        "sdk_module-lib_current_framework-connectivity-t",

        "sdk_public_current_framework-bluetooth",

        // There are a few classes from modules used by the core that

        // need to be resolved by metalava. We use a prebuilt stub of the

StubLibraries.bp

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ java_library { 
    srcs: [":module-lib-api-stubs-docs-non-updatable"],

    libs: [

        "sdk_module-lib_current_framework-tethering",

        "sdk_module-lib_current_framework-connectivity-tiramisu",

        "sdk_module-lib_current_framework-connectivity-t",

        "sdk_public_current_framework-bluetooth",

        // NOTE: The below can be removed once the prebuilt stub contains bluetooth.

        "sdk_system_current_android",

api/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ combined_apis { 
        "framework-appsearch",

        "framework-bluetooth",

        "framework-connectivity",

        "framework-connectivity-tiramisu",

        "framework-connectivity-t",

        "framework-graphics",

        "framework-media",

        "framework-mediaprovider",