Revert "Use arm instruction set with clang 7.0 LTO"
This reverts commit ffb5375c37804f84750a2092779ced5b986850a3.
Clang 7.0 LTO shouldn't need arm instruction set,
if we revert one LLVM recent change.
Bug: 72619014
Change-Id: I513fc78b2fde7ee95cd1bf2153dd647d2fbd196e
Merged-In: Ic1ee146b823602ae419891f5e0956640109dd397
diff --git a/cmds/surfacereplayer/proto/Android.bp b/cmds/surfacereplayer/proto/Android.bp
index 7b402fe..71a5e23 100644
--- a/cmds/surfacereplayer/proto/Android.bp
+++ b/cmds/surfacereplayer/proto/Android.bp
@@ -7,11 +7,6 @@
"-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 a5b69e3..a2287e1 100644
--- a/libs/vr/libbufferhub/Android.bp
+++ b/libs/vr/libbufferhub/Android.bp
@@ -51,11 +51,6 @@
"-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 04f527a..b279875 100644
--- a/libs/vr/libbufferhubqueue/Android.bp
+++ b/libs/vr/libbufferhubqueue/Android.bp
@@ -55,11 +55,6 @@
"-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 6aefaaa..8213ca2 100644
--- a/libs/vr/libdisplay/Android.bp
+++ b/libs/vr/libdisplay/Android.bp
@@ -52,11 +52,6 @@
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 efd09a3..10c0b31 100644
--- a/libs/vr/libpdx/Android.bp
+++ b/libs/vr/libpdx/Android.bp
@@ -8,11 +8,6 @@
"-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 5130f1c..d0b7cab 100644
--- a/libs/vr/libpdx_uds/Android.bp
+++ b/libs/vr/libpdx_uds/Android.bp
@@ -18,11 +18,6 @@
"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 f169c79..6a46876 100644
--- a/libs/vr/libperformance/Android.bp
+++ b/libs/vr/libperformance/Android.bp
@@ -36,11 +36,6 @@
"-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 6060c6e..8784877 100644
--- a/libs/vr/libvr_manager/Android.bp
+++ b/libs/vr/libvr_manager/Android.bp
@@ -31,11 +31,6 @@
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 66ece14..4d80e91 100644
--- a/libs/vr/libvrflinger/Android.bp
+++ b/libs/vr/libvrflinger/Android.bp
@@ -82,11 +82,6 @@
"-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,