aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-03-25 12:34:08 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-03-25 12:34:08 +0000
commitee96b272471b59b917b53516f85444d585893970 (patch)
treeb39e6515d1bcf5eba1d8ae27bfdc81053e3515f3
parent6d8f3f19c612c62e97b29993f38f3d072d10d602 (diff)
parent1adc91bad7a4f0cd0556a8e3b5f217dba02f63c0 (diff)
downloadtremolo-ee96b272471b59b917b53516f85444d585893970.tar.gz
Snap for 8358640 from 1adc91bad7a4f0cd0556a8e3b5f217dba02f63c0 to mainline-go-documentsui-release
Change-Id: Ie93f3162f4b6c156fcfd475eac7deb04e84a3cf7
-rw-r--r--Android.bp5
-rw-r--r--TEST_MAPPING4
-rw-r--r--Tremolo/codebook.c7
3 files changed, 9 insertions, 7 deletions
diff --git a/Android.bp b/Android.bp
index 692be12..036545c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -96,4 +96,9 @@ cc_library {
},
},
min_sdk_version: "29",
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.media",
+ "com.android.media.swcodec",
+ ],
}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index d58e4e0..0f98962 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,6 +1,8 @@
{
"presubmit": [
- { "name": "oob_oggpack_look" }
+ // uses ubsan sanitizers, which are no longer populated in the base system image
+ // TODO(b/221936773)
+ // { "name": "oob_oggpack_look" }
],
// tests which require dynamic content
diff --git a/Tremolo/codebook.c b/Tremolo/codebook.c
index 3c03f28..ae5500a 100644
--- a/Tremolo/codebook.c
+++ b/Tremolo/codebook.c
@@ -906,12 +906,7 @@ long vorbis_book_decodev_set(codebook *book,ogg_int32_t *a,
a[i++]=v[j];
}
}else{
- int i,j;
-
- for(i=0;i<n;){
- for (j=0;j<book->dim && i < n;j++)
- a[i++]=0;
- }
+ memset(a, 0, sizeof(*a) * n);
}
return 0;