aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2014-08-25 14:58:30 -0700
committerAndreas Gampe <agampe@google.com>2014-08-26 16:59:00 +0000
commitb05d350ba042e911c69bfa92cb31dbdf6fd5fdef (patch)
treee3714971fc4b348ccfa51813829481d25d4bb52b
parent5019faa3a6bdde33785ece0537e8b865ea7cf938 (diff)
downloadplatform_libnativehelper-lollipop-release.tar.gz
platform_libnativehelper-lollipop-release.tar.bz2
platform_libnativehelper-lollipop-release.zip
Bug: 16404669 Change-Id: I7bf7745684747bad8564f168d0def71878566e8c
-rw-r--r--Android.mk3
-rw-r--r--tests/Android.mk2
2 files changed, 5 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index ef33104..4e8fcee 100644
--- a/Android.mk
+++ b/Android.mk
@@ -32,6 +32,7 @@ LOCAL_SRC_FILES := \
LOCAL_SHARED_LIBRARIES := liblog
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libnativehelper
+LOCAL_CLANG := true
LOCAL_CFLAGS := -Werror -fvisibility=protected
LOCAL_C_INCLUDES := external/stlport/stlport bionic/ bionic/libstdc++/include libcore/include
LOCAL_SHARED_LIBRARIES += libcutils libstlport libdl
@@ -48,6 +49,7 @@ include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libnativehelper_compat_libc++
+LOCAL_CLANG := true
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/include/nativehelper
LOCAL_EXPORT_C_INCLUDE_DIRS := \
@@ -68,6 +70,7 @@ include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := libnativehelper
LOCAL_MODULE_TAGS := optional
+LOCAL_CLANG := true
LOCAL_SRC_FILES := \
$(local_src_files) \
JniInvocation.cpp
diff --git a/tests/Android.mk b/tests/Android.mk
index 63e6f5c..c357b24 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -6,6 +6,7 @@ include $(CLEAR_VARS)
include $(CLEAR_VARS)
LOCAL_MODULE := JniInvocation_test
+LOCAL_CLANG := true
LOCAL_SRC_FILES := JniInvocation_test.cpp
LOCAL_SHARED_LIBRARIES := \
libnativehelper
@@ -21,6 +22,7 @@ include $(BUILD_NATIVE_TEST)
include $(CLEAR_VARS)
LOCAL_MODULE := JniInvocation_test
+LOCAL_CLANG := true
LOCAL_SRC_FILES := JniInvocation_test.cpp
LOCAL_SHARED_LIBRARIES := \
libnativehelper