diff --git a/vndk/tools/elfcheck/bpflatten/main.go b/vndk/tools/elfcheck/bpflatten/main.go
index c4450b1..19ac368 100644
--- a/vndk/tools/elfcheck/bpflatten/main.go
+++ b/vndk/tools/elfcheck/bpflatten/main.go
@@ -48,13 +48,13 @@
 		if prefix != "" {
 			name = prefix + "." + name
 		}
-		value := prop.Value.Eval()
+		value := prop.Value
 		if s, isScalar := expandScalarTypeExpression(value); isScalar {
 			propMap[name] = s
 		} else if list, ok := value.(*parser.List); ok {
 			var l []interface{}
 			for _, v := range list.Values {
-				if s, isScalar := expandScalarTypeExpression(v.Eval()); isScalar {
+				if s, isScalar := expandScalarTypeExpression(v); isScalar {
 					l = append(l, s)
 				}
 			}
@@ -70,7 +70,7 @@
 func flattenModule(module *parser.Module) (flattened FlatModule) {
 	flattened.Type = module.Type
 	if prop, found := module.GetProperty("name"); found {
-		if value, ok := prop.Value.Eval().(*parser.String); ok {
+		if value, ok := prop.Value.(*parser.String); ok {
 			flattened.Name = value.Value
 		}
 	} else {