commit 518ffcf2b77d7d7509043e71915b678cca2a88ee
author Haibo Huang <hhb@google.com> Wed Mar 03 02:16:55 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 03 02:16:55 2021 +0000
tree 0b5f9f0ab495f34097724df6c7c771e6264b2700
parent 81a8b4e33c381dbede49f5b08450ac34d53a2a57
parent 12b0627cc1ad8813fe5ee31b97c1418c2ccf8850

Merge changes from topic "add_androidbp" am: 12b0627cc1

Original change: https://android-review.googlesource.com/c/platform/external/oboe/+/1594982

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I159f7af28fc88bc74f8ce4058c37afd6e6a7d1fc

Android.bp

diff --git a/Android.bp b/Android.bp
index 9fae8a6..074054f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -86,11 +86,6 @@
         "-Wno-deprecated-declarations",
         "-Ofast",
         "-DOBOE_NO_INCLUDE_AAUDIO",
-        // work-around for Oboe issue: #1122
-        "-DAAUDIO_OK=0",
-        "-DAAUDIO_ERROR_TIMEOUT=-885",
-        "-DAAUDIO_STREAM_STATE_STARTING=3",
-        "-DAAUDIO_STREAM_STATE_STARTED=4"
     ],
     sdk_version: "current",
     stl: "libc++_static",