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

am: 0871e0029f

Change-Id: I99c7199e7a037e123a6a66e442874c86780def6b
This commit is contained in:
Jiyong Park 2017-03-14 02:26:44 +00:00 committed by android-build-merger
commit bc10ee9771
1 changed files with 3 additions and 3 deletions

View File

@ -227,9 +227,9 @@ in Android.bp to do so.")
# Here, vendor means vendor/oem/odm # Here, vendor means vendor/oem/odm
lib_type := vendor_provided lib_type := vendor_provided
else else
# Test lib falls into this. No lib_type required for them. # Test, samples lib falls into this. No lib_type required for them.
ifneq ($(filter tests,$(LOCAL_MODULE_TAGS)),tests) ifeq ($(filter tests samples,$(LOCAL_MODULE_TAGS)),)
$(call pretty-error,Cannot determine the type of this library) $(call pretty-warning,Cannot determine the type of this library)
endif endif
lib_type := lib_type :=
endif endif