diff options
| author | Andreas Huber <andih@google.com> | 2010-03-18 14:30:46 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2010-03-18 14:30:46 -0700 |
| commit | fe309b0ab78830a1d278eb9e279f321b46b0b85e (patch) | |
| tree | 84278d54198b3c5217aaa6db244b16d6b3da7c51 | |
| parent | ecc8abf047fb7351d8266a925076ac13672a4395 (diff) | |
| download | srec-fe309b0ab78830a1d278eb9e279f321b46b0b85e.tar.gz | |
Revert "Make libSR_AudioIn a shared library."
This reverts commit ecc8abf047fb7351d8266a925076ac13672a4395.
| -rw-r--r-- | audio/AudioIn/UNIX/src/Android.mk | 4 | ||||
| -rw-r--r-- | audio/test/AudioHardwareRecord/Android.mk | 4 | ||||
| -rw-r--r-- | audio/test/AudioHardwareRecordLoop/Android.mk | 4 | ||||
| -rw-r--r-- | audio/test/AudioInRecord/Android.mk | 6 | ||||
| -rw-r--r-- | srec/test/SRecTestAudio/Android.mk | 6 |
5 files changed, 15 insertions, 9 deletions
diff --git a/audio/AudioIn/UNIX/src/Android.mk b/audio/AudioIn/UNIX/src/Android.mk index dc291c1..2b80e76 100644 --- a/audio/AudioIn/UNIX/src/Android.mk +++ b/audio/AudioIn/UNIX/src/Android.mk @@ -21,8 +21,6 @@ LOCAL_CFLAGS += \ $(ASR_GLOBAL_DEFINES) \ $(ASR_GLOBAL_CPPFLAGS) \ -LOCAL_PRELINK_MODULE:= false - LOCAL_MODULE:= libSR_AudioIn -include $(BUILD_SHARED_LIBRARY) +include $(BUILD_STATIC_LIBRARY) diff --git a/audio/test/AudioHardwareRecord/Android.mk b/audio/test/AudioHardwareRecord/Android.mk index 167e4ce..a2150b5 100644 --- a/audio/test/AudioHardwareRecord/Android.mk +++ b/audio/test/AudioHardwareRecord/Android.mk @@ -20,7 +20,9 @@ LOCAL_SHARED_LIBRARIES := \ libmedia \ libutils \ libhardware_legacy \ - libSR_AudioIn \ + +LOCAL_STATIC_LIBRARIES := \ + libSR_AudioIn LOCAL_MODULE:= AudioHardwareRecord diff --git a/audio/test/AudioHardwareRecordLoop/Android.mk b/audio/test/AudioHardwareRecordLoop/Android.mk index 8875d01..2d704cc 100644 --- a/audio/test/AudioHardwareRecordLoop/Android.mk +++ b/audio/test/AudioHardwareRecordLoop/Android.mk @@ -20,7 +20,9 @@ LOCAL_SHARED_LIBRARIES := \ libmedia \ libutils \ libhardware_legacy \ - libSR_AudioIn \ + +LOCAL_STATIC_LIBRARIES := \ + libSR_AudioIn LOCAL_MODULE:= AudioHardwareRecordLoop diff --git a/audio/test/AudioInRecord/Android.mk b/audio/test/AudioInRecord/Android.mk index 38f1ea5..8a46415 100644 --- a/audio/test/AudioInRecord/Android.mk +++ b/audio/test/AudioInRecord/Android.mk @@ -19,8 +19,10 @@ LOCAL_SHARED_LIBRARIES := \ libutils \ libhardware_legacy \ libmedia \ - libsrec_jni \ - libSR_AudioIn \ + libsrec_jni + +LOCAL_STATIC_LIBRARIES := \ + libSR_AudioIn LOCAL_MODULE:= AudioInRecord diff --git a/srec/test/SRecTestAudio/Android.mk b/srec/test/SRecTestAudio/Android.mk index 8b16499..5139181 100644 --- a/srec/test/SRecTestAudio/Android.mk +++ b/srec/test/SRecTestAudio/Android.mk @@ -38,8 +38,10 @@ LOCAL_SHARED_LIBRARIES := \ libutils \ libhardware_legacy \ libmedia \ - libsrec_jni \ - libSR_AudioIn \ + libsrec_jni + +LOCAL_STATIC_LIBRARIES := \ + libSR_AudioIn LOCAL_MODULE:= SRecTestAudio |