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

Commit fcc577c0 authored by Jihoon Kang's avatar Jihoon Kang
Browse files

Specify the sdk_version of "services-non-updatable-stubs" 

This change modifies the sdk_version of services-non-updatable-stubs
from "private" to "module_lib".

Implementation details:
- Create the filegroup of services aidl sources and pass as sources of
  services-non-updatable-stubs. Note that this does not affect the
  generated stubs and the api files as the aidl sources are not within
  "com.android." package
- Specify the sdk_version and pass "framework-annotations-lib" as libs

Test: m services-non-updatable-stubs-check-current-api
Test: BUILD_FROM_SOURCE_STUBS=true m nothing
Bug: 327507877
Change-Id: I2a51da40d5ec374dff73029657c7874f9cec8413
parent 303564b4

services/Android.bp

+6 −0
Original line number Diff line number Diff line
@@ -108,6 +108,8 @@ filegroup { 
filegroup {

    name: "services-non-updatable-sources",

    srcs: [

        ":incremental_aidl",

        ":services.core-aidl-sources",

        ":services.core-sources",

        ":services.core-sources-am-wm",

        "core/java/com/android/server/am/package.html",
@@ -356,4 +358,8 @@ non_updatable_exportable_droidstubs { 
        },

    },

    api_surface: "system-server",

    sdk_version: "module_current",

    libs: [

        "framework-annotations-lib",

    ],

}

services/core/Android.bp

+13 −6
Original line number Diff line number Diff line
@@ -30,6 +30,18 @@ filegroup { 
    ],

}



filegroup {

    name: "services.core-aidl-sources",

    srcs: [

        ":dumpstate_aidl",

        ":framework_native_aidl",

        ":gsiservice_aidl",

        ":installd_aidl",

        ":storaged_aidl",

        ":vold_aidl",

    ],

}



java_library_static {

    name: "services-config-update",

    srcs: [
@@ -151,14 +163,9 @@ java_library_static { 
        ":android.hardware.tv.hdmi.earc-V1-java-source",

        ":statslog-art-java-gen",

        ":statslog-contexthub-java-gen",

        ":services.core-aidl-sources",

        ":services.core-sources",

        ":services.core.protologsrc",

        ":dumpstate_aidl",

        ":framework_native_aidl",

        ":gsiservice_aidl",

        ":installd_aidl",

        ":storaged_aidl",

        ":vold_aidl",

        ":platform-compat-config",

        ":platform-compat-overrides",

        ":display-device-config",