Merge "Replace include_dirs with header_libs" (f3fa3413) · Commits · e / os / android_frameworks_av

drm/libmediadrm/Android.bp

+1 −4

Original line number	Diff line number	Diff line
		@@ -168,10 +168,6 @@ cc_library_shared {
		"DrmMetricsConsumer.cpp",
		],

		include_dirs: [
		"frameworks/av/media/libmedia/include"
		],

		shared_libs: [
		"android.hardware.drm@1.0",
		"android.hardware.drm@1.1",
		@@ -187,5 +183,6 @@ cc_library_shared {
		header_libs: [
		"libmediametrics_headers",
		"libstagefright_foundation_headers",
		"libmedia_headers",
		],
		}

+7 −4

Original line number	Diff line number	Diff line
		@@ -101,6 +101,10 @@ cc_library_static {

		//###############################################################################

		// 2022-01-13: this is stale; it's been disabled for 5 years.
		// test references UDPPusher and ARTPSession, neither of which is built into
		// libstagefright_rtsp
		//
		cc_test {
		name: "rtp_test",
		gtest: false,
		@@ -119,10 +123,9 @@ cc_test {

		static_libs: ["libstagefright_rtsp"],

		include_dirs: [
		"frameworks/av/media/libstagefright",
		"frameworks/av/cmds/stagefright",
		"frameworks/native/include/media/openmax",
		header_libs: [
		"libstagefright_headers",
		"libstagefright_rtsp_headers",
		],

		cflags: [

+2 −2

Original line number	Diff line number	Diff line
		@@ -182,7 +182,7 @@ int main(int argc, char **argv) {
		CHECK_EQ(decoder->start(), (status_t)OK);

		for (;;) {
		MediaBuffer *buffer;
		MediaBufferBase *buffer;
		status_t err = decoder->read(&buffer);

		if (err != OK) {
		@@ -201,7 +201,7 @@ int main(int argc, char **argv) {
		#if 1
		if (buffer->range_length() != 0) {
		int64_t timeUs;
		CHECK(buffer->meta_data()->findInt64(kKeyTime, &timeUs));
		CHECK(buffer->meta_data().findInt64(kKeyTime, &timeUs));

		printf("decoder returned frame of size %zu at time %.2f secs\n",
		buffer->range_length(), timeUs / 1E6);