tequilaOS/platform_hardware_libhardware
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 6266cb14: am 9f497870: Merge "Don\'t manually link stlport."

Browse source 
* commit '6266cb147f2c133000e784b67775599feaa43d9d':
  Don't manually link stlport.
This commit is contained in:
Dan Albert 2014-09-26 19:57:58 +00:00 committed by Android Git Automerger
commit 8be2a8692d
2 changed files with 2 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tests/camera2/Android.mk
View file

@ -19,7 +19,6 @@ LOCAL_SHARED_LIBRARIES := \
liblog \
libutils \
libcutils \
libstlport \
libhardware \
libcamera_metadata \
libcameraservice \
@ -29,14 +28,7 @@ LOCAL_SHARED_LIBRARIES := \
libui \
libdl
LOCAL_STATIC_LIBRARIES := \
libgtest
LOCAL_C_INCLUDES += \
bionic \
bionic/libstdc++/include \
external/gtest/include \
external/stlport/stlport \
system/media/camera/include \
frameworks/av/include/ \
frameworks/av/services/camera/libcameraservice \

13
tests/keymaster/Android.mk
View file

@ -6,26 +6,17 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES:= \
keymaster_test.cpp
# Note that "bionic" is needed because of stlport
LOCAL_C_INCLUDES := \
bionic \
external/gtest/include \
external/openssl/include \
external/stlport/stlport
LOCAL_SHARED_LIBRARIES := \
liblog \
libutils \
libcrypto \
libstlport \
libhardware
LOCAL_STATIC_LIBRARIES := \
libgtest \
libgtest_main
libhardware \
LOCAL_MODULE := keymaster_test
LOCAL_MODULE_TAGS := tests
include $(BUILD_EXECUTABLE)
include $(BUILD_NATIVE_TEST)