From 13f21c2bc7bc5ca640795e4c2796c324c786c7ae Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Thu, 16 Oct 2014 17:39:31 -0700 Subject: More test makefile cleanup. Global variables kill. No need to manually link gtest, and that causes problems with libc++. Change-Id: If804cdd436cf1addfa9a777708efbc37c27770b6 --- tests/Android.mk | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) (limited to 'tests') diff --git a/tests/Android.mk b/tests/Android.mk index 4d99d5249..02a272a24 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -1,26 +1,25 @@ -# Build the unit tests. -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -# Build the unit tests. -test_src_files := \ - asn1_decoder_test.cpp +# +# Copyright (C) 2014 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. +# -shared_libraries := \ - liblog \ - libcutils - -static_libraries := \ - libgtest \ - libgtest_main \ - libverifier +LOCAL_PATH := $(call my-dir) -$(foreach file,$(test_src_files), \ - $(eval include $(CLEAR_VARS)) \ - $(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \ - $(eval LOCAL_STATIC_LIBRARIES := $(static_libraries)) \ - $(eval LOCAL_SRC_FILES := $(file)) \ - $(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \ - $(eval LOCAL_C_INCLUDES := $(LOCAL_PATH)/..) \ - $(eval include $(BUILD_NATIVE_TEST)) \ -) \ No newline at end of file +include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk +LOCAL_STATIC_LIBRARIES := libverifier +LOCAL_SRC_FILES := asn1_decoder_test.cpp +LOCAL_MODULE := asn1_decoder_test +LOCAL_C_INCLUDES := $(LOCAL_PATH)/.. +include $(BUILD_NATIVE_TEST) -- cgit v1.2.3