diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2020-09-18 23:15:18 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-09-18 23:15:18 +0000 |
commit | 05b41b1268f1c1b511a00bda240f9b328bef03d8 (patch) | |
tree | eff812ff320fb13dbeccd30a369b3a0b33994b94 | |
parent | b8c986198edb5c025878d2f654df62962dae74bc (diff) | |
parent | b3242e04d1ba3f9172e30ac88311affd73a36049 (diff) | |
download | rs-05b41b1268f1c1b511a00bda240f9b328bef03d8.tar.gz |
Snap for 6847696 from b3242e04d1ba3f9172e30ac88311affd73a36049 to rvc-qpr1-releaseandroid-11.0.0_r31android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-release
Change-Id: I76836028fc3339c1fb47433d2a4100b9efd8802b
-rw-r--r-- | cpu_ref/Android.bp | 6 | ||||
-rw-r--r-- | cpu_ref/rsCpuScript.h | 22 |
2 files changed, 18 insertions, 10 deletions
diff --git a/cpu_ref/Android.bp b/cpu_ref/Android.bp index b8da9245..84b90afa 100644 --- a/cpu_ref/Android.bp +++ b/cpu_ref/Android.bp @@ -86,12 +86,6 @@ cc_library_shared { }, }, - target: { - arm_on_x86: { - cflags: ["-DBUILD_ARM_FOR_X86"], - }, - }, - shared_libs: [ "libRS_internal", "libc++", diff --git a/cpu_ref/rsCpuScript.h b/cpu_ref/rsCpuScript.h index e9feb1c9..9ba65c78 100644 --- a/cpu_ref/rsCpuScript.h +++ b/cpu_ref/rsCpuScript.h @@ -155,20 +155,34 @@ uint32_t constructBuildChecksum(uint8_t const *bitcode, size_t bitcodeSize, } // namespace renderscript +#ifndef __ANDROID_NATIVE_BRIDGE__ + #ifdef __LP64__ #define SYSLIBPATH "/system/lib64" #define SYSLIBPATH_BC "/system/lib64" #define SYSLIBPATH_VENDOR "/system/vendor/lib64" -#elif defined(BUILD_ARM_FOR_X86) && defined(__arm__) -#define SYSLIBPATH "/system/lib/arm" -#define SYSLIBPATH_BC "/system/lib" -#define SYSLIBPATH_VENDOR "/system/vendor/lib/arm" #else #define SYSLIBPATH "/system/lib" #define SYSLIBPATH_BC "/system/lib" #define SYSLIBPATH_VENDOR "/system/vendor/lib" #endif +#else + +#if defined(__arm__) +#define SYSLIBPATH "/system/lib/arm" +#define SYSLIBPATH_BC "/system/lib" +#define SYSLIBPATH_VENDOR "/system/vendor/lib/arm" +#elif defined(__aarch64__) +#define SYSLIBPATH "/system/lib64/arm64" +#define SYSLIBPATH_BC "/system/lib64" +#define SYSLIBPATH_VENDOR "/system/vendor/lib64/arm64" +#else +#error Unknown architecture +#endif + +#endif + } // namespace android namespace { |