Merge "Switch to a better way of bypassing the stubs library."
diff --git a/tests/Android.bp b/tests/Android.bp
index 0009288..8bbeed7 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -6,8 +6,10 @@
host_supported: true,
srcs: ["JniInvocation_test.cpp"],
cflags: ["-Wall", "-Werror"],
- // Link tested library statically to bypass stubs.
- static_libs: ["libnativehelper"],
+ // Link to the non-stub version of the library to access some internal
+ // functions.
+ bootstrap: true,
+ shared_libs: ["libnativehelper"],
}
cc_test {