diff options
| author | Colin Cross <ccross@android.com> | 2014-04-24 08:39:41 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2014-04-24 08:39:41 -0700 |
| commit | b10621c1f15d7b57d1ecf15efea6cd00f593dadc (patch) | |
| tree | 4ade65312da54aba350d1ed477da1c5ae54e519d /audio/Android.mk | |
| parent | a75f4ba5c2b98d5ccf7cab5196ce43a798acd1d4 (diff) | |
| parent | 75402fdbdd0bb9de19370eb19c3a669c6d730898 (diff) | |
| download | hardware_libhardware_legacy-b10621c1f15d7b57d1ecf15efea6cd00f593dadc.zip hardware_libhardware_legacy-b10621c1f15d7b57d1ecf15efea6cd00f593dadc.tar.gz hardware_libhardware_legacy-b10621c1f15d7b57d1ecf15efea6cd00f593dadc.tar.bz2 | |
resolved conflicts for merge of 75402fdb to master
Change-Id: Ie85a3c7d498d7685738190267916e9a205cc469e
Diffstat (limited to 'audio/Android.mk')
| -rw-r--r-- | audio/Android.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/audio/Android.mk b/audio/Android.mk index 36a387a..eaf5a6b 100644 --- a/audio/Android.mk +++ b/audio/Android.mk @@ -13,7 +13,7 @@ LOCAL_SRC_FILES := \ LOCAL_MODULE := libaudiohw_legacy LOCAL_MODULE_TAGS := optional LOCAL_STATIC_LIBRARIES := libmedia_helper -LOCAL_32_BIT_ONLY := true +LOCAL_CFLAGS := -Wno-unused-parameter include $(BUILD_STATIC_LIBRARY) @@ -31,7 +31,7 @@ endif LOCAL_STATIC_LIBRARIES := libmedia_helper LOCAL_MODULE := libaudiopolicy_legacy LOCAL_MODULE_TAGS := optional -LOCAL_32_BIT_ONLY := true +LOCAL_CFLAGS += -Wno-unused-parameter include $(BUILD_STATIC_LIBRARY) @@ -56,7 +56,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \ LOCAL_MODULE := audio_policy.default LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_MODULE_TAGS := optional -LOCAL_32_BIT_ONLY := true +LOCAL_CFLAGS := -Wno-unused-parameter include $(BUILD_SHARED_LIBRARY) |