Augmented the number of keys stored in build.options.json

Signed-off-by: Federico Fissore <f.fissore@arduino.cc>

Author: Federico Fissore

src/arduino.cc/builder/create_build_options_map.go

@@ -42,19 +42,31 @@ type CreateBuildOptionsMap struct{}
 func (s *CreateBuildOptionsMap) Run(context map[string]interface{}) error {
 	buildOptions := make(map[string]string)
 
-	for _, key := range []string{constants.CTX_HARDWARE_FOLDERS, constants.CTX_TOOLS_FOLDERS, constants.CTX_LIBRARIES_FOLDERS, constants.CTX_FQBN, constants.CTX_SKETCH_LOCATION, constants.CTX_BUILD_PROPERTIES_RUNTIME_IDE_VERSION} {
-		originalValue := context[key]
-		value := constants.EMPTY_STRING
-		kindOfValue := reflect.TypeOf(originalValue).Kind()
-		if kindOfValue == reflect.Slice {
-			value = strings.Join(originalValue.([]string), ",")
-		} else if kindOfValue == reflect.String {
-			value = originalValue.(string)
-		} else {
-			return utils.Errorf(context, constants.MSG_UNHANDLED_TYPE_IN_CONTEXT, kindOfValue.String(), key)
-		}
+	buildOptionsMapKeys := []string{
+		constants.CTX_HARDWARE_FOLDERS,
+		constants.CTX_TOOLS_FOLDERS,
+		constants.CTX_LIBRARIES_FOLDERS,
+		constants.CTX_FQBN,
+		constants.CTX_SKETCH_LOCATION,
+		constants.CTX_BUILD_PROPERTIES_RUNTIME_IDE_VERSION,
+		constants.CTX_CUSTOM_BUILD_PROPERTIES,
+	}
 
-		buildOptions[key] = value
+	for _, key := range buildOptionsMapKeys {
+		if utils.MapHas(context, key) {
+			originalValue := context[key]
+			value := constants.EMPTY_STRING
+			kindOfValue := reflect.TypeOf(originalValue).Kind()
+			if kindOfValue == reflect.Slice {
+				value = strings.Join(originalValue.([]string), ",")
+			} else if kindOfValue == reflect.String {
+				value = originalValue.(string)
+			} else {
+				return utils.Errorf(context, constants.MSG_UNHANDLED_TYPE_IN_CONTEXT, kindOfValue.String(), key)
+			}
+
+			buildOptions[key] = value
+		}
 	}
 
 	context[constants.CTX_BUILD_OPTIONS] = buildOptions