diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-15 17:49:02 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-11-15 17:49:02 -0800 |
| commit | fbb6938c9735b34168d8a7844038cb76a23321f9 (patch) | |
| tree | 17e1b4f71d1580e4bb7e3a4445fbac36200aac8c /java | |
| parent | 5f14c575ca33cc58bdf06e254bf57c464c257219 (diff) | |
| download | rs-fbb6938c9735b34168d8a7844038cb76a23321f9.tar.gz | |
Remove platform stlport from frameworks/rs.
The platform libRScpp tests should have been moved over when I moved
the library.
The HelloComputeNDK test should have always been built with the NDK,
since it is testing the NDK library.
Bug: 15193147
Change-Id: I419837505b9ead3c24b5674ea73e52da7739e162
Diffstat (limited to 'java')
| -rw-r--r-- | java/tests/HelloComputeNDK/libhellocomputendk/Android.mk | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/java/tests/HelloComputeNDK/libhellocomputendk/Android.mk b/java/tests/HelloComputeNDK/libhellocomputendk/Android.mk index 9a012a1f..0c4addb5 100644 --- a/java/tests/HelloComputeNDK/libhellocomputendk/Android.mk +++ b/java/tests/HelloComputeNDK/libhellocomputendk/Android.mk @@ -33,5 +33,12 @@ LOCAL_LDFLAGS := -Wl,-Bsymbolic LOCAL_SHARED_LIBRARIES := libdl liblog libjnigraphics LOCAL_STATIC_LIBRARIES := libRScpp_static -include external/stlport/libstlport.mk +ifeq ($(my_32_64_bit_suffix),32) +LOCAL_SDK_VERSION := 8 +else +LOCAL_SDK_VERSION := 21 +endif + +LOCAL_NDK_STL_VARIANT := stlport_static + include $(BUILD_SHARED_LIBRARY) |