diff --git a/cas/aidl/default/Android.bp b/cas/aidl/default/Android.bp index 9d094e0364..576016ef27 100644 --- a/cas/aidl/default/Android.bp +++ b/cas/aidl/default/Android.bp @@ -26,7 +26,6 @@ cc_library_static { "liblog", "libutils", "libcutils", - "libvndksupport", ], static_libs: [ "libaidlcommonsupport", @@ -44,39 +43,34 @@ cc_defaults { srcs: ["service.cpp"], - stl: "c++_static", static_libs: [ - "android.hardware.cas-V1-ndk", - "android.hardware.common-V2-ndk", "libaidlcommonsupport", - "libbase", "libcasexampleimpl", - "libcutils", - "libutils", ], shared_libs: [ + "android.hardware.cas-V1-ndk", + "libbase", "libbinder_ndk", "liblog", - "libvndksupport", + "libutils", + "libcutils", ], header_libs: ["media_plugin_headers"], + vintf_fragments: ["android.hardware.cas-service.xml"], } cc_binary { name: "android.hardware.cas-service.example", defaults: ["cas_service_example_defaults"], - // Installed in APEX - installable: false, + init_rc: ["cas-default.rc"], } -// TODO(b/297467514) Convert to VAPEX cc_binary { name: "android.hardware.cas-service.example-lazy", defaults: ["cas_service_example_defaults"], init_rc: ["cas-default-lazy.rc"], - vintf_fragments: ["android.hardware.cas-service.xml"], cflags: ["-DLAZY_SERVICE"], - overrides: ["com.android.hardware.cas"], + overrides: ["android.hardware.cas-service.example"], } cc_fuzz { @@ -90,7 +84,6 @@ cc_fuzz { "android.hardware.cas-V1-ndk", "libcutils", "liblog", - "libvndksupport", ], static_libs: [ "libaidlcommonsupport", @@ -101,34 +94,3 @@ cc_fuzz { componentid: 1344, }, } - -apex { - name: "com.android.hardware.cas", - manifest: "manifest.json", - file_contexts: "file_contexts", - key: "com.android.hardware.key", - certificate: ":com.android.hardware.certificate", - updatable: false, - vendor: true, - - binaries: [ - "android.hardware.cas-service.example", - ], - prebuilts: [ - "cas-default.rc", - "android.hardware.cas-service.xml", - ], -} - -prebuilt_etc { - name: "cas-default.rc", - src: "cas-default.rc", - installable: false, -} - -prebuilt_etc { - name: "android.hardware.cas-service.xml", - src: "android.hardware.cas-service.xml", - sub_dir: "vintf", - installable: false, -} diff --git a/cas/aidl/default/SharedLibrary.cpp b/cas/aidl/default/SharedLibrary.cpp index 6322ff303a..c12d17d0cd 100644 --- a/cas/aidl/default/SharedLibrary.cpp +++ b/cas/aidl/default/SharedLibrary.cpp @@ -19,7 +19,6 @@ #include "SharedLibrary.h" #include #include -#include namespace aidl { namespace android { @@ -27,12 +26,12 @@ namespace hardware { namespace cas { SharedLibrary::SharedLibrary(const String8& path) { - mLibHandle = android_load_sphal_library(path.c_str(), RTLD_NOW); + mLibHandle = dlopen(path.c_str(), RTLD_NOW); } SharedLibrary::~SharedLibrary() { if (mLibHandle != NULL) { - android_unload_sphal_library(mLibHandle); + dlclose(mLibHandle); mLibHandle = NULL; } } diff --git a/cas/aidl/default/cas-default.rc b/cas/aidl/default/cas-default.rc index 0ac7fe57eb..5a603687be 100644 --- a/cas/aidl/default/cas-default.rc +++ b/cas/aidl/default/cas-default.rc @@ -1,4 +1,4 @@ -service vendor.cas-default /apex/com.android.hardware.cas/bin/hw/android.hardware.cas-service.example +service vendor.cas-default /vendor/bin/hw/android.hardware.cas-service.example interface aidl android.hardware.cas.IMediaCasService/default class hal user media diff --git a/cas/aidl/default/file_contexts b/cas/aidl/default/file_contexts deleted file mode 100644 index 98bde537df..0000000000 --- a/cas/aidl/default/file_contexts +++ /dev/null @@ -1,3 +0,0 @@ -(/.*)? u:object_r:vendor_file:s0 -/etc(/.*)? u:object_r:vendor_configs_file:s0 -/bin/hw/android\.hardware\.cas-service\.example u:object_r:hal_cas_default_exec:s0 diff --git a/cas/aidl/default/manifest.json b/cas/aidl/default/manifest.json deleted file mode 100644 index 16b4f6710e..0000000000 --- a/cas/aidl/default/manifest.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "com.android.hardware.cas", - "version": 1, - // For CAS HAL to open plugins from /vendor/lib, "vendor" namespace should be imported. - // ":sphal" is an alias for the "vendor" namespace in Vendor APEX. - "requireNativeLibs": [ - ":sphal" - ] -}