Merge "Set minsdk for AIDL libs to 31" into main (71b17f99) · Commits · e / os / android_frameworks_av

media/codec2/hal/aidl/Android.bp

+5 −3

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@ package {
		// use libcodec2-aidl-client-defaults instead
		cc_library {
		name: "libcodec2_aidl_client",
		min_sdk_version: "31",

		srcs: [
		"BufferTypes.cpp",
		@@ -53,8 +54,8 @@ cc_library {
		// use libcodec2-aidl-defaults instead
		cc_library {
		name: "libcodec2_aidl",
		min_sdk_version: "31",
		vendor_available: true,
		min_sdk_version: "34",
		apex_available: [
		"//apex_available:platform",
		"com.android.media.swcodec",
		@@ -131,11 +132,12 @@ cc_library {
		// public dependency for Codec 2.0 HAL service implementations
		cc_defaults {
		name: "libcodec2-aidl-defaults",
		min_sdk_version: "34",
		min_sdk_version: "31",
		defaults: ["libcodec2-impl-defaults"],

		shared_libs: [
		"android.hardware.media.c2-V1-ndk",
		"libbinder_ndk",
		"libcodec2_aidl",
		],
		}
		@@ -143,7 +145,7 @@ cc_defaults {
		// public dependency for Codec 2.0 HAL client
		cc_defaults {
		name: "libcodec2-aidl-client-defaults",
		min_sdk_version: "34",
		min_sdk_version: "31",
		defaults: ["libcodec2-impl-defaults"],

		shared_libs: [

+16 −12

Original line number	Diff line number	Diff line
		@@ -301,7 +301,7 @@ ScopedAStatus Component::createBlockPool(
		switch (allocator.getTag()) {
		case ALLOCATOR_ID:
		#ifdef __ANDROID_APEX__
		status = CreateCodec2BlockPool(
		status = ::android::CreateCodec2BlockPool(
		static_cast<::android::C2PlatformAllocatorStore::id_t>(
		allocator.get<ALLOCATOR_ID>()),
		mComponent,
		@@ -405,6 +405,7 @@ ScopedAStatus Component::configureVideoTunnel(
		}

		void Component::initListener(const std::shared_ptr<Component>& self) {
		if (__builtin_available(android __ANDROID_API_T__, *)) {
		std::shared_ptr<C2Component::Listener> c2listener =
		std::make_shared<Listener>(self);
		c2_status_t res = mComponent->setListener_vb(c2listener, C2_DONT_BLOCK);
		@@ -417,6 +418,9 @@ void Component::initListener(const std::shared_ptr<Component>& self) {
		mDeathContext = new DeathContext{weak_from_this()};
		AIBinder_DeathRecipient_setOnUnlinked(mDeathRecipient.get(), OnBinderUnlinked);
		AIBinder_linkToDeath(mListener->asBinder().get(), mDeathRecipient.get(), mDeathContext);
		} else {
		mInit = C2_NO_INIT;
		}
		}

		// static

+3 −0

Original line number	Diff line number	Diff line
		@@ -51,8 +51,11 @@ namespace media {
		namespace c2 {
		namespace utils {

		#ifndef __ANDROID_APEX__
		using ::android::DefaultFilterPlugin;
		using ::android::FilterWrapper;
		#endif

		using ::ndk::ScopedAStatus;

		namespace /* unnamed */ {