diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2020-09-24 00:01:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-09-24 00:01:20 +0000 |
| commit | 6125c8f2fb73fa1ad865d8c57e95eea5409902c4 (patch) | |
| tree | 2caf51b23ddc02131a0dec6ad773da6bed6b4481 | |
| parent | aa41c5d40db512e2af2da96c02df6d2e5e342d65 (diff) | |
| parent | aaf1d629d8b1a86a01aafaab2a4ba5b20797ecee (diff) | |
| download | platform_frameworks_rs-simpleperf-release.tar.gz platform_frameworks_rs-simpleperf-release.tar.bz2 platform_frameworks_rs-simpleperf-release.zip | |
Merge "Snap for 6859336 from dbb4c85e47f5a5ebebc2f1037da53fcbb1b6a0f1 to simpleperf-release" into simpleperf-releasesimpleperf-release
| -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 b8da92458..84b90afad 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 e9feb1c99..9ba65c78a 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 { |