From 1c6b675f0c796409fdabcbb5c4bddbd8bf8532ee Mon Sep 17 00:00:00 2001 From: Chih-Hung Hsieh Date: Wed, 6 May 2015 16:14:00 -0700 Subject: [PATCH] Use gcc to build unit tests until vendor code is fixed. BUG: 20893039 Change-Id: I649dae16bbc748defc8eb92c879140fe950fe936 --- libwvdrmengine/cdm/test/unit-test.mk | 2 ++ libwvdrmengine/oemcrypto/test/Android.mk | 2 ++ 2 files changed, 4 insertions(+) diff --git a/libwvdrmengine/cdm/test/unit-test.mk b/libwvdrmengine/cdm/test/unit-test.mk index 94c342cb..3b79d09a 100644 --- a/libwvdrmengine/cdm/test/unit-test.mk +++ b/libwvdrmengine/cdm/test/unit-test.mk @@ -6,6 +6,8 @@ $(call assert-not-null,test_name) include $(CLEAR_VARS) +LOCAL_CLANG := false + LOCAL_MODULE := $(test_name) LOCAL_MODULE_TAGS := tests diff --git a/libwvdrmengine/oemcrypto/test/Android.mk b/libwvdrmengine/oemcrypto/test/Android.mk index afb609c0..20fb7b9a 100644 --- a/libwvdrmengine/oemcrypto/test/Android.mk +++ b/libwvdrmengine/oemcrypto/test/Android.mk @@ -2,6 +2,8 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) +LOCAL_CLANG := false + LOCAL_MODULE:=oemcrypto_test LOCAL_MODULE_TAGS := tests