diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2018-02-16 01:14:37 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-16 01:14:37 +0000 |
| commit | dd78b95601d0b5c586355e2131c2dfd413bfd3af (patch) | |
| tree | 09b02d03451e409a12b9157a88ae337a70784714 | |
| parent | 6206280a2918d59c10b00767de1a1cbd5a268ccd (diff) | |
| parent | 1e629e28078540018f1b17311e459f5b3d525739 (diff) | |
| download | vulkan-validation-layers-dd78b95601d0b5c586355e2131c2dfd413bfd3af.tar.gz | |
Merge "Use arm instruction set with clang 7.0 LTO" am: 985112083f
am: 1e629e2807
Change-Id: I072457b74464c4584bf736671d3bf62be34741d6
| -rw-r--r-- | libs/cjson/Android.bp | 5 | ||||
| -rw-r--r-- | libs/vkjson/Android.bp | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/libs/cjson/Android.bp b/libs/cjson/Android.bp index 6a1600cd8..d18fae271 100644 --- a/libs/cjson/Android.bp +++ b/libs/cjson/Android.bp @@ -8,6 +8,11 @@ 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 1b32e7ab0..1f7e4dc24 100644 --- a/libs/vkjson/Android.bp +++ b/libs/vkjson/Android.bp @@ -12,6 +12,11 @@ cc_library_static { "-std=c++11", "-Wno-sign-compare", ], + arch: { + arm: { + instruction_set: "arm", + }, + }, export_include_dirs: [ ".", ], |