diff options
| author | Jean-Luc Brouillet <jeanluc@google.com> | 2017-01-13 23:27:37 -0800 |
|---|---|---|
| committer | Jean-Luc Brouillet <jeanluc@google.com> | 2017-01-19 23:05:26 +0000 |
| commit | 675b31e949ac0b894732eac2e1e7bb8914c8321f (patch) | |
| tree | 98ea18240b927ca97d9ab71ebfabbad9e7ec1fd7 /tests/cpp_api/cppbasic/Android.mk | |
| parent | 9e5255b9589786072b5421f9341614e5f8e7c846 (diff) | |
| download | rs-675b31e949ac0b894732eac2e1e7bb8914c8321f.tar.gz | |
Extract into common.mk common C++ compile settings.
No settings have changed. This is just a refactoring that will make
it easier to do further refactoring that will affect includes and
libraries.
Bug: 34265954
Test: Compiled the files.
Test: Ran rstest-compute.
Test: Did not run the lldb tests.
Change-Id: I9dcc47a22fe4dd28fae73a7cee04c53ca9e5a31d
Diffstat (limited to 'tests/cpp_api/cppbasic/Android.mk')
| -rw-r--r-- | tests/cpp_api/cppbasic/Android.mk | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/tests/cpp_api/cppbasic/Android.mk b/tests/cpp_api/cppbasic/Android.mk index 3222e40d..56e952bd 100644 --- a/tests/cpp_api/cppbasic/Android.mk +++ b/tests/cpp_api/cppbasic/Android.mk @@ -1,6 +1,8 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) +LOCAL_MODULE:= rstest-compute + LOCAL_SDK_VERSION := 21 LOCAL_NDK_STL_VARIANT := stlport_static @@ -11,20 +13,7 @@ LOCAL_SRC_FILES:= \ LOCAL_STATIC_LIBRARIES := \ libRScpp_static -LOCAL_CFLAGS := -std=c++11 -Werror LOCAL_LDFLAGS += -llog -ldl -LOCAL_MODULE:= rstest-compute - -LOCAL_MODULE_TAGS := tests - -intermediates := $(call intermediates-dir-for,STATIC_LIBRARIES,libRS,TARGET,) - -LOCAL_C_INCLUDES += frameworks/rs/cpp -LOCAL_C_INCLUDES += frameworks/rs -LOCAL_C_INCLUDES += $(intermediates) - -LOCAL_CLANG := true - +include frameworks/rs/tests/cpp_api/common.mk include $(BUILD_EXECUTABLE) - |