commit 9f850f80d36a32fea500101e4f64f28f07a4f55a
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jul 07 04:57:11 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jul 07 04:57:11 2023 +0000
tree 145af476c7e4f7a661e343ccdc3f14b28eee4b30
parent c3cbe87660b3af67c479bd73593ce1a08a5a8505
parent bb00acd4f48335938c3dea223f2954ad930bef33

Snap for 10453563 from bb00acd4f48335938c3dea223f2954ad930bef33 to mainline-ipsec-release

Change-Id: I8d5f198e3190db87526e7cfb6339e6566bed5816

Android.bp

diff --git a/Android.bp b/Android.bp
index 036545c..5b3be8f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -69,6 +69,9 @@
         x86_64: {
             cflags: ["-DONLY_C"],
         },
+        riscv64: {
+            cflags: ["-DONLY_C"],
+        },
     },
 
     cflags: [

Tremolo/bitwise.c

diff --git a/Tremolo/bitwise.c b/Tremolo/bitwise.c
index ba2bb8c..ebf1026 100644
--- a/Tremolo/bitwise.c
+++ b/Tremolo/bitwise.c
@@ -174,10 +174,11 @@
     }else{
       /* we've either met the end of decode, or gone past it. halt
 	 only if we're past */
-      if(b->headend*8<b->headbit)
+      if(b->headend*8<b->headbit) {
 	/* read has fallen off the end */
 	b->headend=-1;
-        break;
+      }
+      break;
     }
   }
 }

tests/oob_oggpack_look/Android.bp

diff --git a/tests/oob_oggpack_look/Android.bp b/tests/oob_oggpack_look/Android.bp
index 5f7937f..60db8dd 100644
--- a/tests/oob_oggpack_look/Android.bp
+++ b/tests/oob_oggpack_look/Android.bp
@@ -18,12 +18,9 @@
 
     static_libs: [
         "libvorbisidec",
+        "libbase",
         "liblog",
-    ],
-
-    shared_libs: [
         "libutils",
-        "liblog",
     ],
 
     cflags: [