diff options
author | 2023-03-09 13:20:02 -0800 | |
---|---|---|
committer | 2023-03-10 22:00:14 +0000 | |
commit | 8eb4123b3847ee16dc41f1087fa760e81cdd311e (patch) | |
tree | fc7315c3305444b333483603f167cd0386edefe8 | |
parent | 55665b827e68cfbabd0a082c4d444d11e6bab408 (diff) |
Filter out renderscript libraries for riscv
As a temporary measure while renderscript is still packaged into the
generic system, filter out loading these libraries for riscv.
Bug: 206676167
Test: Verified on aosp_cf_riscv64_slim that ART does not load libRS,
even though it is present in public.libraries.txt.
Change-Id: I433039688907cac75468ae8403d94aab7cc430a8
-rw-r--r-- | libnativeloader/public_libraries.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libnativeloader/public_libraries.cpp b/libnativeloader/public_libraries.cpp index fae4d76d95..896c5c7106 100644 --- a/libnativeloader/public_libraries.cpp +++ b/libnativeloader/public_libraries.cpp @@ -458,6 +458,12 @@ Result<std::vector<std::string>> ParseConfig( if (entry.bitness == ONLY_64) continue; #endif + // TODO(b/206676167): Remove this check when renderscript is officially removed. +#if defined(__riscv) + // skip renderscript lib on riscv target + if (entry.soname == "libRS.so") continue; +#endif + Result<bool> ret = filter_fn(entry); if (!ret.ok()) { return ret.error(); |