| commit | a4eb0d86a29be2763be5fac51727858d5095794b | [log] [tgz] |
|---|---|---|
| author | Phil Burk <philburk@google.com> | Wed Apr 12 15:44:06 2017 -0700 |
| committer | Phil Burk <philburk@google.com> | Thu Apr 13 13:50:40 2017 +0000 |
| tree | f725cf700cac0e52e0376b6a9a867f4c37fe3bdc | |
| parent | 9e7dd63dfff0cc967f025ea9e27a299aaa99fd69 [diff] |
aaudio: merge contents of AAudioDefinitions.h into AAudio.h As requested by native API council. Bug: 30210002 Bug: 33398120 Test: CTS test_aaudio Change-Id: I5ea7c53d09469221263d84cf6f82082e67c2523b Signed-off-by: Phil Burk <philburk@google.com>
diff --git a/media/libaaudio/tests/test_handle_tracker.cpp b/media/libaaudio/tests/test_handle_tracker.cpp index e1cb676..c4db47a 100644 --- a/media/libaaudio/tests/test_handle_tracker.cpp +++ b/media/libaaudio/tests/test_handle_tracker.cpp
@@ -21,7 +21,7 @@ #include <gtest/gtest.h> -#include <aaudio/AAudioDefinitions.h> +#include <aaudio/AAudio.h> #include "utility/HandleTracker.h" // Test adding one address.
diff --git a/media/libaaudio/tests/test_marshalling.cpp b/media/libaaudio/tests/test_marshalling.cpp index b1f77c0..79beed6 100644 --- a/media/libaaudio/tests/test_marshalling.cpp +++ b/media/libaaudio/tests/test_marshalling.cpp
@@ -25,7 +25,7 @@ #include <gtest/gtest.h> #include <sys/mman.h> -#include <aaudio/AAudioDefinitions.h> +#include <aaudio/AAudio.h> #include <binding/AudioEndpointParcelable.h> using namespace android;