summaryrefslogtreecommitdiffstats
path: root/security/tf_crypto_sst
diff options
context:
space:
mode:
Diffstat (limited to 'security/tf_crypto_sst')
-rw-r--r--security/tf_crypto_sst/Android.mk9
-rw-r--r--security/tf_crypto_sst/sst_stub.c3
2 files changed, 5 insertions, 7 deletions
diff --git a/security/tf_crypto_sst/Android.mk b/security/tf_crypto_sst/Android.mk
index 8ae3242..201a658 100644
--- a/security/tf_crypto_sst/Android.mk
+++ b/security/tf_crypto_sst/Android.mk
@@ -14,21 +14,18 @@ LOCAL_SRC_FILES := \
pkcs11_object.c \
pkcs11_session.c
+LOCAL_CFLAGS += -DLINUX
+LOCAL_CFLAGS += -D__ANDROID32__
+
ifdef S_VERSION_BUILD
LOCAL_CFLAGS += -DS_VERSION_BUILD=$(S_VERSION_BUILD)
endif
-LOCAL_LDLIBS += -llog
-
-LOCAL_CFLAGS += -DLINUX
-LOCAL_CFLAGS += -DANDROID
LOCAL_CFLAGS += -I $(LOCAL_PATH)/../tf_sdk/include/
LOCAL_MODULE:= libtf_crypto_sst
LOCAL_STATIC_LIBRARIES := libtee_client_api_driver
LOCAL_MODULE_TAGS := optional
-LOCAL_SHARED_LIBRARIES:= liblog
-
include $(BUILD_SHARED_LIBRARY)
endif
diff --git a/security/tf_crypto_sst/sst_stub.c b/security/tf_crypto_sst/sst_stub.c
index e6e37b6..e8a78bc 100644
--- a/security/tf_crypto_sst/sst_stub.c
+++ b/security/tf_crypto_sst/sst_stub.c
@@ -27,7 +27,8 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef ANDROID
+
+#ifdef __ANDROID32__
#include <stddef.h>
#endif