commit d5b56a9fb3e00939ac76e9ed473bc8ac5c00dd39
author Devin Moore <devinmoore@google.com> Fri Jul 30 15:14:28 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 30 15:14:28 2021 +0000
tree baae021554b68a5e76caddfd6ebbb2c572b5506a
parent 45eee70204059d19cdf4e5a2d8e1fd57d65cc6c0
parent 5d5f156e4668bb60360cc834a39854d99e5f22c3

Merge "Change __assert calls to check"

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index ec38cea..5e2d03c 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -58,10 +58,10 @@
     // These are static libs only for testing purposes and portability. Shared
     // libs should be used on device.
     static_libs: [
-        "android.hardware.common-V2-ndk_platform",
-        "android.hardware.common.fmq-V1-ndk_platform",
+        "android.hardware.common-V2-ndk",
+        "android.hardware.common.fmq-V1-ndk",
         "android.hardware.tests.msgq@1.0",
-        "android.fmq.test-ndk_platform",
+        "android.fmq.test-ndk",
     ],
     whole_static_libs: [
         "android.hardware.tests.msgq@1.0-impl",
@@ -94,7 +94,7 @@
         "libutils",
     ],
     static_libs: [
-        "android.hardware.common.fmq-V1-ndk_platform",
+        "android.hardware.common.fmq-V1-ndk",
     ],
 
     cflags: [

tests/aidl/default/Android.bp

diff --git a/tests/aidl/default/Android.bp b/tests/aidl/default/Android.bp
index 71a5533..35bd043 100644
--- a/tests/aidl/default/Android.bp
+++ b/tests/aidl/default/Android.bp
@@ -10,7 +10,7 @@
         "libfmq",
     ],
     static_libs: [
-        "android.fmq.test-ndk_platform",
+        "android.fmq.test-ndk",
     ],
     export_include_dirs: ["."],
     srcs: [