aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaibo Huang <hhb@google.com>2021-03-03 08:10:47 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-03-03 08:10:47 +0000
commit7592d8332c301ca0999a3f441e189cc899552382 (patch)
tree0b5f9f0ab495f34097724df6c7c771e6264b2700
parentc61622fc65712437e52fa9ba3ff0ca0eee8808d3 (diff)
parentb668dca8fd87d4fba6786e6f167296902cb28e90 (diff)
downloadoboe-7592d8332c301ca0999a3f441e189cc899552382.tar.gz
Merge changes from topic "add_androidbp" am: 12b0627cc1 am: 518ffcf2b7 am: b668dca8fd
Original change: https://android-review.googlesource.com/c/platform/external/oboe/+/1594982 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I61a048c1cdedd6bf5c446c08a5cca40f6c1dd332
-rw-r--r--Android.bp5
1 files changed, 0 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp
index 9fae8a66..074054ff 100644
--- a/Android.bp
+++ b/Android.bp
@@ -86,11 +86,6 @@ cc_library_static {
"-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",