diff options
| author | Victor Khimenko <khim@google.com> | 2020-09-18 10:00:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-18 10:00:51 +0000 |
| commit | b3242e04d1ba3f9172e30ac88311affd73a36049 (patch) | |
| tree | eff812ff320fb13dbeccd30a369b3a0b33994b94 | |
| parent | bb11953f7cd738c8caf4d90bbe1267bc0a533019 (diff) | |
| parent | 130588449444219466dd5e7125528cd2de5a2572 (diff) | |
| download | rs-android11-qpr3-s1-release.tar.gz | |
Use __ANDROID_NATIVE_BRIDGE__ define instead of target:arm_on_x86 am: c0754c6f0d am: 1305884494android-11.0.0_r46android-11.0.0_r43android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r30android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-c-release
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/rs/+/12628921
Change-Id: Id0e75eeace4e6eab707e9fa178b1dbc83a712a6d
| -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 { |