Merge "Silence module path warnings for a while"

2017-03-16 05:49:25 +00:00
parent f32107fbb2 79f5918199
commit d5c3d1366f
1 changed files with 2 additions and 0 deletions
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -299,10 +299,12 @@ else
    # paths.
    ifeq ($(my_module_is_soong),false)
      ifneq ($(my_module_path),$(my_module_default_path))
+        ifeq ($(SHOW_MODULE_PATH_WARNINGS),true)
        # TODO(b/35020635): s/warning/error/
        $(call pretty-warning,$(lib_type) library must be installed to \
 $(subst $(PRODUCT_OUT)/,,$(my_module_default_path)) but requested to be installed at \
 $(subst $(PRODUCT_OUT)/,,$(my_module_path)). Please fix.)
+        endif
      endif
    else
      # For Soong-defined module, symlink is provided if the path has been amended