diff --git a/graphics/mapper/2.1/Android.bp b/graphics/mapper/2.1/Android.bp
index 971cd99..029fbbe 100644
--- a/graphics/mapper/2.1/Android.bp
+++ b/graphics/mapper/2.1/Android.bp
@@ -66,6 +66,11 @@
     ],
 }
 
+// This package is not java compatible. Not creating java target.
+
+// This package does not export any types. Not creating java constants export.
+
+
 genrule {
     name: "android.hardware.graphics.mapper@2.1-adapter-helper_genc++",
     tools: ["hidl-gen"],
@@ -90,7 +95,6 @@
     ],
 }
 
-
 cc_library {
     name: "android.hardware.graphics.mapper@2.1-adapter-helper",
     defaults: ["hidl-module-defaults"],
@@ -135,6 +139,7 @@
 
 cc_test {
     name: "android.hardware.graphics.mapper@2.1-adapter",
+    defaults: ["hidl-module-defaults"],
     shared_libs: [
         "libhidladapter",
         "libhidlbase",