aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChih-hung Hsieh <chh@google.com>2018-02-28 05:08:23 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-02-28 05:08:23 +0000
commit1d404f986d871accde5228e357798658ee97c980 (patch)
tree7759b3843703e70e75bc7191b64822e7d7f6c0bd
parent78d0fe466dca7f42b1705d1b79e369df92941b58 (diff)
parent30b2bf308aee576d29437bf846be903d4ac85354 (diff)
downloadvulkan-validation-layers-1d404f986d871accde5228e357798658ee97c980.tar.gz
Merge "Revert "Use arm instruction set with clang 7.0 LTO"" am: a785a7e666
am: 30b2bf308a Change-Id: I9dcd500eb8d32132e25e59fb52b69c1dcd6df000
-rw-r--r--libs/cjson/Android.bp5
-rw-r--r--libs/vkjson/Android.bp5
2 files changed, 0 insertions, 10 deletions
diff --git a/libs/cjson/Android.bp b/libs/cjson/Android.bp
index d18fae271..6a1600cd8 100644
--- a/libs/cjson/Android.bp
+++ b/libs/cjson/Android.bp
@@ -8,11 +8,6 @@ cc_library_static {
"-Wall",
"-Werror",
],
- arch: {
- arm: {
- instruction_set: "arm",
- },
- },
local_include_dirs: [
"includes",
],
diff --git a/libs/vkjson/Android.bp b/libs/vkjson/Android.bp
index 1f7e4dc24..1b32e7ab0 100644
--- a/libs/vkjson/Android.bp
+++ b/libs/vkjson/Android.bp
@@ -12,11 +12,6 @@ cc_library_static {
"-std=c++11",
"-Wno-sign-compare",
],
- arch: {
- arm: {
- instruction_set: "arm",
- },
- },
export_include_dirs: [
".",
],