commit ff71544dfb74024fca3f8b6b8dccb4b2c071611a
author android-build-team Robot <android-build-team-robot@google.com> Wed Feb 28 08:28:03 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Feb 28 08:28:03 2018 +0000
tree 537705ed164f9d5d4ba05d728d267bc79c8c0ce1
parent 06a99b5846582f50fd463c52f0f3ab6e24213efa
parent fd98488524443e64b425317bdb8d96ed9000e924

Snap for 4625912 from fd98488524443e64b425317bdb8d96ed9000e924 to pi-release

Change-Id: Ifadfe386912ec770ac5e3ce9ccbafac4c2ee0ba3

libs/cjson/Android.bp

diff --git a/libs/cjson/Android.bp b/libs/cjson/Android.bp
index d18fae2..6a1600c 100644
--- a/libs/cjson/Android.bp
+++ b/libs/cjson/Android.bp
@@ -8,11 +8,6 @@
         "-Wall",
         "-Werror",
     ],
-    arch: {
-        arm: {
-            instruction_set: "arm",
-        },
-    },
     local_include_dirs: [
         "includes",
     ],

libs/vkjson/Android.bp

diff --git a/libs/vkjson/Android.bp b/libs/vkjson/Android.bp
index 1f7e4dc..1b32e7a 100644
--- a/libs/vkjson/Android.bp
+++ b/libs/vkjson/Android.bp
@@ -12,11 +12,6 @@
         "-std=c++11",
         "-Wno-sign-compare",
     ],
-    arch: {
-        arm: {
-            instruction_set: "arm",
-        },
-    },
     export_include_dirs: [
         ".",
     ],