| commit | 7e57aa7d6555128150219fa99e79a2ef051db40f | [log] [tgz] |
|---|---|---|
| author | Tim Murray <timmurray@google.com> | Mon Oct 06 10:43:20 2014 -0700 |
| committer | Tim Murray <timmurray@google.com> | Mon Oct 06 10:43:20 2014 -0700 |
| tree | ff961a6836bafe2e17d506e853d3aedaf65c7a73 | |
| parent | 5ac3f46cf69d4abe377a266b96d0927d864c9868 [diff] |
Enable 64-bit building for libRScpp_static. bug 17666041 Change-Id: I964ef9ee11826fb748fc0419d66eb5a9a670580e
diff --git a/cpp/Android.mk b/cpp/Android.mk index a170a5e..a4e4c90 100644 --- a/cpp/Android.mk +++ b/cpp/Android.mk
@@ -49,7 +49,11 @@ endif LOCAL_CFLAGS += $(local_cflags_for_rs_cpp) +ifeq ($(my_32_64_bit_suffix),32) LOCAL_SDK_VERSION := 8 +else +LOCAL_SDK_VERSION := 21 +endif LOCAL_CFLAGS += -DRS_COMPATIBILITY_LIB LOCAL_SRC_FILES := $(rs_cpp_SRC_FILES)
diff --git a/java/tests/HelloComputeNDK/Android.mk b/java/tests/HelloComputeNDK/Android.mk index 830399e..58b95aa 100644 --- a/java/tests/HelloComputeNDK/Android.mk +++ b/java/tests/HelloComputeNDK/Android.mk
@@ -24,7 +24,6 @@ LOCAL_PACKAGE_NAME := HelloComputeNDK LOCAL_SDK_VERSION := 14 -LOCAL_32_BIT_ONLY := true LOCAL_JNI_SHARED_LIBRARIES := libhellocomputendk
diff --git a/java/tests/HelloComputeNDK/libhellocomputendk/Android.mk b/java/tests/HelloComputeNDK/libhellocomputendk/Android.mk index 2b197f1..928accb 100644 --- a/java/tests/HelloComputeNDK/libhellocomputendk/Android.mk +++ b/java/tests/HelloComputeNDK/libhellocomputendk/Android.mk
@@ -31,6 +31,5 @@ LOCAL_LDFLAGS := -Wl,-Bsymbolic LOCAL_SHARED_LIBRARIES := libdl liblog libjnigraphics LOCAL_STATIC_LIBRARIES := libRScpp_static -LOCAL_32_BIT_ONLY := true include $(BUILD_SHARED_LIBRARY)