commit 0871e0029fba1d797caf8ae8944ac6f93dcea781
author Jiyong Park <jiyong@google.com> Tue Mar 14 02:21:43 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Mar 14 02:21:43 2017 +0000
tree 07c88b50a8309d8ceb1d03b45e2dbea8b326a49d
parent a2b86b14a5c6a470355a27d53df213091994c92d
parent b1331938a3f2c8073ac0b1d87555e715c6012f28

Merge "fix: cannot determine the type of modules with class 'samples'"
am: b1331938a3

Change-Id: I2908df25418d37f4be1c653110233900a063af8c

core/base_rules.mk

diff --git a/core/base_rules.mk b/core/base_rules.mk
index 2f7852d..1fb516b 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -227,9 +227,9 @@
     # Here, vendor means vendor/oem/odm
     lib_type := vendor_provided
   else
-    # Test lib falls into this. No lib_type required for them.
-    ifneq ($(filter tests,$(LOCAL_MODULE_TAGS)),tests)
-      $(call pretty-error,Cannot determine the type of this library)
+    # Test, samples lib falls into this. No lib_type required for them.
+    ifeq ($(filter tests samples,$(LOCAL_MODULE_TAGS)),)
+      $(call pretty-warning,Cannot determine the type of this library)
     endif
     lib_type :=
   endif