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

Commit a615ce51 authored by Chun Zhang's avatar Chun Zhang
Browse files

Add nearby mainline module public/system Api to the collection. 

Test: skip test for config change.
Bug: 204780849
Change-Id: I51d550cb9cc2a649b7ac5da2aa01d1cb2c7bbb52
parent 48de4f00

ApiDocs.bp

+3 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ stubs_defaults { 
        ":framework-connectivity-sources",

        ":framework-graphics-srcs",

        ":framework-mediaprovider-sources",

        ":framework-nearby-sources",

        ":framework-permission-sources",

        ":framework-permission-s-sources",

        ":framework-scheduling-sources",
@@ -165,6 +166,7 @@ droidstubs { 
        ":framework-graphics{.public.stubs.source}",

        ":framework-media{.public.stubs.source}",

        ":framework-mediaprovider{.public.stubs.source}",

        ":framework-nearby{.public.stubs.source}",

        ":framework-permission{.public.stubs.source}",

        ":framework-permission-s{.public.stubs.source}",

        ":framework-scheduling{.public.stubs.source}",
@@ -203,6 +205,7 @@ genrule { 
        ":framework-graphics{.public.annotations.zip}",

        ":framework-media{.public.annotations.zip}",

        ":framework-mediaprovider{.public.annotations.zip}",

        ":framework-nearby{.public.annotations.zip}",

        ":framework-permission{.public.annotations.zip}",

        ":framework-permission-s{.public.annotations.zip}",

        ":framework-scheduling{.public.annotations.zip}",

StubLibraries.bp

+2 −0
Original line number Diff line number Diff line
@@ -244,6 +244,7 @@ modules_public_stubs = [ 
    "framework-graphics.stubs",

    "framework-media.stubs",

    "framework-mediaprovider.stubs",

    "framework-nearby.stubs",

    "framework-permission.stubs",

    "framework-permission-s.stubs",

    "framework-scheduling.stubs",
@@ -264,6 +265,7 @@ modules_system_stubs = [ 
    "framework-graphics.stubs.system",

    "framework-media.stubs.system",

    "framework-mediaprovider.stubs.system",

    "framework-nearby.stubs.system",

    "framework-permission.stubs.system",

    "framework-permission-s.stubs.system",

    "framework-scheduling.stubs.system",

api/Android.bp

+8 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ genrule { 
        ":framework-graphics{.public.api.txt}",

        ":framework-media{.public.api.txt}",

        ":framework-mediaprovider{.public.api.txt}",

        ":framework-nearby{.public.api.txt}",

        ":framework-permission{.public.api.txt}",

        ":framework-permission-s{.public.api.txt}",

        ":framework-scheduling{.public.api.txt}",
@@ -160,6 +161,7 @@ genrule { 
        ":framework-graphics{.public.stubs.source}",

        ":framework-media{.public.stubs.source}",

        ":framework-mediaprovider{.public.stubs.source}",

        ":framework-nearby{.public.stubs.source}",

        ":framework-permission{.public.stubs.source}",

        ":framework-permission-s{.public.stubs.source}",

        ":framework-scheduling{.public.stubs.source}",
@@ -187,6 +189,7 @@ genrule { 
        ":framework-graphics{.public.removed-api.txt}",

        ":framework-media{.public.removed-api.txt}",

        ":framework-mediaprovider{.public.removed-api.txt}",

        ":framework-nearby{.public.removed-api.txt}",

        ":framework-permission{.public.removed-api.txt}",

        ":framework-permission-s{.public.removed-api.txt}",

        ":framework-scheduling{.public.removed-api.txt}",
@@ -228,6 +231,7 @@ genrule { 
        ":framework-graphics{.system.api.txt}",

        ":framework-media{.system.api.txt}",

        ":framework-mediaprovider{.system.api.txt}",

        ":framework-nearby{.system.api.txt}",

        ":framework-permission{.system.api.txt}",

        ":framework-permission-s{.system.api.txt}",

        ":framework-scheduling{.system.api.txt}",
@@ -287,6 +291,7 @@ genrule { 
        ":framework-graphics{.system.removed-api.txt}",

        ":framework-media{.system.removed-api.txt}",

        ":framework-mediaprovider{.system.removed-api.txt}",

        ":framework-nearby{.system.removed-api.txt}",

        ":framework-permission{.system.removed-api.txt}",

        ":framework-permission-s{.system.removed-api.txt}",

        ":framework-scheduling{.system.removed-api.txt}",
@@ -328,6 +333,7 @@ genrule { 
        ":framework-graphics{.module-lib.api.txt}",

        ":framework-media{.module-lib.api.txt}",

        ":framework-mediaprovider{.module-lib.api.txt}",

        ":framework-nearby{.module-lib.api.txt}",

        ":framework-permission{.module-lib.api.txt}",

        ":framework-permission-s{.module-lib.api.txt}",

        ":framework-scheduling{.module-lib.api.txt}",
@@ -389,6 +395,7 @@ genrule { 
        ":framework-graphics{.module-lib.removed-api.txt}",

        ":framework-media{.module-lib.removed-api.txt}",

        ":framework-mediaprovider{.module-lib.removed-api.txt}",

        ":framework-nearby{.module-lib.removed-api.txt}",

        ":framework-permission{.module-lib.removed-api.txt}",

        ":framework-permission-s{.module-lib.removed-api.txt}",

        ":framework-scheduling{.module-lib.removed-api.txt}",
@@ -508,6 +515,7 @@ genrule { 
        ":framework-graphics.stubs{.jar}",

        ":framework-media.stubs{.jar}",

        ":framework-mediaprovider.stubs{.jar}",

        ":framework-nearby.stubs{.jar}",

        ":framework-permission.stubs{.jar}",

        ":framework-permission-s.stubs{.jar}",

        ":framework-scheduling.stubs{.jar}",