summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
author Cody Heiner <codyheiner@google.com> 2023-03-23 14:54:52 -0700
committer Cody Heiner <codyheiner@google.com> 2023-03-24 21:00:33 +0000
commit27fc19d71dc48030a12b799807d3879398281086 (patch)
treec5d931623da30196551d4f2918e121c6858bdf76 /README.md
parent1530719278206dbb1db45d9dced9d30a43e7a1c4 (diff)
Reword documentation
Test: N/A, documentation change only. Bug: 267208956 Change-Id: Iadc04f771560ed080a0f93338aef8459c9ddb3c8
Diffstat (limited to 'README.md')
-rw-r--r--README.md26
1 files changed, 15 insertions, 11 deletions
diff --git a/README.md b/README.md
index 85e24c6e3..70311cb44 100644
--- a/README.md
+++ b/README.md
@@ -105,31 +105,35 @@ Android.bp files can contain C-style multiline `/* */` and C++ style single-line
### Types
-Variables and properties are strongly typed, variables dynamically based on the
-first assignment, and properties statically by the module type. The supported
-types are:
+Variables and properties are strongly typed. Variables are dynamically typed
+based on the first assignment, and properties are statically typed by the
+module type. The supported types are:
* Bool (`true` or `false`)
* Integers (`int`)
* Strings (`"string"`)
* Lists of strings (`["string1", "string2"]`)
* Maps (`{key1: "value1", key2: ["value2"]}`)
-Maps may values of any type, including nested maps. Lists and maps may have
-trailing commas after the last value.
+Maps may contain values of any type, including nested maps. Lists and maps may
+have trailing commas after the last value.
Strings can contain double quotes using `\"`, for example `"cat \"a b\""`.
### Operators
-Strings, lists of strings, and maps can be appended using the `+` operator.
-Integers can be summed up using the `+` operator. Appending a map produces the
-union of keys in both maps, appending the values of any keys that are present
-in both maps.
+The `+` operator:
+* Sums integers.
+* Concatenates strings and lists.
+* Produces the union of maps.
+
+Concatenating maps produces a map whose keys are the union of the given maps'
+keys, and whose mapped values are the union of the given maps' corresponding
+mapped values.
### Defaults modules
-A defaults module can be used to repeat the same properties in multiple modules.
-For example:
+A `defaults` module can be used to repeat the same properties in multiple
+modules. For example:
```
cc_defaults {