aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChih-hung Hsieh <chh@google.com>2018-02-28 05:25:00 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-02-28 05:25:00 +0000
commitfd98488524443e64b425317bdb8d96ed9000e924 (patch)
tree537705ed164f9d5d4ba05d728d267bc79c8c0ce1
parentb8481cecf6c408349833c55a314416ee4095636f (diff)
parent1d404f986d871accde5228e357798658ee97c980 (diff)
downloadvulkan-validation-layers-fd98488524443e64b425317bdb8d96ed9000e924.tar.gz
Merge "Revert "Use arm instruction set with clang 7.0 LTO"" am: a785a7e666 am: 30b2bf308a
am: 1d404f986d Change-Id: Icbc5ed71fa45d4696ddd3f7d0927642bd482658d
-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: [
".",
],