Merge "Fix implicit fallthrough warnings." (50c56733) · Commits · e / os / android_frameworks_av

media/libaudioprocessing/tests/Android.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,8 @@ LOCAL_C_INCLUDES := \
		LOCAL_SRC_FILES := \
		resampler_tests.cpp

		LOCAL_HEADER_LIBRARIES := libbase_headers

		LOCAL_MODULE := resampler_tests

		LOCAL_MODULE_TAGS := tests
		@@ -49,6 +51,8 @@ LOCAL_SHARED_LIBRARIES := \
		liblog \
		libutils \

		LOCAL_HEADER_LIBRARIES := libbase_headers

		LOCAL_MODULE := test-mixer

		LOCAL_MODULE_TAGS := optional

+3 −2

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

		#include <log/log.h>

		#include <android-base/macros.h>
		#include <audio_utils/sndfile.h>

		#ifndef ARRAY_SIZE
		@@ -77,14 +78,14 @@ static inline int parseCSV(const char *string, std::vector<int>& values)
		}
		return numValues;
		}
		// fall through
		FALLTHROUGH_INTENDED;
		case ',':
		if (hadDigit) {
		hadDigit = false;
		numValues++;
		break;
		}
		// fall through
		FALLTHROUGH_INTENDED;
		default:
		return -1;
		}