Snap for 4625912 from 6b56b692bc74a19f293e378c0dffea15460f4870 to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r3android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r2android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-release

Change-Id: I7481c5218a745924766dc0a7845ee64de4c14403

1 files changed, 50 insertions, 0 deletions

diff --git a/tests/Android.bp b/tests/Android.bp
index e6cbf5c..a5bdee9 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -8,3 +8,53 @@ cc_test {
     cflags: ["-Wall", "-Werror"],
     shared_libs: ["libnativehelper"],
 }
+
+cc_test {
+  name: "JniSafeRegisterNativeMethods_test",
+  host_supported: true,
+  srcs: ["JniSafeRegisterNativeMethods_test.cpp"],
+
+  cflags: [
+      // Base set of cflags used by all things ART.
+      "-fno-rtti",
+      "-ggdb3",
+      "-Wall",
+      "-Werror",
+      "-Wextra",
+      "-Wstrict-aliasing",
+      "-fstrict-aliasing",
+      "-Wunreachable-code",
+      "-Wredundant-decls",
+      "-Wshadow",
+      "-Wunused",
+      "-fvisibility=protected",
+
+      // Warn about thread safety violations with clang.
+      "-Wthread-safety",
+      "-Wthread-safety-negative",
+
+      // Warn if switch fallthroughs aren't annotated.
+      "-Wimplicit-fallthrough",
+
+      // Enable float equality warnings.
+      "-Wfloat-equal",
+
+      // Enable warning of converting ints to void*.
+      "-Wint-to-void-pointer-cast",
+
+      // Enable warning of wrong unused annotations.
+      "-Wused-but-marked-unused",
+
+      // Enable warning for deprecated language features.
+      "-Wdeprecated",
+
+      // Enable warning for unreachable break & return.
+      "-Wunreachable-code-break",
+      "-Wunreachable-code-return",
+
+      // Enable thread annotations for std::mutex, etc.
+      "-D_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS",
+  ],
+
+  shared_libs: ["libnativehelper"],
+}