diff options
| author | Stephen Hines <srhines@google.com> | 2015-07-24 16:45:36 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2015-07-27 13:04:30 -0700 |
| commit | 648a1c137663ef7207684d0d7009dd5518942111 (patch) | |
| tree | deb2260741dc70a883a4811282e5725e0f68f9a8 /java/tests/RSTest_CompatLib/Android.mk | |
| parent | 697efc125b3a9844602551ff1de11f275761e584 (diff) | |
| download | android_frameworks_rs-648a1c137663ef7207684d0d7009dd5518942111.tar.gz android_frameworks_rs-648a1c137663ef7207684d0d7009dd5518942111.tar.bz2 android_frameworks_rs-648a1c137663ef7207684d0d7009dd5518942111.zip | |
Prepare for arm64 prebuilts of RS support library.
Bug: 22693954
This change fixes update_rs_prebuilts.sh to build for arm64 as well. It
also makes some changes to RSTest_CompatLib for working on arm64 (i.e.
removed APIs, etc.). The old version of RSTest_CompatLib is retained as
RSTest_CompatLibLegacy, but it is disabled from building due to errors
with mma and FORCE_BUILD_RS_COMPAT. We also now need to ensure we
properly build all the required libraries (both .so and .a files).
Change-Id: If89b8a542eb0d61db0ba186d4e3221bcc6e5664b
Diffstat (limited to 'java/tests/RSTest_CompatLib/Android.mk')
| -rw-r--r-- | java/tests/RSTest_CompatLib/Android.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/java/tests/RSTest_CompatLib/Android.mk b/java/tests/RSTest_CompatLib/Android.mk index bcfdec0a..8ef89105 100644 --- a/java/tests/RSTest_CompatLib/Android.mk +++ b/java/tests/RSTest_CompatLib/Android.mk @@ -26,8 +26,8 @@ LOCAL_PACKAGE_NAME := RSTest_Compat LOCAL_STATIC_JAVA_LIBRARIES := android-support-v8-renderscript LOCAL_SDK_VERSION := 8 -LOCAL_RENDERSCRIPT_TARGET_API := 18 -LOCAL_RENDERSCRIPT_COMPATIBILITY := 18 +LOCAL_RENDERSCRIPT_TARGET_API := 23 +LOCAL_RENDERSCRIPT_COMPATIBILITY := 23 LOCAL_RENDERSCRIPT_CC := $(LLVM_RS_CC) LOCAL_RENDERSCRIPT_INCLUDES_OVERRIDE := \ @@ -36,6 +36,5 @@ LOCAL_RENDERSCRIPT_INCLUDES_OVERRIDE := \ LOCAL_RENDERSCRIPT_FLAGS := -rs-package-name=android.support.v8.renderscript LOCAL_JNI_SHARED_LIBRARIES := librsjni -LOCAL_32_BIT_ONLY := true include $(BUILD_PACKAGE) |