Commit graph

23767 commits

Author SHA1 Message Date
Jakub Pawlowski
d1a49ebe46 Merge "Revert "Add compile_multilib properties to all native prebuilts."" am: ca7b2c3eb7 am: eaa37aec1e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1362483

Change-Id: I32774a84f4891c4c950e00931076f3fc71d9fd7b
2020-07-15 10:54:48 +00:00
Jakub Pawlowski
eaa37aec1e Merge "Revert "Add compile_multilib properties to all native prebuilts."" am: ca7b2c3eb7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1362483

Change-Id: I2bf70a278a2988f8e3e5467cf03a99aa5933e1ca
2020-07-15 10:40:53 +00:00
Jakub Pawlowski
ca7b2c3eb7 Merge "Revert "Add compile_multilib properties to all native prebuilts."" 2020-07-15 10:33:41 +00:00
Charles Chen
29936ae5a7 Revert "Add compile_multilib properties to all native prebuilts."
This reverts commit 1e9c2677fd.

Reason for revert: Break build

Bug: 161315642
Change-Id: Ibf3d5e88412327e8f08d08272b75cd3df34a71e5
2020-07-15 04:01:45 +00:00
Treehugger Robot
ba64405d5e Merge "Add compile_multilib properties to all native prebuilts." am: 6da69732e4 am: f0d3591c9d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1359962

Change-Id: Ifd2e68477e4be452ea7362952ea2bd7f001f623d
2020-07-15 03:19:19 +00:00
Treehugger Robot
f0d3591c9d Merge "Add compile_multilib properties to all native prebuilts." am: 6da69732e4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1359962

Change-Id: Ie1b2ce9321b0e6c2c75d1011544d1cae1e3627ab
2020-07-15 03:03:20 +00:00
Treehugger Robot
6da69732e4 Merge "Add compile_multilib properties to all native prebuilts." 2020-07-15 02:51:21 +00:00
Treehugger Robot
37d791ad91 Merge "Use the build start time from Soong main UI for metrics build timestamp." am: 3058878cc7 am: cf9d84a893
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1362302

Change-Id: I1836366ebc19d113898eb5e20bc06238b5006ada
2020-07-14 21:33:10 +00:00
Treehugger Robot
cf9d84a893 Merge "Use the build start time from Soong main UI for metrics build timestamp." am: 3058878cc7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1362302

Change-Id: I0e15e8ed5f4cfb09d0b8916c2eb90bf133cc882a
2020-07-14 21:21:29 +00:00
Treehugger Robot
3058878cc7 Merge "Use the build start time from Soong main UI for metrics build timestamp." 2020-07-14 21:04:48 +00:00
Liz Kammer
a275f19fda Merge "Set sdk_version for prebuilt_api to scope" am: 40be9bb8e1 am: ae1efd5997
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1361248

Change-Id: I058d20004ba9199bb8dd2cd1ca3609bb6ff1aa82
2020-07-14 18:57:52 +00:00
Liz Kammer
ae1efd5997 Merge "Set sdk_version for prebuilt_api to scope" am: 40be9bb8e1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1361248

Change-Id: I55bdb4e0cf2ffb7de44d715e7a94b4250b0b4c3c
2020-07-14 18:36:38 +00:00
Liz Kammer
40be9bb8e1 Merge "Set sdk_version for prebuilt_api to scope" 2020-07-14 18:17:44 +00:00
Patrice Arruda
73c790f59e Use the build start time from Soong main UI for metrics build timestamp.
Currently, the build timestamp saved to the build_date_timestamp
field in the MetricsBase metrics protobuf usually comes from a text
file named build_date.txt. It may not be accurate for metrics purposes.
Instead, use the build start time from Soong main UI for a better
timestamp.

Bug: b/140638454
Test: Ran and checked the build_date_timestamp by running the printproto
      command.
Change-Id: I4d893fbbf9830ba21911e56ae13bc5272be47ae6
2020-07-14 17:23:23 +00:00
Treehugger Robot
1481b8710c Merge "Use monotonic clock instead of wall time clock for metrics." am: 75fd488028 am: 76ad7335d2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1361900

Change-Id: I74235d0c4eec64a6bab9ddb3f1e8e9aa16a7ecc3
2020-07-14 00:33:01 +00:00
Treehugger Robot
76ad7335d2 Merge "Use monotonic clock instead of wall time clock for metrics." am: 75fd488028
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1361900

Change-Id: I0a1d646e51d1c30bab15889ec8dc6d519b4230ea
2020-07-14 00:01:24 +00:00
Colin Cross
aab63768e5 [automerger skipped] Use unzip -DD am: 774a758026 -s ours
am skip reason: Change-Id I70407a627cb070e24be510faa6a774e3d9eae3a8 with SHA-1 d783bbbace is in history

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

Change-Id: I9bb5bf7656e56950af540e4752dc352049ac8312
2020-07-13 23:50:11 +00:00
Treehugger Robot
75fd488028 Merge "Use monotonic clock instead of wall time clock for metrics." 2020-07-13 23:48:42 +00:00
Liz Kammer
f971af7997 Set sdk_version for prebuilt_api to scope
Remove old TODO setting sdk_version to "current" as the associated bug
appears to have been fixed.

Test: m checkapi
Change-Id: I7737fbd17d2f54fc4578e04d07875b4b8d408ef9
2020-07-13 15:41:20 -07:00
Colin Cross
8f1439729e Merge "Support lint on unbundled builds" am: 562b6ee5cf am: 2f67efffd7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1360940

Change-Id: I211844891ad48a63b707c56678341827d4cb0eb1
2020-07-13 22:09:49 +00:00
Colin Cross
2f67efffd7 Merge "Support lint on unbundled builds" am: 562b6ee5cf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1360940

Change-Id: I566128d420a0b0047785ca753be3603d60c5f934
2020-07-13 21:57:23 +00:00
Colin Cross
562b6ee5cf Merge "Support lint on unbundled builds" 2020-07-13 21:33:09 +00:00
Colin Cross
774a758026 Use unzip -DD
We put reproducible timestamps in zip files so that the artifacts
are consistent, but that leads to old timestamps in the output
directory if they are unzipped as part of the build.  Use
unzip -DD when unzipping to update the timestamps.

Bug: 161015009
Test: touch -d 2020-01-01 ref; find $OUT/system -not -newer ref
Change-Id: I70407a627cb070e24be510faa6a774e3d9eae3a8
Merged-In: I70407a627cb070e24be510faa6a774e3d9eae3a8
(cherry picked from commit d783bbbace)
2020-07-13 14:26:12 -07:00
Treehugger Robot
fd0111b26a Merge "Add array type property flags, equivalent to args" am: aeaffeb710 am: 95393f8df1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1356166

Change-Id: Ia322c48a1f213998a70c6d0b8c07df67342b7eec
2020-07-13 21:16:39 +00:00
Patrice Arruda
958b89c0b5 Use monotonic clock instead of wall time clock for metrics.
From several dashboards, there are high spikes from several
builds where the real time of executing a part of the build
system took many many hours. This is due to using the wall
time clock when calculating the duration. For metrics, the
monotonic clock should be used for more accurate measurement.
Also, cleaned up the time.go file to use the proper proto
functions when marshalling perf protobuf and deleted
unnecessary functions.

Bug: b/143492984
Test: Wrote and ran unit test case.
Change-Id: I1540cfbf37915e3045ecedaa2595c1f9429bcd62
2020-07-13 21:14:34 +00:00
Treehugger Robot
95393f8df1 Merge "Add array type property flags, equivalent to args" am: aeaffeb710
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1356166

Change-Id: I2ee8453417c920c32c451c0f8f6ee77d903d7e87
2020-07-13 21:05:16 +00:00
Treehugger Robot
aeaffeb710 Merge "Add array type property flags, equivalent to args" 2020-07-13 20:52:20 +00:00
Liz Kammer
585cac22d9 Add array type property flags, equivalent to args
The property args is currently a string, but represents a collection of
arguments to metalava/doclava. This has resulted in variables being used
rather than default modules to share arguments.

Test: go test java_tests
Bug: 145644363
Change-Id: I670235e8f1cf19bfe8909049c4765637d0accd47
2020-07-13 08:57:49 -07:00
Treehugger Robot
401b8ec527 Merge "Do not consider disabled prebuilt variants." am: 775c8e1af7 am: 17c7e4ad72
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1356826

Change-Id: Ie24a8ef484fc33e15dcd78cb9c92dd474746f2da
2020-07-13 14:23:52 +00:00
Treehugger Robot
17c7e4ad72 Merge "Do not consider disabled prebuilt variants." am: 775c8e1af7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1356826

Change-Id: I8a8c52f6108574b9daab129274b2efb195554b1a
2020-07-13 14:09:55 +00:00
Treehugger Robot
775c8e1af7 Merge "Do not consider disabled prebuilt variants." 2020-07-13 13:59:30 +00:00
Treehugger Robot
8baa66095b [automerger skipped] Merge "Set LOCAL_APKCERTS_FILE for apk_set modules in apexes" am: 20efa41af8 am: a738f0144e -s ours
am skip reason: Change-Id I1ccaafd04978374d0da10363a1d782cfeae428e7 with SHA-1 7e2b36c7d5 is in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1361026

Change-Id: I2d27bc983e22aa869343df7ece51eea2f82a17cf
2020-07-13 12:10:33 +00:00
Treehugger Robot
a738f0144e Merge "Set LOCAL_APKCERTS_FILE for apk_set modules in apexes" am: 20efa41af8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1361026

Change-Id: Ic09f50a9f6f7868be2480cade9e3389b56dcb45e
2020-07-13 11:56:52 +00:00
Treehugger Robot
20efa41af8 Merge "Set LOCAL_APKCERTS_FILE for apk_set modules in apexes" 2020-07-13 11:39:43 +00:00
Colin Cross
56b330f8e7 Merge "Use unzip -DD" am: b7cea24fe3 am: cae5903677
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1361337

Change-Id: I68b97b33bd19206dfd96aca36bf4575a0bca5459
2020-07-13 06:21:07 +00:00
Colin Cross
cae5903677 Merge "Use unzip -DD" am: b7cea24fe3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1361337

Change-Id: I78b6bff97590657fbd5ad398c18d1bf815161b56
2020-07-13 06:09:29 +00:00
Colin Cross
b7cea24fe3 Merge "Use unzip -DD" 2020-07-13 05:58:42 +00:00
Treehugger Robot
cdd1f49771 Merge "Fix string concatenation error" am: 9d98ac15bb am: a23eb4c462
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1360939

Change-Id: Iee7bc35bda9e934fd793be894a2520286a4550de
2020-07-12 23:34:17 +00:00
Treehugger Robot
a23eb4c462 Merge "Fix string concatenation error" am: 9d98ac15bb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1360939

Change-Id: Ieabd5925353386d26f5e1359cb3d97135cdbf672
2020-07-12 23:22:05 +00:00
Treehugger Robot
9d98ac15bb Merge "Fix string concatenation error" 2020-07-12 23:08:40 +00:00
Colin Cross
d783bbbace Use unzip -DD
We put reproducible timestamps in zip files so that the artifacts
are consistent, but that leads to old timestamps in the output
directory if they are unzipped as part of the build.  Use
unzip -DD when unzipping to update the timestamps.

Bug: 161015009
Test: touch -d 2020-01-01 ref; find $OUT/system -not -newer ref
Change-Id: I70407a627cb070e24be510faa6a774e3d9eae3a8
2020-07-12 05:37:46 +00:00
Inseob Kim
3781d50747 Merge "Nullify stl and sanitize of llndk_headers" am: 41405cc275 am: c188fb0dfc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1356667

Change-Id: I0a69d3f56e49a3e1da787d290a9f6291529ecdf8
2020-07-11 05:40:47 +00:00
Inseob Kim
c188fb0dfc Merge "Nullify stl and sanitize of llndk_headers" am: 41405cc275
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1356667

Change-Id: I5079d467fcf1d493275b8ec91d3c840e0c14359a
2020-07-11 05:29:11 +00:00
Inseob Kim
41405cc275 Merge "Nullify stl and sanitize of llndk_headers" 2020-07-11 05:19:17 +00:00
Colin Cross
4fb652d681 Set LOCAL_APKCERTS_FILE for apk_set modules in apexes
I321e80fd636a955213761f56a3ac64bfe7f7f7c0 missed setting
LOCAL_APKCERTS_FILE for apk_set modules in apexes, which causes
invalid apkcerts.txt files.

Bug: 160652723
Test: m apkcerts-list
Change-Id: I1ccaafd04978374d0da10363a1d782cfeae428e7
Merged-In: I1ccaafd04978374d0da10363a1d782cfeae428e7
(cherry picked from commit 7e2b36c7d5)
2020-07-10 20:38:50 -07:00
Colin Cross
8a6ed3750d Support lint on unbundled builds
Use prebuilts of the annotations.zip and api-versions.xml files
when running lint in an unbundled build.

Test: m TARGET_BUILD_APPS=Gallery2 lint-check
Change-Id: Idacf3758a2769678a635941486183673e95b43f8
2020-07-10 19:30:32 -07:00
Martin Stjernholm
1e9c2677fd Add compile_multilib properties to all native prebuilts.
There was a special case in cc_prebuilt_binary only, which resulted in
prebuilt libraries getting both 32 and 64 bit variants even when their
sources only had one of them, and the other variant would be defunct
since it wouldn't get any prebuilt artefact.

This moves the handling of compile_multilib completely to the common
update code, so that SDK members don't need to deal with it. It doesn't
take SDK member defaults into account, which means a bit more
boilerplate in the snapshots, but it's simpler and less error prone
(different SDK member types have different defaults).

Bug: 151303681
Test: m nothing
Test: build/soong/scripts/build-aml-prebuilts.sh art-module-host-exports
  Check that the generated Android.bp passes Soong.
Change-Id: Ib73444c6788ee1c78480bdb103aa2b8ae8f2c63c
2020-07-11 00:38:24 +01:00
Colin Cross
afa6a77c64 Fix string concatenation error
Fix an error caught by golint that prevents using go test.  string(int)
produces a rune, not a string representation of the int.  Use fmt.Errorf
instead to format the string.

Test: go test
Change-Id: I4c2e1e30a0f1b3dc24afd123c38c4e41c2abb47a
2020-07-10 16:32:49 -07:00
Treehugger Robot
c76b0fd5f3 Merge "Specify module dependency in the srcs list" am: 21143a601c am: 9c3f56a3aa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1356365

Change-Id: I5e4cbd9d86ee9f99d2bbc08fce40dd4b56d9dcbc
2020-07-10 18:57:44 +00:00
Treehugger Robot
9c3f56a3aa Merge "Specify module dependency in the srcs list" am: 21143a601c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1356365

Change-Id: I7249973dc3fc0cd87039c1ec38b2b213e07284c8
2020-07-10 18:47:06 +00:00