fix build.pl deps

Change-Id: Ia532558eb25c3745f9d43303358b785994f389fe

solenv/bin/build.pl

@@ -556,9 +556,10 @@ sub expand_dependencies {
 sub get_tail_build_modules {
     my $tail_build_prj = shift;
     my $make = $ENV{'GNUMAKE'};
+    my $build_type = $ENV{'BUILD_TYPE'};
 
     my $tail_build_mk = "$tail_build_module_dir/Module_$tail_build_prj.mk";
-    my $modules_str = `$make --no-print-directory -r -f $tail_build_modules_mk get_modules TAIL_BUILD_MK=$tail_build_mk`;
+    my $modules_str = `$make --no-print-directory -r -f $tail_build_modules_mk get_modules TAIL_BUILD_MK=$tail_build_mk BUILD_TYPE='$build_type'`;
     chomp $modules_str;
 
     my %modules = ();

solenv/gbuild/tail_build_modules.mk

@@ -29,6 +29,10 @@ TAIL_BUILD_MODULES :=
 
 gb_Module_Module :=
 
+define gb_Helper_optional
+$(if $(filter $(1),$(BUILD_TYPE)),$(2))
+endef
+
 define gb_Module_add_moduledirs
 TAIL_BUILD_MODULES += $(2)