Merge "Remove libbinder dependency from libcodec2_vndk and... (c5386791) · Commits · e / os / android_frameworks_av

media/codec2/hidl/1.0/utils/Android.bp

+1 −0

+0 −1

Original line number	Diff line number	Diff line
		@@ -56,7 +56,6 @@ cc_library_shared {
		"android.hardware.graphics.mapper@3.0",
		"android.hardware.media.bufferpool@2.0",
		"libbase",
		"libbinder",
		"libcutils",
		"libdl",
		"libhardware",

+6 −1

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@

		#include "AMessage.h"

		#include <binder/Parcel.h>
		#include <log/log.h>

		#include "AAtomizer.h"
		@@ -34,6 +33,10 @@

		#include <media/stagefright/foundation/hexdump.h>

		#ifndef __ANDROID_VNDK__
		#include <binder/Parcel.h>
		#endif

		namespace android {

		extern ALooperRoster gLooperRoster;
		@@ -643,6 +646,7 @@ AString AMessage::debugString(int32_t indent) const {
		return s;
		}

		#ifndef __ANDROID_VNDK__
		// static
		sp<AMessage> AMessage::FromParcel(const Parcel &parcel, size_t maxNestingLevel) {
		int32_t what = parcel.readInt32();
		@@ -809,6 +813,7 @@ void AMessage::writeToParcel(Parcel *parcel) const {
		}
		}
		}
		#endif // __ANDROID_VNDK__

		sp<AMessage> AMessage::changesFrom(const sp<const AMessage> &other, bool deep) const {
		if (other == NULL) {

+6 −1

Original line number	Diff line number	Diff line
		@@ -23,11 +23,14 @@
		#include <stdlib.h>
		#include <string.h>

		#include <binder/Parcel.h>
		#include <utils/String8.h>
		#include "ADebug.h"
		#include "AString.h"

		#ifndef __ANDROID_VNDK__
		#include <binder/Parcel.h>
		#endif

		namespace android {

		// static
		@@ -362,6 +365,7 @@ bool AString::endsWithIgnoreCase(const char *suffix) const {
		return !strcasecmp(mData + mSize - suffixLen, suffix);
		}

		#ifndef __ANDROID_VNDK__
		// static
		AString AString::FromParcel(const Parcel &parcel) {
		size_t size = static_cast<size_t>(parcel.readInt32());
		@@ -376,6 +380,7 @@ status_t AString::writeToParcel(Parcel *parcel) const {
		}
		return err;
		}
		#endif

		AString AStringPrintf(const char *format, ...) {
		va_list ap;

+11 −0