commit ffb5375c37804f84750a2092779ced5b986850a3
author Chih-Hung Hsieh <chh@google.com> Mon Feb 12 11:35:00 2018 -0800
committer Chih-Hung Hsieh <chh@google.com> Mon Feb 12 11:35:35 2018 -0800
tree 47a4d192bcca0efc0229a3e4bbaa10db48a2e325
parent 73c392450d1aa1b58d77ecbdc6a3aaa315a6a7b0

Use arm instruction set with clang 7.0 LTO

* surfaceflinger.so uses LTO.
  clang 7.0 LTO inlined more code and some references
  are too far away to use thumb instructions.

Bug: 72619014
Test: build with Forrest
Merged-In: Ia09931e93a170ac58007f80da2d580bb9b9635a6
Change-Id: I2cbb652a9a8d908d9444a267e6d234b135c279b5

libs/vr/libdisplay/Android.bp

diff --git a/libs/vr/libdisplay/Android.bp b/libs/vr/libdisplay/Android.bp
index 8213ca2..6aefaaa 100644
--- a/libs/vr/libdisplay/Android.bp
+++ b/libs/vr/libdisplay/Android.bp
@@ -52,6 +52,11 @@
 cc_library {
     tags: ["tests"],
     srcs: sourceFiles,
+    arch: {
+        arm: {
+            instruction_set: "arm",
+        },
+    },
     cflags: ["-DLOG_TAG=\"libdisplay\"",
         "-DTRACE=0",
         "-DATRACE_TAG=ATRACE_TAG_GRAPHICS",