Merge "Remove ndk_platform backend. Use the ndk backend."
diff --git a/computepipe/example/Android.bp b/computepipe/example/Android.bp
index afcc159..9133121 100644
--- a/computepipe/example/Android.bp
+++ b/computepipe/example/Android.bp
@@ -31,8 +31,8 @@
"libprotobuf-cpp-lite",
"libbase",
"libbinder_ndk",
- "android.automotive.computepipe.runner-V2-ndk_platform",
- "android.automotive.computepipe.registry-V2-ndk_platform",
+ "android.automotive.computepipe.runner-V2-ndk",
+ "android.automotive.computepipe.registry-V2-ndk",
"liblog",
"libutils",
"libdl",
@@ -100,10 +100,10 @@
"libbase",
"libbinder_ndk",
"libutils",
- "android.hardware.automotive.occupant_awareness-V1-ndk_platform",
+ "android.hardware.automotive.occupant_awareness-V1-ndk",
"libprotobuf-cpp-lite",
- "android.automotive.computepipe.runner-V2-ndk_platform",
- "android.automotive.computepipe.registry-V2-ndk_platform",
+ "android.automotive.computepipe.runner-V2-ndk",
+ "android.automotive.computepipe.registry-V2-ndk",
],
cflags: ["-DLOG_TAG=\"FaceTrackerClient\""] + [
"-D_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS",
diff --git a/computepipe/router/1.0/Android.bp b/computepipe/router/1.0/Android.bp
index 12a62a0..4a93693 100644
--- a/computepipe/router/1.0/Android.bp
+++ b/computepipe/router/1.0/Android.bp
@@ -41,8 +41,8 @@
"liblog",
"libutils",
"libbinder_ndk",
- "android.automotive.computepipe.registry-V2-ndk_platform",
- "android.automotive.computepipe.runner-V2-ndk_platform",
+ "android.automotive.computepipe.registry-V2-ndk",
+ "android.automotive.computepipe.runner-V2-ndk",
],
}
@@ -58,7 +58,7 @@
"libutils",
"libbinder_ndk",
"android.automotive.computepipe.router@1.0-impl",
- "android.automotive.computepipe.registry-V2-ndk_platform",
+ "android.automotive.computepipe.registry-V2-ndk",
],
header_libs: [
"computepipe_router_headers",
diff --git a/computepipe/runner/client_interface/Android.bp b/computepipe/runner/client_interface/Android.bp
index d1ad798..3ef8f52 100644
--- a/computepipe/runner/client_interface/Android.bp
+++ b/computepipe/runner/client_interface/Android.bp
@@ -40,8 +40,8 @@
"liblog",
"libnativewindow",
"libutils",
- "android.automotive.computepipe.runner-V2-ndk_platform",
- "android.automotive.computepipe.registry-V2-ndk_platform",
+ "android.automotive.computepipe.runner-V2-ndk",
+ "android.automotive.computepipe.registry-V2-ndk",
"libprotobuf-cpp-lite",
],
include_dirs: [
diff --git a/computepipe/tests/Android.bp b/computepipe/tests/Android.bp
index 3e3bf84..85aef1c 100644
--- a/computepipe/tests/Android.bp
+++ b/computepipe/tests/Android.bp
@@ -35,8 +35,8 @@
"libbinder",
"libutils",
"android.automotive.computepipe.router@1.0-impl",
- "android.automotive.computepipe.runner-V2-ndk_platform",
- "android.automotive.computepipe.registry-V2-ndk_platform",
+ "android.automotive.computepipe.runner-V2-ndk",
+ "android.automotive.computepipe.registry-V2-ndk",
],
}
@@ -59,7 +59,7 @@
"libbinder_ndk",
"libutils",
"android.automotive.computepipe.router@1.0-impl",
- "android.automotive.computepipe.runner-V2-ndk_platform",
- "android.automotive.computepipe.registry-V2-ndk_platform",
+ "android.automotive.computepipe.runner-V2-ndk",
+ "android.automotive.computepipe.registry-V2-ndk",
],
}
diff --git a/computepipe/tests/runner/client_interface/Android.bp b/computepipe/tests/runner/client_interface/Android.bp
index 0f795b4..ffdb815 100644
--- a/computepipe/tests/runner/client_interface/Android.bp
+++ b/computepipe/tests/runner/client_interface/Android.bp
@@ -39,8 +39,8 @@
"libnativewindow",
"computepipe_client_interface",
"computepipe_runner_component",
- "android.automotive.computepipe.registry-V2-ndk_platform",
- "android.automotive.computepipe.runner-V2-ndk_platform",
+ "android.automotive.computepipe.registry-V2-ndk",
+ "android.automotive.computepipe.runner-V2-ndk",
"libprotobuf-cpp-lite",
],
}
diff --git a/watchdog/testclient/Android.bp b/watchdog/testclient/Android.bp
index f8479e6..c5d3c56 100644
--- a/watchdog/testclient/Android.bp
+++ b/watchdog/testclient/Android.bp
@@ -29,7 +29,7 @@
"-Wunused-parameter",
],
shared_libs: [
- "carwatchdog_aidl_interface-V2-ndk_platform",
+ "carwatchdog_aidl_interface-V2-ndk",
"libbase",
"libbinder_ndk",
"liblog",
