Merge "Remove mediametrics include symlinks" (52776252) · Commits · e / os / android_frameworks_av

cmds/screenrecord/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ cc_binary {

		header_libs: [
		"libmediadrm_headers",
		"libmediametrics_headers",
		],

		shared_libs: [

cmds/stagefright/Android.mk

+20 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,9 @@ LOCAL_SRC_FILES:= \
		jpeg.cpp \
		SineSource.cpp

		LOCAL_HEADER_LIBRARIES := \
		libmediametrics_headers \

		LOCAL_SHARED_LIBRARIES := \
		libstagefright libmedia libmedia_codeclist libutils libbinder \
		libstagefright_foundation libjpeg libui libgui libcutils liblog \
		@@ -37,6 +40,9 @@ LOCAL_SRC_FILES:= \
		SineSource.cpp \
		record.cpp

		LOCAL_HEADER_LIBRARIES := \
		libmediametrics_headers \

		LOCAL_SHARED_LIBRARIES := \
		libstagefright libmedia liblog libutils libbinder \
		libstagefright_foundation libdatasource libaudioclient
		@@ -63,6 +69,9 @@ LOCAL_SRC_FILES:= \
		AudioPlayer.cpp \
		recordvideo.cpp

		LOCAL_HEADER_LIBRARIES := \
		libmediametrics_headers \

		LOCAL_SHARED_LIBRARIES := \
		libstagefright libmedia liblog libutils libbinder \
		libstagefright_foundation libaudioclient
		@@ -90,6 +99,9 @@ LOCAL_SRC_FILES:= \
		SineSource.cpp \
		audioloop.cpp

		LOCAL_HEADER_LIBRARIES := \
		libmediametrics_headers \

		LOCAL_SHARED_LIBRARIES := \
		libstagefright libmedia liblog libutils libbinder \
		libstagefright_foundation libaudioclient
		@@ -113,6 +125,9 @@ include $(CLEAR_VARS)
		LOCAL_SRC_FILES:= \
		stream.cpp \

		LOCAL_HEADER_LIBRARIES := \
		libmediametrics_headers \

		LOCAL_SHARED_LIBRARIES := \
		libstagefright liblog libutils libbinder libui libgui \
		libstagefright_foundation libmedia libcutils libdatasource
		@@ -139,6 +154,7 @@ LOCAL_SRC_FILES:= \

		LOCAL_HEADER_LIBRARIES := \
		libmediadrm_headers \
		libmediametrics_headers \

		LOCAL_SHARED_LIBRARIES := \
		libstagefright liblog libutils libbinder libstagefright_foundation \
		@@ -168,6 +184,7 @@ LOCAL_SRC_FILES:= \

		LOCAL_HEADER_LIBRARIES := \
		libmediadrm_headers \
		libmediametrics_headers \

		LOCAL_SHARED_LIBRARIES := \
		libstagefright \
		@@ -209,6 +226,9 @@ include $(CLEAR_VARS)
		LOCAL_SRC_FILES:= \
		muxer.cpp \

		LOCAL_HEADER_LIBRARIES := \
		libmediametrics_headers \

		LOCAL_SHARED_LIBRARIES := \
		libstagefright liblog libutils libbinder libstagefright_foundation \
		libcutils libc

drm/libmediadrm/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -167,6 +167,7 @@ cc_library_shared {
		],

		header_libs: [
		"libmediametrics_headers",
		"libstagefright_foundation_headers",
		],
		}

drm/libmediadrm/tests/Android.bp

+6 −2

Original line number	Diff line number	Diff line
		@@ -3,7 +3,10 @@
		cc_test {
		name: "CounterMetric_test",
		srcs: ["CounterMetric_test.cpp"],
		header_libs: ["libmedia_headers"],
		header_libs: [
		"libmedia_headers",
		"libmediametrics_headers",
		],
		shared_libs: ["libmediadrm"],
		cflags: [
		"-Werror",
		@@ -46,7 +49,8 @@ cc_test {
		name: "EventMetric_test",
		srcs: ["EventMetric_test.cpp"],
		header_libs: [
		"libmedia_headers"
		"libmedia_headers",
		"libmediametrics_headers",
		],
		shared_libs: [
		"liblog",

include/media/IMediaMetricsService.h

deleted120000 → 0

+0 −1

Original line number	Diff line number	Diff line
		../../media/libmediametrics/include/IMediaMetricsService.h
		No newline at end of file