commit 3e19b746370b7957fc62e397c3ece7cdd62c1b73
author Victor Khimenko <khim@google.com> Fri Sep 18 09:05:33 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Sep 18 09:05:33 2020 +0000
tree eff812ff320fb13dbeccd30a369b3a0b33994b94
parent 8f6ec9e290c7d4a53456df2fcdacbc4bedcd2d69
parent c0754c6f0d63c789a952c9ee93858fed336dea28

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: Ib44d02655e407cd28e661d246608596e6a6fa84e

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 {