From 31359caa7577608a97d1b649fdd3a34fac84ba90 Mon Sep 17 00:00:00 2001 From: Chih-Hung Hsieh Date: Wed, 25 Feb 2015 17:02:34 -0800 Subject: Enable clang compilation. Cherry pick OPTNONE solution for memset_s from google master branch. Ignore benign warnings. Change-Id: I4ed559449be2f9c4277835f10465d4f60060c2ff --- Android.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 2d2db04..f24bebc 100644 --- a/Android.mk +++ b/Android.mk @@ -19,8 +19,6 @@ LOCAL_PATH := $(call my-dir) # GoogleKeymaster implementation, e.g. one running in TrustZone. ## include $(CLEAR_VARS) -# Disable clang until we find a way to suppress clang optmization in google_keymaster_utils.h. -LOCAL_CLANG := false LOCAL_MODULE:= libkeymaster_messages LOCAL_SRC_FILES:= \ authorization_set.cpp \ @@ -43,8 +41,6 @@ include $(BUILD_SHARED_LIBRARY) # function-based keymaster HAL API to the message-based GoogleKeymaster API. ### include $(CLEAR_VARS) -# Disable clang until we find a way to suppress clang optmization in google_keymaster_utils.h. -LOCAL_CLANG := false LOCAL_MODULE:= libkeymaster LOCAL_SRC_FILES:= \ aead_mode_operation.cpp \ @@ -74,6 +70,8 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/include LOCAL_SHARED_LIBRARIES := libcrypto LOCAL_CFLAGS = -Wall -Werror +# Ignore benigh warnings for now. +LOCAL_CLANG_CFLAGS += -Wno-error=unused-private-field LOCAL_MODULE_TAGS := optional LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk @@ -93,6 +91,8 @@ LOCAL_SRC_FILES := \ LOCAL_C_INCLUDES := \ system/security/keystore LOCAL_CFLAGS = -Wall -Werror +# Ignore benigh warnings for now. +LOCAL_CLANG_CFLAGS += -Wno-error=unused-const-variable LOCAL_SHARED_LIBRARIES := libkeymaster liblog LOCAL_MODULE_TAGS := optional LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk -- cgit v1.2.3