commit 3f1ce2026a6d97742fb9c4d194d1213cdfe7b673
author android-build-team Robot <android-build-team-robot@google.com> Tue Oct 20 00:02:30 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Oct 20 00:02:30 2020 +0000
tree eff812ff320fb13dbeccd30a369b3a0b33994b94
parent 5f3caad23d22319e62a7ccba8ea65dcf452b142d
parent 3e19b746370b7957fc62e397c3ece7cdd62c1b73

Snap for 6916203 from 3e19b746370b7957fc62e397c3ece7cdd62c1b73 to mainline-release

Change-Id: Icba6eab00a54c60370e6e973370c0b7474489f89

cpu_ref/Android.bp

diff --git a/cpu_ref/Android.bp b/cpu_ref/Android.bp
index b8da924..84b90af 100644
--- a/cpu_ref/Android.bp
+++ b/cpu_ref/Android.bp
@@ -86,12 +86,6 @@
         },
     },
 
-    target: {
-        arm_on_x86: {
-            cflags: ["-DBUILD_ARM_FOR_X86"],
-        },
-    },
-
     shared_libs: [
         "libRS_internal",
         "libc++",

cpu_ref/rsCpuScript.h

diff --git a/cpu_ref/rsCpuScript.h b/cpu_ref/rsCpuScript.h
index e9feb1c..9ba65c7 100644
--- a/cpu_ref/rsCpuScript.h
+++ b/cpu_ref/rsCpuScript.h
@@ -155,20 +155,34 @@
 
 } // 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 {