| commit | 7fa6e30d7eb0cb74393b378ed808a1c2be60648c | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Jun 25 22:38:30 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 25 22:38:30 2020 +0000 |
| tree | db3175a9ff4e1b5eb01607217942f4478f28634d | |
| parent | 2981cfca430a6ed404a0317c07643d7752717ce0 [diff] | |
| parent | ef1deaa01fbcd95fbe732fe56b2d6f1a35c953d0 [diff] |
Merge "Build 64-bit cameraservice on 64-bit-only" am: 3291861f5d am: c0005b3820 am: 9c4c206b2b am: ef1deaa01f Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1327533 Change-Id: Ic85abbf42eb62fbf22ba3b5a584990e177e3cd25
diff --git a/camera/cameraserver/Android.bp b/camera/cameraserver/Android.bp index dc7f88a..09a333b 100644 --- a/camera/cameraserver/Android.bp +++ b/camera/cameraserver/Android.bp
@@ -37,7 +37,7 @@ "android.hardware.camera.device@3.2", "android.hardware.camera.device@3.4", ], - compile_multilib: "32", + compile_multilib: "prefer32", cflags: [ "-Wall", "-Wextra",