Commit Graph

63885 Commits

Author SHA1 Message Date
Jiyong Park
7aeb8de74e Support optional prop assignments
This CL adds a number of changes to make the assignment of system
properties to be less confusing.

1. Added `a ?= b` syntax, which is called optional prop assignments. The
prop `a` gets the value `b` only when there is no non-optional prop
assignment for `a` such as `a = c`. This is useful for props that
provide some reasonable default values as fallback.

2. With the introduction of the optional prop assignment syntax,
duplicated non-optional assignments is prohibited; e.g., the follwing
now triggers a build-time error:

a = b
a = c

, but the following doesn't:

a ?= b
a = c

Note that the textual order between the optional and non-optional
assignments doesn't matter. The non-optional assignment eclipses the
optional assignment even when the former appears 'before' the latter.

a = c
a ?= b

In the above, `a` gets the value `c`

When there are multiple optional assignments without a non-optional
assignments as shown below, the last one wins:

a ?= b
a ?= c

`a` becomes `c`. Specifically, the former assignment is commented out
and the latter is converted to a non-optional assignment.

3. post_process_props.py is modified so that when a prop assignment is
deleted, changed, or added, the changes are recorded as comments. This
is to aid debugging. Previously, it was often difficult to find out why
a certain sysprop assignment is missing or is added.

4. post_process_prop.py now has a unittest

Bug: 117892318
Bug: 158735147
Test: atest --host post_process_prop_unittest

Change-Id: I9c073a21c8257987cf2378012cadaeeeb698a4fb
2020-06-25 09:46:57 +09:00
Colin Cross
4e291db258 Merge "Use inclusive language in build/make part 2" am: e1ab4cb610 am: 09ee73f2a7 am: 0bd0e1bb69 am: b7d72f1cd5 am: fe39c5f99d
Original change: https://android-review.googlesource.com/c/platform/build/+/1344806

Change-Id: Ife3991d77d7121f36f74b6510ca881e7af8aee96
2020-06-24 23:08:49 +00:00
TreeHugger Robot
0ff84fc80b Merge "Add biometrics.fingerprint@2.3 to VNDK-core" 2020-06-24 22:56:45 +00:00
Colin Cross
fe39c5f99d Merge "Use inclusive language in build/make part 2" am: e1ab4cb610 am: 09ee73f2a7 am: 0bd0e1bb69 am: b7d72f1cd5
Original change: https://android-review.googlesource.com/c/platform/build/+/1344806

Change-Id: I5672b744e075026cd94bfb320a98a7ee87090afe
2020-06-24 22:54:01 +00:00
Colin Cross
b7d72f1cd5 Merge "Use inclusive language in build/make part 2" am: e1ab4cb610 am: 09ee73f2a7 am: 0bd0e1bb69
Original change: https://android-review.googlesource.com/c/platform/build/+/1344806

Change-Id: I59a1f034102d39a721f9c9999cb1c29b316c702f
2020-06-24 22:37:49 +00:00
Colin Cross
0bd0e1bb69 Merge "Use inclusive language in build/make part 2" am: e1ab4cb610 am: 09ee73f2a7
Original change: https://android-review.googlesource.com/c/platform/build/+/1344806

Change-Id: Ic71f7ecd3dbc384957dc671013eb7772ab7311d2
2020-06-24 22:24:54 +00:00
Colin Cross
09ee73f2a7 Merge "Use inclusive language in build/make part 2" am: e1ab4cb610
Original change: https://android-review.googlesource.com/c/platform/build/+/1344806

Change-Id: I73962b9319367a5305ff35f16b0dad3a4e482ae0
2020-06-24 22:09:24 +00:00
Colin Cross
e1ab4cb610 Merge "Use inclusive language in build/make part 2" 2020-06-24 21:58:46 +00:00
Kelvin Zhang
38bc8fabe9 Merge "Fix lint errors in ota_from_target_files script" am: c8b4784cb9 am: 36b5ebb1cf am: 36b904f9c7 am: 965bd94fe4 am: 5f45e746f4
Original change: https://android-review.googlesource.com/c/platform/build/+/1348022

Change-Id: I5e6ebd2cc85965f43730d729b69eadf162ae16a7
2020-06-24 20:39:27 +00:00
Kelvin Zhang
5f45e746f4 Merge "Fix lint errors in ota_from_target_files script" am: c8b4784cb9 am: 36b5ebb1cf am: 36b904f9c7 am: 965bd94fe4
Original change: https://android-review.googlesource.com/c/platform/build/+/1348022

Change-Id: Id9dc58157970d967d4b94b78a353470bee191ef4
2020-06-24 20:12:53 +00:00
Kelvin Zhang
965bd94fe4 Merge "Fix lint errors in ota_from_target_files script" am: c8b4784cb9 am: 36b5ebb1cf am: 36b904f9c7
Original change: https://android-review.googlesource.com/c/platform/build/+/1348022

Change-Id: I38541e6f7b25fe3eb1b237eff657d7712b25d3b1
2020-06-24 20:02:00 +00:00
Kelvin Zhang
36b904f9c7 Merge "Fix lint errors in ota_from_target_files script" am: c8b4784cb9 am: 36b5ebb1cf
Original change: https://android-review.googlesource.com/c/platform/build/+/1348022

Change-Id: Ie3dc11187c2207fbeeae178d41204a6f5858be51
2020-06-24 19:42:34 +00:00
Kelvin Zhang
36b5ebb1cf Merge "Fix lint errors in ota_from_target_files script" am: c8b4784cb9
Original change: https://android-review.googlesource.com/c/platform/build/+/1348022

Change-Id: I8bc28e4f7b283d1d34dd90ca4f05309585326277
2020-06-24 19:32:29 +00:00
Kelvin Zhang
c8b4784cb9 Merge "Fix lint errors in ota_from_target_files script" 2020-06-24 19:17:35 +00:00
Colin Cross
d1cbfeaa3a Use inclusive language in build/make part 2
Test: m checkbuild
Bug: 158889297
Change-Id: I63bac680cc63a8564f35ae85dda1a0b09c9fd541
2020-06-24 12:03:08 -07:00
Kelvin Zhang
0876c410ad Fix lint errors in ota_from_target_files script
Only changes code styles, should be No-op to functionality

Test: Run unit tests
Bug: 159723838
Change-Id: Icf6146eb0d6b3fb66478709c0edf55bce54db68f
2020-06-24 09:21:35 -04:00
TreeHugger Robot
80b8a8b146 Merge "Revert "Add a check for apex/allowed_deps.txt to droidcore."" 2020-06-24 12:35:20 +00:00
Roland Levillain
6512cccc4c Merge "Warn about the use of COVERAGE_PATHS and COVERAGE_EXCLUDE_PATHS." am: 4a203a6326 am: 053e972a22 am: 02a69dade0 am: 7500274927 am: 97316cf200
Original change: https://android-review.googlesource.com/c/platform/build/+/1328973

Change-Id: I9d319b93619eb3641a67a9d3f5f59fcfa5cecea2
2020-06-24 11:51:26 +00:00
Roland Levillain
97316cf200 Merge "Warn about the use of COVERAGE_PATHS and COVERAGE_EXCLUDE_PATHS." am: 4a203a6326 am: 053e972a22 am: 02a69dade0 am: 7500274927
Original change: https://android-review.googlesource.com/c/platform/build/+/1328973

Change-Id: I9d3d168b079983e1a3d3f7deb2c30ad01ce6b44c
2020-06-24 11:35:50 +00:00
Roland Levillain
7500274927 Merge "Warn about the use of COVERAGE_PATHS and COVERAGE_EXCLUDE_PATHS." am: 4a203a6326 am: 053e972a22 am: 02a69dade0
Original change: https://android-review.googlesource.com/c/platform/build/+/1328973

Change-Id: I68bae3a334b8aa3d56bf70f1ccf531403e55e581
2020-06-24 11:16:17 +00:00
Roland Levillain
02a69dade0 Merge "Warn about the use of COVERAGE_PATHS and COVERAGE_EXCLUDE_PATHS." am: 4a203a6326 am: 053e972a22
Original change: https://android-review.googlesource.com/c/platform/build/+/1328973

Change-Id: Ia66d95b0f81d6f8cb75d2dbc9dc36a5806dea5e1
2020-06-24 10:57:31 +00:00
Roland Levillain
053e972a22 Merge "Warn about the use of COVERAGE_PATHS and COVERAGE_EXCLUDE_PATHS." am: 4a203a6326
Original change: https://android-review.googlesource.com/c/platform/build/+/1328973

Change-Id: I70dba2218f426c7bba388433593d89516fadd6c3
2020-06-24 10:32:14 +00:00
Artur Satayev
67e8be4b9c Revert "Add a check for apex/allowed_deps.txt to droidcore."
Revert "Track allowed transitive deps in any updatable module."

Revert submission 11883270-apex-allowed-deps

Reason for revert: b/159762187 broken build
Reverted Changes:
I56771ba3f:Track allowed transitive deps in any updatable mod...
I52a4be72e:Add a check for apex/allowed_deps.txt to droidcore...

Change-Id: If416513fbb4bcdbc38b007ebe2ece8fd87b6ecae
2020-06-24 10:17:19 +00:00
Roland Levillain
4a203a6326 Merge "Warn about the use of COVERAGE_PATHS and COVERAGE_EXCLUDE_PATHS." 2020-06-24 10:16:03 +00:00
TreeHugger Robot
dca0f2472f Merge "Add GNSS HAL v3.0 (make/build)" 2020-06-24 00:58:10 +00:00
TreeHugger Robot
0baf390f12 Merge "Add a check for apex/allowed_deps.txt to droidcore." 2020-06-23 23:51:40 +00:00
Automerger Merge Worker
1c52f66136 Merge "[automerger skipped] Merge "Switch to using llvm-strip for modules" into rvc-dev am: 30d5c93f47 am: bd4f94ecd9 am: 0fb4465e69 -s ours" into rvc-qpr-dev-plus-aosp am: b0583c55c3 -s ours
am skip reason: Change-Id I9c3717bde281667eec82cc21dc63dc7fd5592a46 with SHA-1 74d50ccb69 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11935858

Change-Id: Ibf79739436a6df9c22601eca0793da67f6660195
2020-06-23 21:17:14 +00:00
TreeHugger Robot
6cd0cfed08 [automerger skipped] Merge "Switch to using llvm-strip for modules" into rvc-dev am: 30d5c93f47 -s ours am: 237778440c -s ours am: aa4c8cccf9 -s ours am: e1b64653a6 -s ours
am skip reason: Change-Id I9c3717bde281667eec82cc21dc63dc7fd5592a46 with SHA-1 74d50ccb69 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11935858

Change-Id: I29271da23973ee71bb7c36b63fd39424b372a630
2020-06-23 21:16:59 +00:00
TreeHugger Robot
b0bd174c84 [automerger skipped] Merge "Switch to using llvm-strip for modules" into rvc-dev am: 30d5c93f47 am: bd4f94ecd9 -s ours am: a623175c93 -s ours am: 014b3c3a1d -s ours
am skip reason: Change-Id I9c3717bde281667eec82cc21dc63dc7fd5592a46 with SHA-1 f7586025a2 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11935858

Change-Id: Ief7b9eff51fd69ce43b9b5ad30e591172f8675fe
2020-06-23 21:16:47 +00:00
Automerger Merge Worker
b0583c55c3 Merge "[automerger skipped] Merge "Switch to using llvm-strip for modules" into rvc-dev am: 30d5c93f47 am: bd4f94ecd9 am: 0fb4465e69 -s ours" into rvc-qpr-dev-plus-aosp 2020-06-23 21:03:14 +00:00
TreeHugger Robot
e1b64653a6 [automerger skipped] Merge "Switch to using llvm-strip for modules" into rvc-dev am: 30d5c93f47 -s ours am: 237778440c -s ours am: aa4c8cccf9 -s ours
am skip reason: Change-Id I9c3717bde281667eec82cc21dc63dc7fd5592a46 with SHA-1 74d50ccb69 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11935858

Change-Id: I710a6749d3ee986f58de74367d3ff29b5c32734a
2020-06-23 21:03:10 +00:00
TreeHugger Robot
4b59a9a9f4 [automerger skipped] Merge "Switch to using llvm-strip for modules" into rvc-dev am: 30d5c93f47 am: bd4f94ecd9 am: 0fb4465e69 -s ours
am skip reason: Change-Id I9c3717bde281667eec82cc21dc63dc7fd5592a46 with SHA-1 74d50ccb69 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11935858

Change-Id: I7ac03e8036c530d7374051620357927a8b2f484c
2020-06-23 21:03:04 +00:00
TreeHugger Robot
014b3c3a1d [automerger skipped] Merge "Switch to using llvm-strip for modules" into rvc-dev am: 30d5c93f47 am: bd4f94ecd9 -s ours am: a623175c93 -s ours
am skip reason: Change-Id I9c3717bde281667eec82cc21dc63dc7fd5592a46 with SHA-1 f7586025a2 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11935858

Change-Id: Ia6fe05350b1ea7832ff5f3dea9b0f579f01fba65
2020-06-23 21:02:53 +00:00
TreeHugger Robot
aa4c8cccf9 [automerger skipped] Merge "Switch to using llvm-strip for modules" into rvc-dev am: 30d5c93f47 -s ours am: 237778440c -s ours
am skip reason: Change-Id I9c3717bde281667eec82cc21dc63dc7fd5592a46 with SHA-1 74d50ccb69 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11935858

Change-Id: I40b4581f2d853bbf1adbb7b79ece5c28be6bb691
2020-06-23 20:49:14 +00:00
TreeHugger Robot
a623175c93 [automerger skipped] Merge "Switch to using llvm-strip for modules" into rvc-dev am: 30d5c93f47 am: bd4f94ecd9 -s ours
am skip reason: Change-Id I9c3717bde281667eec82cc21dc63dc7fd5592a46 with SHA-1 f7586025a2 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11935858

Change-Id: I032aa78f16d24e037b028a0812ea6469be7a3658
2020-06-23 20:48:56 +00:00
TreeHugger Robot
0fb4465e69 Merge "Switch to using llvm-strip for modules" into rvc-dev am: 30d5c93f47 am: bd4f94ecd9
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11935858

Change-Id: I9b1c8ff35538d70738d488125859ed78301d5b0f
2020-06-23 20:48:51 +00:00
TreeHugger Robot
237778440c [automerger skipped] Merge "Switch to using llvm-strip for modules" into rvc-dev am: 30d5c93f47 -s ours
am skip reason: Change-Id I9c3717bde281667eec82cc21dc63dc7fd5592a46 with SHA-1 f7586025a2 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11935858

Change-Id: I83f0d1d0fdb99bcc2cd63ff60ff7725db09d5fce
2020-06-23 20:33:35 +00:00
TreeHugger Robot
bd4f94ecd9 Merge "Switch to using llvm-strip for modules" into rvc-dev am: 30d5c93f47
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11935858

Change-Id: I8bafa1ed61f54f782a8f1195f89e275c632cc8ef
2020-06-23 20:33:23 +00:00
TreeHugger Robot
30d5c93f47 Merge "Switch to using llvm-strip for modules" into rvc-dev 2020-06-23 20:17:52 +00:00
Ilya Matyukhin
fbd4fd04c6 Add biometrics.fingerprint@2.3 to VNDK-core
Bug: 158135499
Test: build
Change-Id: Ic17d9c3a4f283eb4cc919009846275d71508cb79
2020-06-23 12:43:51 -07:00
Colin Cross
81ef3691a6 Merge "Rename Native_coverage to GcovCoverage in Soong" am: 5c0acab3e2 am: c018eacb4e am: 94fc2475d3 am: 45e31d6c1d am: af3cc892c7
Original change: https://android-review.googlesource.com/c/platform/build/+/1340937

Change-Id: Idab30f494db3c973227fb26323197d329dffe4eb
2020-06-23 04:13:07 +00:00
Colin Cross
af3cc892c7 Merge "Rename Native_coverage to GcovCoverage in Soong" am: 5c0acab3e2 am: c018eacb4e am: 94fc2475d3 am: 45e31d6c1d
Original change: https://android-review.googlesource.com/c/platform/build/+/1340937

Change-Id: I09e53dd2521656a116efe2aa14288e7e2b699d2b
2020-06-23 04:03:58 +00:00
Colin Cross
45e31d6c1d Merge "Rename Native_coverage to GcovCoverage in Soong" am: 5c0acab3e2 am: c018eacb4e am: 94fc2475d3
Original change: https://android-review.googlesource.com/c/platform/build/+/1340937

Change-Id: Idf6cf39c4a374c88bf94b9985477c6b501bd9ac9
2020-06-23 03:57:18 +00:00
Colin Cross
94fc2475d3 Merge "Rename Native_coverage to GcovCoverage in Soong" am: 5c0acab3e2 am: c018eacb4e
Original change: https://android-review.googlesource.com/c/platform/build/+/1340937

Change-Id: If47bc26c8e1f7d09da94a5a5b185a2d77679d7d8
2020-06-23 03:37:05 +00:00
Treehugger Robot
e79a0d051f Merge "Remove vts10 dependencies" am: 8eba18759b am: 9fdd152da4 am: 226670a93d am: ee4c015e03 am: 06401ff454
Original change: https://android-review.googlesource.com/c/platform/build/+/1314951

Change-Id: Ibba252a325391b0a852ee2b8f4586482709d570b
2020-06-23 03:30:35 +00:00
Colin Cross
c018eacb4e Merge "Rename Native_coverage to GcovCoverage in Soong" am: 5c0acab3e2
Original change: https://android-review.googlesource.com/c/platform/build/+/1340937

Change-Id: Ia009dc13662e87b7f8494849f7d9f35442c9af9d
2020-06-23 03:19:51 +00:00
Treehugger Robot
06401ff454 Merge "Remove vts10 dependencies" am: 8eba18759b am: 9fdd152da4 am: 226670a93d am: ee4c015e03
Original change: https://android-review.googlesource.com/c/platform/build/+/1314951

Change-Id: Ia052ba326618bcc6a1bc7784a760f459186141f9
2020-06-23 03:13:10 +00:00
Colin Cross
5c0acab3e2 Merge "Rename Native_coverage to GcovCoverage in Soong" 2020-06-23 03:06:53 +00:00
Treehugger Robot
ee4c015e03 Merge "Remove vts10 dependencies" am: 8eba18759b am: 9fdd152da4 am: 226670a93d
Original change: https://android-review.googlesource.com/c/platform/build/+/1314951

Change-Id: I58f85d323d07fdf9d78e461c4dda54d2e382b323
2020-06-23 03:01:35 +00:00
Treehugger Robot
226670a93d Merge "Remove vts10 dependencies" am: 8eba18759b am: 9fdd152da4
Original change: https://android-review.googlesource.com/c/platform/build/+/1314951

Change-Id: I6a722ad784210bc40189cee65fc3ec77c03bd3a2
2020-06-23 02:43:26 +00:00