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

Commit 901eda31 authored by Jihoon Kang's avatar Jihoon Kang Committed by Gerrit Code Review
Browse files

Merge changes from topics "remove_api_files", "remove_naming_convention" into main 

* changes:
  Add api_surface prop to non-updatable droidstubs
  Replace api_files prop to api_contributions
  Remove non-updatable contribution from android_test_stubs_current_contributions
parents 9fb33563 866b9b7a

api/StubLibraries.bp

+18 −14
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ droidstubs { 
            tag: ".removed-api.txt",

        },

    ],

    api_surface: "public",

}



priv_apps = " --show-annotation android.annotation.SystemApi\\(" +
@@ -119,6 +120,7 @@ droidstubs { 
            tag: ".removed-api.txt",

        },

    ],

    api_surface: "system",

}



droidstubs {
@@ -164,6 +166,7 @@ droidstubs { 
            tag: ".removed-api.txt",

        },

    ],

    api_surface: "test",

}



droidstubs {
@@ -203,6 +206,7 @@ droidstubs { 
            tag: ".removed-api.txt",

        },

    ],

    api_surface: "module-lib",

}



/////////////////////////////////////////////////////////////////////
@@ -379,8 +383,8 @@ java_defaults { 
java_api_library {

    name: "android-non-updatable.stubs.from-text",

    api_surface: "public",

    api_files: [

        ":non-updatable-current.txt",

    api_contributions: [

        "api-stubs-docs-non-updatable.api.contribution",

    ],

    defaults: ["android-non-updatable_from_text_defaults"],

    full_api_surface_stub: "android_stubs_current.from-text",
@@ -389,9 +393,9 @@ java_api_library { 
java_api_library {

    name: "android-non-updatable.stubs.system.from-text",

    api_surface: "system",

    api_files: [

        ":non-updatable-current.txt",

        ":non-updatable-system-current.txt",

    api_contributions: [

        "api-stubs-docs-non-updatable.api.contribution",

        "system-api-stubs-docs-non-updatable.api.contribution",

    ],

    defaults: ["android-non-updatable_from_text_defaults"],

    full_api_surface_stub: "android_system_stubs_current.from-text",
@@ -400,10 +404,10 @@ java_api_library { 
java_api_library {

    name: "android-non-updatable.stubs.test.from-text",

    api_surface: "test",

    api_files: [

        ":non-updatable-current.txt",

        ":non-updatable-system-current.txt",

        ":non-updatable-test-current.txt",

    api_contributions: [

        "api-stubs-docs-non-updatable.api.contribution",

        "system-api-stubs-docs-non-updatable.api.contribution",

        "test-api-stubs-docs-non-updatable.api.contribution",

    ],

    defaults: ["android-non-updatable_from_text_defaults"],

    full_api_surface_stub: "android_test_stubs_current.from-text",
@@ -412,10 +416,10 @@ java_api_library { 
java_api_library {

    name: "android-non-updatable.stubs.module_lib.from-text",

    api_surface: "module_lib",

    api_files: [

        ":non-updatable-current.txt",

        ":non-updatable-system-current.txt",

        ":non-updatable-module-lib-current.txt",

    api_contributions: [

        "api-stubs-docs-non-updatable.api.contribution",

        "system-api-stubs-docs-non-updatable.api.contribution",

        "module-lib-api-stubs-docs-non-updatable.api.contribution",

    ],

    defaults: ["android-non-updatable_from_text_defaults"],

    full_api_surface_stub: "android_module_lib_stubs_current_full.from-text",
@@ -598,7 +602,6 @@ java_defaults { 
    name: "android_test_stubs_current_contributions",

    api_surface: "test",

    api_contributions: [

        "test-api-stubs-docs-non-updatable.api.contribution",

        "framework-virtualization.stubs.source.test.api.contribution",

    ],

}
@@ -664,6 +667,7 @@ java_api_library { 
    api_contributions: [

        "api-stubs-docs-non-updatable.api.contribution",

        "system-api-stubs-docs-non-updatable.api.contribution",

        "test-api-stubs-docs-non-updatable.api.contribution",

    ],

    visibility: ["//visibility:public"],

}

services/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -255,4 +255,5 @@ droidstubs { 
            tag: ".removed-api.txt",

        },

    ],

    api_surface: "system-server",

}