Merge "Revert "Use arm instruction set with clang 7.0 LTO""

12 files changed, 1 insertions, 63 deletions

diff --git a/cmds/surfacereplayer/proto/Android.bp b/cmds/surfacereplayer/proto/Android.bp
index 7b402fefb0..71a5e23a9e 100644
--- a/cmds/surfacereplayer/proto/Android.bp
+++ b/cmds/surfacereplayer/proto/Android.bp
@@ -7,11 +7,6 @@ cc_library_static {
         "-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 e6803dad84..39814cc216 100644
--- a/libs/vr/libbufferhub/Android.bp
+++ b/libs/vr/libbufferhub/Android.bp
@@ -48,11 +48,6 @@ cc_library {
         "-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 cf2c59b803..eeec9ec49c 100644
--- a/libs/vr/libbufferhubqueue/Android.bp
+++ b/libs/vr/libbufferhubqueue/Android.bp
@@ -53,11 +53,6 @@ cc_library_shared {
         "-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 093ad92bd7..192fb5d1f8 100644
--- a/libs/vr/libdisplay/Android.bp
+++ b/libs/vr/libdisplay/Android.bp
@@ -52,11 +52,6 @@ headerLibraries = [
 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 d183f7196b..9b84d6576b 100644
--- a/libs/vr/libpdx/Android.bp
+++ b/libs/vr/libpdx/Android.bp
@@ -8,11 +8,6 @@ cc_library_static {
         "-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 e7cf357e4a..79cfdf6324 100644
--- a/libs/vr/libpdx_uds/Android.bp
+++ b/libs/vr/libpdx_uds/Android.bp
@@ -19,11 +19,6 @@ cc_library_static {
         "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 2eed602586..35d3dea9de 100644
--- a/libs/vr/libperformance/Android.bp
+++ b/libs/vr/libperformance/Android.bp
@@ -36,11 +36,6 @@ cc_library {
         "-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 6060c6e4a9..87848779f2 100644
--- a/libs/vr/libvr_manager/Android.bp
+++ b/libs/vr/libvr_manager/Android.bp
@@ -31,11 +31,6 @@ cc_library_static {
     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 c762e46b42..23a9853ce2 100644
--- a/libs/vr/libvrflinger/Android.bp
+++ b/libs/vr/libvrflinger/Android.bp
@@ -81,11 +81,6 @@ cc_library_static {
         "-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 ae589ca91c..ae34d34fae 100644
--- a/services/surfaceflinger/Android.bp
+++ b/services/surfaceflinger/Android.bp
@@ -133,11 +133,6 @@ cc_library_shared {
     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 75612c0e12..8eb218c96e 100644
--- a/services/surfaceflinger/layerproto/Android.bp
+++ b/services/surfaceflinger/layerproto/Android.bp
@@ -9,12 +9,6 @@ cc_library_shared {
         "layerstrace.proto",
     ],
 
-    arch: {
-        arm: {
-            instruction_set: "arm",
-        },
-    },
-
     shared_libs: [
         "libui",
         "libprotobuf-cpp-lite",
@@ -39,4 +33,4 @@ cc_library_shared {
         "-Wno-undef",
     ],
 
-}
+}
\ No newline at end of file
diff --git a/services/utils/Android.bp b/services/utils/Android.bp
index a5f7dc13da..6132956eeb 100644
--- a/services/utils/Android.bp
+++ b/services/utils/Android.bp
@@ -27,12 +27,6 @@ cc_library_static {
         "PriorityDumper.cpp",
     ],
 
-    arch: {
-        arm: {
-            instruction_set: "arm",
-        },
-    },
-
     clang: true,
     export_include_dirs: ["include"],
 }