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

Commit 97e6ab1d authored by Paul Duffin's avatar Paul Duffin
Browse files

Use consistent names in api_surface 

While the `api_surface` property on `java_api_library` does not appear
to be used it, along with the `api_surface` property on `droidstubs`
will eventually be passed down to Metalava and will reference an
API surface defined in the `build/soong/java/metalava/main-config.xml`.
That means that the values will need to be consistent.

The `droidstubs` `api_surface` property is set by `java_sdk_library` to
be the name of an `apiScope` which uses `-` as separator not `_`. So,
it is `module-lib` not `module_lib` and `system-server` not
`system_server`. This change fixes the explicitly specified
`api_surface` properties that use `_` instead of `-`.

Bug: 391554590
Test: m checkapi
Change-Id: If23af2717148c3ea15432a1fbce2c06c46c280ce
parent 9b828add

api/StubLibraries.bp

+3 −3
Original line number Original line Diff line number Diff line
@@ -648,7 +648,7 @@ java_api_library { 




java_api_library {

java_api_library {

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

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

    api_surface: "module_lib",

    api_surface: "module-lib",

    api_contributions: [

    api_contributions: [

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

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

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

        "system-api-stubs-docs-non-updatable.api.contribution",
@@ -668,7 +668,7 @@ java_api_library { 
// generated from this module, as this module is strictly used for hiddenapi only.

// generated from this module, as this module is strictly used for hiddenapi only.

java_api_library {

java_api_library {

    name: "android-non-updatable.stubs.test_module_lib",

    name: "android-non-updatable.stubs.test_module_lib",

    api_surface: "module_lib",

    api_surface: "module-lib",

    api_contributions: [

    api_contributions: [

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

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

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

        "system-api-stubs-docs-non-updatable.api.contribution",
@@ -689,7 +689,7 @@ java_api_library { 




java_api_library {

java_api_library {

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

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

    api_surface: "system_server",

    api_surface: "system-server",

    api_contributions: [

    api_contributions: [

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

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

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

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