aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Hall <jessehall@google.com>2016-03-26 15:09:24 -0700
committerJesse Hall <jessehall@google.com>2016-04-06 10:26:41 -0700
commit07d87dd57ca5223b7ef6d99f9caf58016461521e (patch)
treee6ebb260712f89fc47a86b6a4c5bb5d8913e1b2f
parent7fa53b299bbebb8ca55ec078da6c52a65bd3a6f4 (diff)
downloadvulkan-validation-layers-07d87dd57ca5223b7ef6d99f9caf58016461521e.tar.gz
Add libvkjson.a to Android platform build
Change-Id: I1c1bc742b904c697dcd7fa7505d0bfeffe837f71
-rw-r--r--Android.mk1
-rw-r--r--libs/vkjson/Android.mk37
2 files changed, 38 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index e69de29bb..441a0c24d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -0,0 +1 @@
+include $(call my-dir)/libs/vkjson/Android.mk
diff --git a/libs/vkjson/Android.mk b/libs/vkjson/Android.mk
new file mode 100644
index 000000000..6fbf6db72
--- /dev/null
+++ b/libs/vkjson/Android.mk
@@ -0,0 +1,37 @@
+# Copyright 2016 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_CPP_EXTENSION := .cc
+LOCAL_CLANG := true
+LOCAL_CPPFLAGS := -std=c++11 \
+ -Wno-sign-compare
+
+LOCAL_C_INCLUDES := \
+ $(LOCAL_PATH)/../../include \
+ $(LOCAL_PATH)/../../loader
+
+LOCAL_SRC_FILES := \
+ vkjson.cc \
+ vkjson_device.cc \
+ ../../loader/cJSON.c
+
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+
+LOCAL_MODULE := libvkjson
+
+include $(BUILD_STATIC_LIBRARY)
+