diff options
| author | Victor Khimenko <khim@google.com> | 2020-09-18 09:04:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-18 09:04:01 +0000 |
| commit | 130588449444219466dd5e7125528cd2de5a2572 (patch) | |
| tree | eff812ff320fb13dbeccd30a369b3a0b33994b94 | |
| parent | 3fc752ef69553a374ca7dc425e0429b959135175 (diff) | |
| parent | c0754c6f0d63c789a952c9ee93858fed336dea28 (diff) | |
| download | rs-130588449444219466dd5e7125528cd2de5a2572.tar.gz | |
Use __ANDROID_NATIVE_BRIDGE__ define instead of target:arm_on_x86 am: c0754c6f0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/rs/+/12628921
Change-Id: I7f2d4bd688dd294f7f70a9cde0e68b4873241af2
| -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 { |