Revert "Use arm instruction set with clang 7.0 LTO"
This reverts commit 94574f271fe8730d841a286069c198c6e74fc9e5.
Clang 7.0 LTO shouldn't need arm instruction set,
if we revert one LLVM recent change.
Bug: 72619014
Change-Id: 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 e6803da..39814cc 100644
--- a/libs/vr/libbufferhub/Android.bp
+++ b/libs/vr/libbufferhub/Android.bp
@@ -48,11 +48,6 @@
"-Wall",
"-Werror",
],
- arch: {
- arm: {
- instruction_set: "arm",
- },
- },
export_include_dirs: localIncludeFiles,
shared_libs: sharedLibraries,
header_libs: headerLibraries,
diff --git a/libs/vr/libbufferhubqueue/Android.bp b/libs/vr/libbufferhubqueue/Android.bp
index cf2c59b..eeec9ec 100644
--- a/libs/vr/libbufferhubqueue/Android.bp
+++ b/libs/vr/libbufferhubqueue/Android.bp
@@ -53,11 +53,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 093ad92..192fb5d 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 d183f71..9b84d65 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 e7cf357..79cfdf6 100644
--- a/libs/vr/libpdx_uds/Android.bp
+++ b/libs/vr/libpdx_uds/Android.bp
@@ -19,11 +19,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 2eed602..35d3dea 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,
shared_libs: sharedLibraries,
name: "libperformance",
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 c762e46..23a9853 100644
--- a/libs/vr/libvrflinger/Android.bp
+++ b/libs/vr/libvrflinger/Android.bp
@@ -81,11 +81,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,
diff --git a/services/surfaceflinger/Android.bp b/services/surfaceflinger/Android.bp
index ae589ca..ae34d34 100644
--- a/services/surfaceflinger/Android.bp
+++ b/services/surfaceflinger/Android.bp
@@ -133,11 +133,6 @@
srcs: [
":libsurfaceflinger_sources",
],
- arch: {
- arm: {
- instruction_set: "arm",
- },
- },
logtags: ["EventLog/EventLogTags.logtags"],
include_dirs: [
"external/vulkan-validation-layers/libs/vkjson",
diff --git a/services/surfaceflinger/layerproto/Android.bp b/services/surfaceflinger/layerproto/Android.bp
index 75612c0..8eb218c 100644
--- a/services/surfaceflinger/layerproto/Android.bp
+++ b/services/surfaceflinger/layerproto/Android.bp
@@ -9,12 +9,6 @@
"layerstrace.proto",
],
- arch: {
- arm: {
- instruction_set: "arm",
- },
- },
-
shared_libs: [
"libui",
"libprotobuf-cpp-lite",
@@ -39,4 +33,4 @@
"-Wno-undef",
],
-}
+}
\ No newline at end of file
diff --git a/services/utils/Android.bp b/services/utils/Android.bp
index a5f7dc1..6132956 100644
--- a/services/utils/Android.bp
+++ b/services/utils/Android.bp
@@ -27,12 +27,6 @@
"PriorityDumper.cpp",
],
- arch: {
- arm: {
- instruction_set: "arm",
- },
- },
-
clang: true,
export_include_dirs: ["include"],
}