Merge "Add options for dynamic linker developer warnings" into nyc-dev
diff --git a/core/main.mk b/core/main.mk
index 5c2e3a1..82eba37 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -341,6 +341,14 @@
# Jacoco package name for Jack
-include $(TOPDIR)external/jacoco/config.mk
+#
+# -----------------------------------------------------------------
+# Enable dynamic linker developer warnings for all builds except
+# final release.
+ifneq ($(PLATFORM_VERSION_CODENAME),REL)
+ ADDITIONAL_BUILD_PROPERTIES += ro.bionic.ld.warning=1
+endif
+
# -----------------------------------------------------------------
###
### In this section we set up the things that are different