diff --git a/core/jni/Android.mk b/core/jni/Android.mk index c7781f6fe0be42b3c2bb7d68fd01fc2f12a3576b..dd66b24a6b2f919fff96d7687eb15f776575444f 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -28,10 +28,6 @@ LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES LOCAL_CFLAGS += -DU_USING_ICU_NAMESPACE=0 -ifeq ($(WITH_EXAGEAR),true) - LOCAL_CFLAGS += -DWITH_EXAGEAR -endif - LOCAL_SRC_FILES:= \ AndroidRuntime.cpp \ com_android_internal_content_NativeLibraryHelper.cpp \ diff --git a/core/jni/fd_utils-inl.h b/core/jni/fd_utils-inl.h index f97101f3cbf1bac9e271d9b440db51445e3843ff..d1129a3ef59302ca6314199cc90319691c919202 100644 --- a/core/jni/fd_utils-inl.h +++ b/core/jni/fd_utils-inl.h @@ -55,7 +55,6 @@ static const char* kPathWhitelist[] = { "/dev/urandom", "/dev/ion", "/dev/dri/renderD129", // Fixes b/31172436 - "/system/bin/app_process32", }; static const char* kFdPath = "/proc/self/fd"; @@ -574,15 +573,6 @@ class FileDescriptorTable { return -1; } -#if defined(WITH_EXAGEAR) && defined(__arm__) - // Ignore any file descriptors that are above the hard limit. These are - // internal descriptors used by Exagear. - struct rlimit rlim; - if (getrlimit(RLIMIT_NOFILE, &rlim) == 0 && (rlim_t)fd >= rlim.rlim_max) { - return -1; - } -#endif - return fd; }