Snap for 9560500 from f397cc424651f11d666f89e47b6687eeb2733a3f to sdk-release
Change-Id: I5909c65fca567554fc72162051a5925c188c3903
diff --git a/Android.bp b/Android.bp
index 4dceabc..8354a88 100644
--- a/Android.bp
+++ b/Android.bp
@@ -148,10 +148,8 @@
compile_multilib: "first",
}
-// Build libavb - this is a static library that depends
-// on only libc and libcrypto, but no other dependencies.
-cc_library_static {
- name: "libavb",
+cc_defaults {
+ name: "libavb_defaults",
defaults: [
"avb_defaults",
"avb_sources",
@@ -175,6 +173,23 @@
},
}
+// Build libavb - this is a static library that depends
+// on only libc and libcrypto, but no other dependencies.
+cc_library_static {
+ name: "libavb",
+ defaults: ["libavb_defaults"],
+}
+
+// Build libavb_non_debug - this is a static library that depends
+// on only libc and libcrypto, but no other dependencies.
+// The non debug version of the library doesn't print any debug
+// message.
+cc_library_static {
+ name: "libavb_non_debug",
+ defaults: ["libavb_defaults"],
+ cflags: ["-UAVB_ENABLE_DEBUG"],
+}
+
// Build libavb_user for the target - in addition to libavb, it
// includes libavb_ab, libavb_user and also depends on libbase and
// libfs_mgr.
