Merge "Remove VNDK definition(s)" into main am: 364678a133 am: 167d975fee
Original change: https://android-review.googlesource.com/c/platform/frameworks/rs/+/2996865
Change-Id: I4cbbe7e16df7423b64432fe2166d320397989160
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/Android.bp b/Android.bp
index 9bfd264..c24ed3c 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 37db140..0d1e179 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 f6caf97..30bda04 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",
