Merge "Remove clang: true"
diff --git a/Android.bp b/Android.bp
index 038baa5..8dba1d8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -46,7 +46,6 @@
     shared_libs: [
         "liblog",
     ],
-    clang: true,
     cflags: [
         "-Werror",
         "-fvisibility=protected",
@@ -63,7 +62,6 @@
 
 cc_library_shared {
     name: "libnativehelper_compat_libc++",
-    clang: true,
     export_include_dirs: [
         "include",
         "include/nativehelper", // TODO(b/63762847): remove
diff --git a/tests/Android.bp b/tests/Android.bp
index 523b419..21d4073 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -4,7 +4,6 @@
     name: "JniInvocation_test",
     test_suites: ["device-tests"],
     host_supported: true,
-    clang: true,
     srcs: ["JniInvocation_test.cpp"],
     shared_libs: ["libnativehelper"],
 }