diff options
| author | Stephen Hines <srhines@google.com> | 2014-07-24 02:28:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-24 02:28:42 +0000 |
| commit | 34b2068c973ae65962c61fa11cf785a69bb5e233 (patch) | |
| tree | 71a9ab0cbe4a1c51f74fcb9031c7dd2d0cbbbc33 /java | |
| parent | abe41a94aeda9bc1c3d544e992534f5367a4874a (diff) | |
| parent | fb8fe8207eeb8b93429c7816606d27cf8066ab9f (diff) | |
| download | android_frameworks_rs-34b2068c973ae65962c61fa11cf785a69bb5e233.tar.gz android_frameworks_rs-34b2068c973ae65962c61fa11cf785a69bb5e233.tar.bz2 android_frameworks_rs-34b2068c973ae65962c61fa11cf785a69bb5e233.zip | |
am fb8fe820: Merge changes I2a12d44b,I393f801e
* commit 'fb8fe8207eeb8b93429c7816606d27cf8066ab9f':
Pass -Bsymbolic to the linker from clang when compiling against stlport_static.
Update RS for LLVM rebase to r212749.
Diffstat (limited to 'java')
| -rw-r--r-- | java/tests/HelloComputeNDK/Android.mk | 2 | ||||
| -rw-r--r-- | java/tests/HelloComputeNDK/libhellocomputendk/Android.mk | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/java/tests/HelloComputeNDK/Android.mk b/java/tests/HelloComputeNDK/Android.mk index 5dbe19fd..58b95aa4 100644 --- a/java/tests/HelloComputeNDK/Android.mk +++ b/java/tests/HelloComputeNDK/Android.mk @@ -28,4 +28,4 @@ LOCAL_SDK_VERSION := 14 LOCAL_JNI_SHARED_LIBRARIES := libhellocomputendk include $(BUILD_PACKAGE) -include $(LOCAL_PATH)/libhellocomputendk/Android.mk
\ No newline at end of file +include $(LOCAL_PATH)/libhellocomputendk/Android.mk diff --git a/java/tests/HelloComputeNDK/libhellocomputendk/Android.mk b/java/tests/HelloComputeNDK/libhellocomputendk/Android.mk index 815d530b..2b197f1d 100644 --- a/java/tests/HelloComputeNDK/libhellocomputendk/Android.mk +++ b/java/tests/HelloComputeNDK/libhellocomputendk/Android.mk @@ -28,8 +28,9 @@ LOCAL_C_INCLUDES += frameworks/rs/cpp LOCAL_C_INCLUDES += frameworks/rs LOCAL_C_INCLUDES += external/stlport/stlport bionic/ bionic/libstdc++/include +LOCAL_LDFLAGS := -Wl,-Bsymbolic LOCAL_SHARED_LIBRARIES := libdl liblog libjnigraphics -LOCAL_STATIC_LIBRARIES := libRScpp_static libstlport_static +LOCAL_STATIC_LIBRARIES := libRScpp_static LOCAL_32_BIT_ONLY := true include $(BUILD_SHARED_LIBRARY) |