commit 14dcc28c772dbea0c09349e2e53f0e74ecd25930
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jan 29 03:54:36 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 29 03:54:36 2021 +0000
tree fe3cd51d6c5c66f13329aa830a1a7402e7079a1b
parent 258062ea67409286afd482c6d5dc0d07fd93aa70
parent 7cd3cc7d886996deaa9f4307e66b05b64dfd28b6

Merge "more complete 64bit mediaserver build targets"

media/libmediaplayerservice/tests/stagefrightRecorder/Android.bp

diff --git a/media/libmediaplayerservice/tests/stagefrightRecorder/Android.bp b/media/libmediaplayerservice/tests/stagefrightRecorder/Android.bp
index 5a52ea5..d08c66d 100644
--- a/media/libmediaplayerservice/tests/stagefrightRecorder/Android.bp
+++ b/media/libmediaplayerservice/tests/stagefrightRecorder/Android.bp
@@ -41,7 +41,7 @@
         "libmediandk",
     ],
 
-    compile_multilib: "32",
+    compile_multilib: "prefer32",
 
     cflags: [
         "-Werror",

media/libstagefright/tests/Android.bp

diff --git a/media/libstagefright/tests/Android.bp b/media/libstagefright/tests/Android.bp
index a7f94c1..5f3f72c 100644
--- a/media/libstagefright/tests/Android.bp
+++ b/media/libstagefright/tests/Android.bp
@@ -20,7 +20,7 @@
         "frameworks/native/include/media/openmax",
     ],
 
-    compile_multilib: "32",
+    compile_multilib: "prefer32",
 
     cflags: [
         "-Werror",
@@ -44,4 +44,4 @@
         "-Werror",
         "-Wall",
     ],
-}
\ No newline at end of file
+}