commit 9da3732eea7cf32fb12cc08f03e9b16a588d0d96
author Chih-hung Hsieh <chh@google.com> Mon Feb 26 23:17:53 2018 +0000
committer Chih-hung Hsieh <chh@google.com> Mon Feb 26 23:17:53 2018 +0000
tree 4f522b5a1034f29d90a537080397627fc870f2e9
parent 94574f271fe8730d841a286069c198c6e74fc9e5

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

services/surfaceflinger/Android.bp

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",

services/surfaceflinger/layerproto/Android.bp

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