diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-03-13 15:27:39 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2012-03-19 17:21:13 -0700 |
| commit | b948e6426a16e4cb4306f84b2acf280e9eb33305 (patch) | |
| tree | f954a520cc65877e147c0d1a29cb4eb44effb30c | |
| parent | 0e94fe6807e53920046fa83715af4788b844ca95 (diff) | |
| download | srec-b948e6426a16e4cb4306f84b2acf280e9eb33305.tar.gz | |
Add libmedia_native and remove obsolete libmedia
Change-Id: Ibaebc3c5fdf8b98a94a8b775a4e93add4fd379cf
| -rw-r--r-- | audio/AudioIn/UNIX/src/Android.mk | 1 | ||||
| -rw-r--r-- | audio/test/AudioHardwareRecord/Android.mk | 1 | ||||
| -rw-r--r-- | audio/test/AudioHardwareRecordLoop/Android.mk | 1 | ||||
| -rw-r--r-- | audio/test/AudioInRecord/Android.mk | 1 | ||||
| -rw-r--r-- | portable/Android.mk | 2 | ||||
| -rw-r--r-- | srec/test/SRecTestAudio/Android.mk | 1 | ||||
| -rw-r--r-- | srec_jni/Android.mk | 1 |
7 files changed, 2 insertions, 6 deletions
diff --git a/audio/AudioIn/UNIX/src/Android.mk b/audio/AudioIn/UNIX/src/Android.mk index 3ebffeb..f88ef7f 100644 --- a/audio/AudioIn/UNIX/src/Android.mk +++ b/audio/AudioIn/UNIX/src/Android.mk @@ -25,7 +25,6 @@ LOCAL_STATIC_LIBRARIES := \ libESR_Portable LOCAL_SHARED_LIBRARIES := \ - libmedia \ liblog LOCAL_MODULE:= libSR_AudioIn diff --git a/audio/test/AudioHardwareRecord/Android.mk b/audio/test/AudioHardwareRecord/Android.mk index 167e4ce..8b1b1f6 100644 --- a/audio/test/AudioHardwareRecord/Android.mk +++ b/audio/test/AudioHardwareRecord/Android.mk @@ -17,7 +17,6 @@ LOCAL_CFLAGS := \ LOCAL_SHARED_LIBRARIES := \ libsrec_jni \ - libmedia \ libutils \ libhardware_legacy \ libSR_AudioIn \ diff --git a/audio/test/AudioHardwareRecordLoop/Android.mk b/audio/test/AudioHardwareRecordLoop/Android.mk index 8875d01..018b2d3 100644 --- a/audio/test/AudioHardwareRecordLoop/Android.mk +++ b/audio/test/AudioHardwareRecordLoop/Android.mk @@ -17,7 +17,6 @@ LOCAL_CFLAGS := \ LOCAL_SHARED_LIBRARIES := \ libsrec_jni \ - libmedia \ libutils \ libhardware_legacy \ libSR_AudioIn \ diff --git a/audio/test/AudioInRecord/Android.mk b/audio/test/AudioInRecord/Android.mk index 38f1ea5..82803a0 100644 --- a/audio/test/AudioInRecord/Android.mk +++ b/audio/test/AudioInRecord/Android.mk @@ -18,7 +18,6 @@ LOCAL_CFLAGS := \ LOCAL_SHARED_LIBRARIES := \ libutils \ libhardware_legacy \ - libmedia \ libsrec_jni \ libSR_AudioIn \ diff --git a/portable/Android.mk b/portable/Android.mk index a66f687..00376b2 100644 --- a/portable/Android.mk +++ b/portable/Android.mk @@ -68,7 +68,7 @@ LOCAL_SRC_FILES := $(common_SRC_FILES) LOCAL_C_INCLUDES := $(common_C_INCLUDES) LOCAL_CFLAGS += $(common_CFLAGS) -LOCAL_SHARED_LIBRARIES := libcutils libmedia +LOCAL_SHARED_LIBRARIES := libcutils LOCAL_MODULE := $(common_TARGET) diff --git a/srec/test/SRecTestAudio/Android.mk b/srec/test/SRecTestAudio/Android.mk index 8b16499..48a3b7f 100644 --- a/srec/test/SRecTestAudio/Android.mk +++ b/srec/test/SRecTestAudio/Android.mk @@ -37,7 +37,6 @@ LOCAL_CFLAGS += \ LOCAL_SHARED_LIBRARIES := \ libutils \ libhardware_legacy \ - libmedia \ libsrec_jni \ libSR_AudioIn \ diff --git a/srec_jni/Android.mk b/srec_jni/Android.mk index 2de3283..81035ed 100644 --- a/srec_jni/Android.mk +++ b/srec_jni/Android.mk @@ -44,6 +44,7 @@ LOCAL_SHARED_LIBRARIES := \ libhardware_legacy \ libcutils \ libmedia \ + libmedia_native LOCAL_STATIC_LIBRARIES := \ |