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
diff --git a/cmds/surfacereplayer/proto/Android.bp b/cmds/surfacereplayer/proto/Android.bp
index 71a5e23..7b402fe 100644
--- a/cmds/surfacereplayer/proto/Android.bp
+++ b/cmds/surfacereplayer/proto/Android.bp
@@ -7,6 +7,11 @@
"-Wall",
"-Werror",
],
+ arch: {
+ arm: {
+ instruction_set: "arm",
+ },
+ },
proto: {
type: "lite",
export_proto_headers: true,
diff --git a/libs/vr/libbufferhub/Android.bp b/libs/vr/libbufferhub/Android.bp
index a2287e1..a5b69e3 100644
--- a/libs/vr/libbufferhub/Android.bp
+++ b/libs/vr/libbufferhub/Android.bp
@@ -51,6 +51,11 @@
"-Wall",
"-Werror",
],
+ arch: {
+ arm: {
+ instruction_set: "arm",
+ },
+ },
export_include_dirs: localIncludeFiles,
static_libs: staticLibraries,
shared_libs: sharedLibraries,
diff --git a/libs/vr/libbufferhubqueue/Android.bp b/libs/vr/libbufferhubqueue/Android.bp
index b279875..04f527a 100644
--- a/libs/vr/libbufferhubqueue/Android.bp
+++ b/libs/vr/libbufferhubqueue/Android.bp
@@ -55,6 +55,11 @@
"-Wno-unused-parameter",
"-Wno-unused-variable",
],
+ arch: {
+ arm: {
+ instruction_set: "arm",
+ },
+ },
srcs: sourceFiles,
export_include_dirs: includeFiles,
export_static_lib_headers: staticLibraries,
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",
diff --git a/libs/vr/libpdx/Android.bp b/libs/vr/libpdx/Android.bp
index 10c0b31..efd09a3 100644
--- a/libs/vr/libpdx/Android.bp
+++ b/libs/vr/libpdx/Android.bp
@@ -8,6 +8,11 @@
"-DLOG_TAG=\"libpdx\"",
"-DTRACE=0",
],
+ arch: {
+ arm: {
+ instruction_set: "arm",
+ },
+ },
export_include_dirs: ["private"],
local_include_dirs: ["private"],
srcs: [
diff --git a/libs/vr/libpdx_uds/Android.bp b/libs/vr/libpdx_uds/Android.bp
index d0b7cab..5130f1c 100644
--- a/libs/vr/libpdx_uds/Android.bp
+++ b/libs/vr/libpdx_uds/Android.bp
@@ -18,6 +18,11 @@
"ipc_helper.cpp",
"service_endpoint.cpp",
],
+ arch: {
+ arm: {
+ instruction_set: "arm",
+ },
+ },
static_libs: [
"libcutils",
"libbase",
diff --git a/libs/vr/libperformance/Android.bp b/libs/vr/libperformance/Android.bp
index 6a46876..f169c79 100644
--- a/libs/vr/libperformance/Android.bp
+++ b/libs/vr/libperformance/Android.bp
@@ -36,6 +36,11 @@
"-Wall",
"-Werror",
],
+ arch: {
+ arm: {
+ instruction_set: "arm",
+ },
+ },
export_include_dirs: includeFiles,
static_libs: staticLibraries,
shared_libs: sharedLibraries,
diff --git a/libs/vr/libvr_manager/Android.bp b/libs/vr/libvr_manager/Android.bp
index 8784877..6060c6e 100644
--- a/libs/vr/libvr_manager/Android.bp
+++ b/libs/vr/libvr_manager/Android.bp
@@ -31,6 +31,11 @@
include_dirs: include_dirs,
export_include_dirs: exported_include_dirs,
cflags: ["-Wall", "-Werror", "-Wunused", "-Wunreachable-code"],
+ arch: {
+ arm: {
+ instruction_set: "arm",
+ },
+ },
static_libs: static_libs,
name: "libvr_manager",
}
diff --git a/libs/vr/libvrflinger/Android.bp b/libs/vr/libvrflinger/Android.bp
index 4d80e91..66ece14 100644
--- a/libs/vr/libvrflinger/Android.bp
+++ b/libs/vr/libvrflinger/Android.bp
@@ -82,6 +82,11 @@
"-Wno-error=sign-compare", // to fix later
"-Wno-unused-variable",
],
+ arch: {
+ arm: {
+ instruction_set: "arm",
+ },
+ },
shared_libs: sharedLibraries,
whole_static_libs: staticLibraries,
header_libs: headerLibraries,