Remove VNDK definition(s)
As of VNDK deprecation, any libraries that defines vndk is no longer
valid anymore. This change removes all VNDK definition(s) from modules
which was VNDK. Any former VNDK-SP libraries will be marked as double-loadable,
so it can keep be able to be referenced by LLNDK libraries.
Bug: 328994089
Test: AOSP CF build succeeded
Change-Id: Ib193be854ac834701dac728e1a2832a72cea075b
diff --git a/Android.bp b/Android.bp
index 0cd395b..9d63265 100644
--- a/Android.bp
+++ b/Android.bp
@@ -29,10 +29,7 @@
name: "libRSDriver",
vendor_available: true,
native_bridge_supported: true,
- vndk: {
- enabled: true,
- support_system_process: true,
- },
+ double_loadable: true,
defaults: ["rs_defaults"],
srcs: [
@@ -168,10 +165,7 @@
name: "libRS_internal",
vendor_available: true,
native_bridge_supported: true,
- vndk: {
- enabled: true,
- support_system_process: true,
- },
+ double_loadable: true,
defaults: ["rs_defaults"],
srcs: [
diff --git a/cpu_ref/Android.bp b/cpu_ref/Android.bp
index 7d76d66..7e469cb 100644
--- a/cpu_ref/Android.bp
+++ b/cpu_ref/Android.bp
@@ -7,10 +7,7 @@
defaults: ["libbcc-targets"],
vendor_available: true,
native_bridge_supported: true,
- vndk: {
- enabled: true,
- support_system_process: true,
- },
+ double_loadable: true,
srcs: [
"rsCpuCore.cpp",
diff --git a/toolkit/Android.bp b/toolkit/Android.bp
index dc3ca1b..0867e55 100644
--- a/toolkit/Android.bp
+++ b/toolkit/Android.bp
@@ -20,10 +20,7 @@
defaults: [],
vendor_available: false,
native_bridge_supported: false,
- vndk: {
- enabled: false,
- support_system_process: false,
- },
+ double_loadable: true,
srcs: [
"Blend.cpp",
