diff options
| author | Dan Albert <danalbert@google.com> | 2016-02-03 02:22:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-02-03 02:22:19 +0000 |
| commit | f2f846e7954feda38749e0fce1cfe5814d9c396a (patch) | |
| tree | 67e5986ecae9cd629dc818ff97766d8da976218d | |
| parent | 915e510b85c4aef69f22f88051571b5a9fb2dd29 (diff) | |
| parent | f2d9ad053ae3a1b3650bb51c8940be9c9aab3dc0 (diff) | |
| download | libhardware_legacy-brillo-m10-dev.tar.gz | |
Merge "Make libhardware_legacy warning clean."android-n-preview-2android-n-preview-1brillo-m10-releasebrillo-m10-dev
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | audio/Android.mk | 2 | ||||
| -rw-r--r-- | audio/AudioPolicyManagerBase.cpp | 4 | ||||
| -rw-r--r-- | audio/audio_hw_hal.cpp | 4 | ||||
| -rw-r--r-- | qemu/qemu.c | 2 |
5 files changed, 8 insertions, 6 deletions
@@ -14,7 +14,7 @@ LOCAL_SHARED_LIBRARIES := libcutils liblog LOCAL_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include -LOCAL_CFLAGS += -DQEMU_HARDWARE +LOCAL_CFLAGS += -DQEMU_HARDWARE -Wno-unused-parameter -Wno-gnu-designator QEMU_HARDWARE := true LOCAL_SHARED_LIBRARIES += libdl diff --git a/audio/Android.mk b/audio/Android.mk index 3518bad..b3040d7 100644 --- a/audio/Android.mk +++ b/audio/Android.mk @@ -12,7 +12,7 @@ LOCAL_SRC_FILES := \ LOCAL_MODULE := libaudiohw_legacy LOCAL_STATIC_LIBRARIES := libmedia_helper -LOCAL_CFLAGS := -Wno-unused-parameter +LOCAL_CFLAGS := -Wno-unused-parameter -Wno-gnu-designator LOCAL_C_INCLUDES := $(LOCAL_PATH)/../include LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include diff --git a/audio/AudioPolicyManagerBase.cpp b/audio/AudioPolicyManagerBase.cpp index 5774db2..60790b7 100644 --- a/audio/AudioPolicyManagerBase.cpp +++ b/audio/AudioPolicyManagerBase.cpp @@ -2091,7 +2091,7 @@ status_t AudioPolicyManagerBase::checkInputsForDevice(audio_devices_t device, { if (mHwModules[module_index]->mInputProfiles[profile_index]->mSupportedDevices & (device & ~AUDIO_DEVICE_BIT_IN)) { - ALOGV("checkInputsForDevice(): adding profile %d from module %d", + ALOGV("checkInputsForDevice(): adding profile %zu from module %zu", profile_index, module_index); profiles.add(mHwModules[module_index]->mInputProfiles[profile_index]); } @@ -2218,7 +2218,7 @@ status_t AudioPolicyManagerBase::checkInputsForDevice(audio_devices_t device, { IOProfile *profile = mHwModules[module_index]->mInputProfiles[profile_index]; if (profile->mSupportedDevices & device) { - ALOGV("checkInputsForDevice(): clearing direct input profile %d on module %d", + ALOGV("checkInputsForDevice(): clearing direct input profile %zu on module %zu", profile_index, module_index); if (profile->mSamplingRates[0] == 0) { profile->mSamplingRates.clear(); diff --git a/audio/audio_hw_hal.cpp b/audio/audio_hw_hal.cpp index 7949a90..d15044a 100644 --- a/audio/audio_hw_hal.cpp +++ b/audio/audio_hw_hal.cpp @@ -28,6 +28,8 @@ namespace android_audio_legacy { +class AudioHardwareInterface; + extern "C" { struct legacy_audio_module { @@ -37,7 +39,7 @@ struct legacy_audio_module { struct legacy_audio_device { struct audio_hw_device device; - struct AudioHardwareInterface *hwif; + AudioHardwareInterface *hwif; }; struct legacy_stream_out { diff --git a/qemu/qemu.c b/qemu/qemu.c index 739976f..83495e5 100644 --- a/qemu/qemu.c +++ b/qemu/qemu.c @@ -278,7 +278,7 @@ qemu_command_format( char* buffer, int ret; va_start(args, format); - ret = qemu_command_format(buffer, buffer_size, format, args); + ret = qemu_command_vformat(buffer, buffer_size, format, args); va_end(args); return ret; } |