Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Specify version for aidl_interface explicitly"

Browse Source
This commit is contained in:
Treehugger Robot
2021-02-09 00:16:15 +00:00
committed by Gerrit Code Review
parent 033681de6b ddd4aa0a18
commit 5968a3906e
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Android.bp
View File

@@ -484,7 +484,7 @@ java_library {
"android.hardware.vibrator-V1.3-java",
"android.security.apc-java",
"android.security.authorization-java",
"android.system.keystore2-java",
"android.system.keystore2-V1-java",
"android.system.suspend.control.internal-java",
"devicepolicyprotosnano",

10
services/core/Android.bp
View File

@@ -95,9 +95,9 @@ java_library_static {
libs: [
"services.net",
"android.hardware.light-V2.0-java",
"android.hardware.power-java",
"android.hardware.power-V1-java",
"android.hardware.power-V1.0-java",
"android.hardware.vibrator-java",
"android.hardware.vibrator-V1-java",
"android.net.ipsec.ike.stubs.module_lib",
"app-compat-annotations",
"framework-tethering.stubs.module_lib",
@@ -120,7 +120,7 @@ java_library_static {
"android.hardware.health-V1.0-java",
"android.hardware.health-V2.0-java",
"android.hardware.health-V2.1-java",
"android.hardware.light-java",
"android.hardware.light-V1-java",
"android.hardware.tv.cec-V1.0-java",
"android.hardware.weaver-V1.0-java",
"android.hardware.biometrics.face-V1.0-java",
@@ -128,11 +128,11 @@ java_library_static {
"android.hardware.oemlock-V1.0-java",
"android.hardware.configstore-V1.0-java",
"android.hardware.contexthub-V1.0-java",
"android.hardware.rebootescrow-java",
"android.hardware.rebootescrow-V1-java",
"android.hardware.soundtrigger-V2.3-java",
"android.hidl.manager-V1.2-java",
"capture_state_listener-aidl-java",
"dnsresolver_aidl_interface-java",
"dnsresolver_aidl_interface-V7-java",
"icu4j_calendar_astronomer",
"netd-client",
"overlayable_policy_aidl-java",

6
services/core/jni/Android.bp
View File

@@ -147,11 +147,11 @@ cc_defaults {
"android.hardware.light@2.0",
"android.hardware.power@1.0",
"android.hardware.power@1.1",
"android.hardware.power-cpp",
"android.hardware.power-V1-cpp",
"android.hardware.power.stats@1.0",
"android.hardware.thermal@1.0",
"android.hardware.tv.input@1.0",
"android.hardware.vibrator-cpp",
"android.hardware.vibrator-V1-cpp",
"android.hardware.vibrator@1.0",
"android.hardware.vibrator@1.1",
"android.hardware.vibrator@1.2",
@@ -160,7 +160,7 @@ cc_defaults {
"android.frameworks.schedulerservice@1.0",
"android.frameworks.sensorservice@1.0",
"android.frameworks.stats@1.0",
"android.system.suspend.control-cpp",
"android.system.suspend.control-V1-cpp",
"android.system.suspend.control.internal-cpp",
"android.system.suspend@1.0",
"service.incremental",

6
services/incremental/Android.bp
View File

@@ -51,9 +51,9 @@ cc_defaults {
static_libs: [
"libbase",
"libext2_uuid",
"libdataloader_aidl-unstable-cpp",
"libincremental_aidl-unstable-cpp",
"libincremental_manager_aidl-unstable-cpp",
"libdataloader_aidl-cpp",
"libincremental_aidl-cpp",
"libincremental_manager_aidl-cpp",
"libprotobuf-cpp-lite",
"service.incremental.proto",
"libutils",

2
services/tests/servicestests/Android.bp
View File

@@ -82,7 +82,7 @@ android_test {
"libui",
"libunwindstack",
"libutils",
"netd_aidl_interface-cpp",
"netd_aidl_interface-V5-cpp",
],
dxflags: ["--multi-dex"],

2
services/tests/uiservicestests/Android.bp
View File

@@ -57,6 +57,6 @@ android_test {
"libui",
"libunwindstack",
"libutils",
"netd_aidl_interface-cpp",
"netd_aidl_interface-V5-cpp",
],
}