am 9f5f81bf: am 133b7d4a: Merge "Don\'t manually link libgtest_main in libion tests."

* commit '9f5f81bfa2c7eb581fd6b2c735ac143fca07e70e':
  Don't manually link libgtest_main in libion tests.
This commit is contained in:
Dan Albert 2014-11-14 21:55:42 +00:00 committed by Android Git Automerger
commit 2dd1bbacde
1 changed files with 0 additions and 1 deletions

View File

@ -21,7 +21,6 @@ LOCAL_MODULE := ion-unit-tests
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_CFLAGS += -g -Wall -Werror -std=gnu++11 -Wno-missing-field-initializers
LOCAL_SHARED_LIBRARIES += libion
LOCAL_STATIC_LIBRARIES += libgtest_main
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../kernel-headers
LOCAL_SRC_FILES := \
ion_test_fixture.cpp \