Only use libbinder_ndk for aidl service.
[ Merged from http://go/wvgerrit/151169 ] Test: Netflix and Google TV streaming and downloaded playback Test: unit tests Test: atest VtsAidlHalDrmTargetTest Test: adb shell readelf -d /vendor/bin/hw/android.hardware.drm-service.widevine Test: adb shell readelf -d /vendor/lib64/libwvaidl.so Bug: 230791937 Change-Id: Ia60d9fc838bf228b40d99b076a837ae789fa2d03
This commit is contained in:
@@ -107,10 +107,10 @@ cc_defaults {
|
||||
"android.hardware.drm@1.2",
|
||||
"android.hardware.drm@1.3",
|
||||
"libbase",
|
||||
"libbinder",
|
||||
"libhidlbase",
|
||||
"liblog",
|
||||
"libutils",
|
||||
"libbinder",
|
||||
],
|
||||
}
|
||||
|
||||
@@ -131,7 +131,6 @@ cc_defaults {
|
||||
"libbase",
|
||||
"libbinder_ndk",
|
||||
"liblog",
|
||||
"libhwbinder",
|
||||
"libutils",
|
||||
"libwvaidl",
|
||||
],
|
||||
@@ -261,7 +260,11 @@ cc_binary {
|
||||
|
||||
srcs: ["aidl_src/service.cpp"],
|
||||
|
||||
shared_libs: ["libbinder"],
|
||||
include_dirs: [
|
||||
"frameworks/native/libs/binder/include",
|
||||
],
|
||||
|
||||
shared_libs: ["libbinder_ndk"],
|
||||
|
||||
init_rc: ["aidl_src/android.hardware.drm-service.widevine.rc"],
|
||||
vintf_fragments: ["manifest_android.hardware.drm-service.widevine.xml"],
|
||||
@@ -280,7 +283,11 @@ cc_binary {
|
||||
|
||||
srcs: ["aidl_src/serviceLazy.cpp"],
|
||||
|
||||
shared_libs: ["libbinder"],
|
||||
include_dirs: [
|
||||
"frameworks/native/libs/binder/include",
|
||||
],
|
||||
|
||||
shared_libs: ["libbinder_ndk"],
|
||||
|
||||
init_rc: ["aidl_src/android.hardware.drm-service-lazy.widevine.rc"],
|
||||
vintf_fragments: ["manifest_android.hardware.drm-service.widevine.xml"],
|
||||
@@ -324,7 +331,7 @@ cc_library_static {
|
||||
],
|
||||
|
||||
shared_libs: [
|
||||
"libbinder",
|
||||
"libbinder_ndk",
|
||||
"libcrypto",
|
||||
"libhidlbase",
|
||||
"liblog",
|
||||
@@ -358,7 +365,7 @@ cc_library_static {
|
||||
],
|
||||
|
||||
shared_libs: [
|
||||
"libbinder",
|
||||
"libbinder_ndk",
|
||||
"libcrypto",
|
||||
"libhidlbase",
|
||||
"liblog",
|
||||
@@ -520,7 +527,6 @@ cc_library_shared {
|
||||
shared_libs: [
|
||||
"android.hardware.drm-V1-ndk",
|
||||
"libbase",
|
||||
"libbinder",
|
||||
"libbinder_ndk",
|
||||
"libcrypto",
|
||||
"libcutils",
|
||||
|
||||
Reference in New Issue
Block a user