diff options
| author | 2024-08-03 02:07:58 +0000 | |
|---|---|---|
| committer | 2024-08-03 02:07:58 +0000 | |
| commit | 24c4140e90ab791b423668a9903f62f50fceef1d (patch) | |
| tree | 3c73f1483bed03df35d7f2227b886b3ffb21cedb | |
| parent | 5f08fdcb4c651400dd629f2dbb801f3cff36996e (diff) | |
| parent | 062315a12a45c9df8077681abca22b1a4a9dba4e (diff) | |
Merge "Specify the sdk_version of "services-non-updatable-stubs"" into main am: 7df0205585 am: 062315a12a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3205752
Change-Id: I096afa6ed6e1868f46b6e627e3e70b6e1e23c36d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/Android.bp | 6 | ||||
| -rw-r--r-- | services/core/Android.bp | 19 |
2 files changed, 19 insertions, 6 deletions
diff --git a/services/Android.bp b/services/Android.bp index dce6aa71daea..ded7379ad487 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -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", @@ -377,4 +379,8 @@ non_updatable_exportable_droidstubs { }, }, api_surface: "system-server", + sdk_version: "module_current", + libs: [ + "framework-annotations-lib", + ], } diff --git a/services/core/Android.bp b/services/core/Android.bp index 363c1d8c5f04..89d796177da2 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -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: [ @@ -120,14 +132,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", |