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

am: b1331938a3

Change-Id: I2908df25418d37f4be1c653110233900a063af8c
This commit is contained in:
Jiyong Park 2017-03-14 02:21:43 +00:00 committed by android-build-merger
commit 0871e0029f

View file

@ -227,9 +227,9 @@ in Android.bp to do so.")
# 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