Merge "Add flag to control hidden API warning toasts" am: 4e6c5218db

am: 744c286b07

Change-Id: Ib0734cf6c5a127c2f2c55fd381b10631839a7229
This commit is contained in:
David Brazdil
2018-01-29 10:30:33 +00:00
committed by android-build-merger

View File

@@ -189,14 +189,16 @@ include build/make/core/pdk_config.mk
# #
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# Enable dynamic linker developer warnings for userdebug, eng # Enable dynamic linker and hidden API developer warnings for
# and non-REL builds # userdebug, eng and non-REL builds
ifneq ($(TARGET_BUILD_VARIANT),user) ifneq ($(TARGET_BUILD_VARIANT),user)
ADDITIONAL_BUILD_PROPERTIES += ro.bionic.ld.warning=1 ADDITIONAL_BUILD_PROPERTIES += ro.bionic.ld.warning=1 \
ro.art.hiddenapi.warning=1
else else
# Enable it for user builds as long as they are not final. # Enable it for user builds as long as they are not final.
ifneq ($(PLATFORM_VERSION_CODENAME),REL) ifneq ($(PLATFORM_VERSION_CODENAME),REL)
ADDITIONAL_BUILD_PROPERTIES += ro.bionic.ld.warning=1 ADDITIONAL_BUILD_PROPERTIES += ro.bionic.ld.warning=1 \
ro.art.hiddenapi.warning=1
endif endif
endif endif