audio: Rename audio_test to brillo_audio_test

The audio test app from libmedia and stagefright is also called
audio_test. This is very confusing as there are tests at many different
levels. Rename it to be something more useful.

BUG=25149659
TEST=none

Change-Id: I75890b7dde427ab5ccb2c2d0bc8cd94d8820a349

18 files changed, 11 insertions, 17 deletions

diff --git a/brillo_base.mk b/brillo_base.mk
index d2e339e..e9fa7ab 100644
--- a/brillo_base.mk
+++ b/brillo_base.mk
@@ -112,9 +112,9 @@ PRODUCT_PACKAGES += \
   dbus-monitor \
   dbus-send \
 
-# Audio example program.
+# Brillo audio tests for libmedia and libstagefright.
 PRODUCT_PACKAGES += \
-  audio_test \
+  brillo_audio_test \
 
 # Audio HAL tests.
 PRODUCT_PACKAGES += \
diff --git a/examples/audio/example-app/Android.mk b/pts/audio/brillo-audio-test/Android.mk
index 5b9d4d9..9c2ba8a 100644
--- a/examples/audio/example-app/Android.mk
+++ b/pts/audio/brillo-audio-test/Android.mk
@@ -17,18 +17,14 @@
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
-
 LOCAL_SRC_FILES := \
-  audio_test.cpp \
+  brillo_audio_test.cpp \
   libmedia_record.cpp \
   libmedia_playback.cpp \
   stagefright_record.cpp \
-  stagefright_playback.cpp \
-
-LOCAL_MODULE := audio_test
-
-LOCAL_CFLAGS += -Wall -Wno-unused-parameter -Werror \
-
+  stagefright_playback.cpp
+LOCAL_MODULE := brillo_audio_test
+LOCAL_CFLAGS += -Wall -Wno-unused-parameter -Werror
 LOCAL_SHARED_LIBRARIES := \
   libbase \
   libbinder \
@@ -38,11 +34,9 @@ LOCAL_SHARED_LIBRARIES := \
   libsinesource \
   libstagefright \
   libstagefright_foundation \
-  libutils \
-
+  libutils
 LOCAL_C_INCLUDES := \
   $(TOP)/frameworks/av/media/libstagefright \
   $(TOP)/frameworks/native/include/media/openmax \
-  $(TOP)/device/generic/brillo/examples/audio/common \
-
+  $(TOP)/device/generic/brillo/pts/audio/common
 include $(BUILD_EXECUTABLE)
diff --git a/examples/audio/example-app/README b/pts/audio/brillo-audio-test/README
index 0adfb8a..8d2a2f9 100644
--- a/examples/audio/example-app/README
+++ b/pts/audio/brillo-audio-test/README
@@ -1,4 +1,4 @@
-This folder contains examples for doing audio on Brillo.
+This folder contains tests for libmedia and stagefright on Brillo.
 
 Example files:
   libmedia_playback.cpp:
diff --git a/examples/audio/example-app/audio_test.cpp b/pts/audio/brillo-audio-test/brillo_audio_test.cpp
index e1a6a48..5ae3e5f 100644
--- a/examples/audio/example-app/audio_test.cpp
+++ b/pts/audio/brillo-audio-test/brillo_audio_test.cpp
@@ -35,7 +35,7 @@ enum TestMode {
 };
 
 void usage() {
-  fprintf(stderr, "Usage: ./audio_test [option].\n"
+  fprintf(stderr, "Usage: ./brillo_audio_test [option].\n"
          "play_libmedia - play raw audio stream using libmedia \n"
          "play_stagefright filename - play mp3 using libstagefright \n"
          "play_multiple filename - play multiple audio stream using both"
diff --git a/examples/audio/example-app/libmedia_playback.cpp b/pts/audio/brillo-audio-test/libmedia_playback.cpp
index fa1d380..fa1d380 100644
--- a/examples/audio/example-app/libmedia_playback.cpp
+++ b/pts/audio/brillo-audio-test/libmedia_playback.cpp
diff --git a/examples/audio/example-app/libmedia_playback.h b/pts/audio/brillo-audio-test/libmedia_playback.h
index c76f1f4..c76f1f4 100644
--- a/examples/audio/example-app/libmedia_playback.h
+++ b/pts/audio/brillo-audio-test/libmedia_playback.h
diff --git a/examples/audio/example-app/libmedia_record.cpp b/pts/audio/brillo-audio-test/libmedia_record.cpp
index 82f36b5..82f36b5 100644
--- a/examples/audio/example-app/libmedia_record.cpp
+++ b/pts/audio/brillo-audio-test/libmedia_record.cpp
diff --git a/examples/audio/example-app/libmedia_record.h b/pts/audio/brillo-audio-test/libmedia_record.h
index 3026d54..3026d54 100644
--- a/examples/audio/example-app/libmedia_record.h
+++ b/pts/audio/brillo-audio-test/libmedia_record.h
diff --git a/examples/audio/example-app/stagefright_playback.cpp b/pts/audio/brillo-audio-test/stagefright_playback.cpp
index fd410c9..fd410c9 100644
--- a/examples/audio/example-app/stagefright_playback.cpp
+++ b/pts/audio/brillo-audio-test/stagefright_playback.cpp
diff --git a/examples/audio/example-app/stagefright_playback.h b/pts/audio/brillo-audio-test/stagefright_playback.h
index 1daf144..1daf144 100644
--- a/examples/audio/example-app/stagefright_playback.h
+++ b/pts/audio/brillo-audio-test/stagefright_playback.h
diff --git a/examples/audio/example-app/stagefright_record.cpp b/pts/audio/brillo-audio-test/stagefright_record.cpp
index aca4389..aca4389 100644
--- a/examples/audio/example-app/stagefright_record.cpp
+++ b/pts/audio/brillo-audio-test/stagefright_record.cpp
diff --git a/examples/audio/example-app/stagefright_record.h b/pts/audio/brillo-audio-test/stagefright_record.h
index 66a6794..66a6794 100644
--- a/examples/audio/example-app/stagefright_record.h
+++ b/pts/audio/brillo-audio-test/stagefright_record.h
diff --git a/examples/audio/common/Android.mk b/pts/audio/common/Android.mk
index ea0c4b4..ea0c4b4 100644
--- a/examples/audio/common/Android.mk
+++ b/pts/audio/common/Android.mk
diff --git a/examples/audio/common/SineSource.cpp b/pts/audio/common/SineSource.cpp
index 5ea90f6..5ea90f6 100644
--- a/examples/audio/common/SineSource.cpp
+++ b/pts/audio/common/SineSource.cpp
diff --git a/examples/audio/common/SineSource.h b/pts/audio/common/SineSource.h
index 232cf8a..232cf8a 100644
--- a/examples/audio/common/SineSource.h
+++ b/pts/audio/common/SineSource.h
diff --git a/examples/audio/hal-test/Android.mk b/pts/audio/hal-test/Android.mk
index 69ba043..5e7e1f9 100644
--- a/examples/audio/hal-test/Android.mk
+++ b/pts/audio/hal-test/Android.mk
@@ -33,7 +33,7 @@ LOCAL_SHARED_LIBRARIES := \
 LOCAL_C_INCLUDES := \
   $(TOP)/system/core/base/include \
   $(TOP)/frameworks/av/media/libstagefright \
-  $(TOP)/device/generic/brillo/examples/audio/common
+  $(TOP)/device/generic/brillo/pts/audio/common
 include $(BUILD_EXECUTABLE)
 
 # audio_hal_record_test
diff --git a/examples/audio/hal-test/audio_hal_playback_test.cpp b/pts/audio/hal-test/audio_hal_playback_test.cpp
index b231993..b231993 100644
--- a/examples/audio/hal-test/audio_hal_playback_test.cpp
+++ b/pts/audio/hal-test/audio_hal_playback_test.cpp
diff --git a/examples/audio/hal-test/audio_hal_record_test.cpp b/pts/audio/hal-test/audio_hal_record_test.cpp
index b362ac1..b362ac1 100644
--- a/examples/audio/hal-test/audio_hal_record_test.cpp
+++ b/pts/audio/hal-test/audio_hal_record_test.cpp