Commit graph

59141 commits

Author SHA1 Message Date
Patrice Arruda
4c90b694e8 Merge "Set ANDROID_ENABLE_METRICS_UPLOAD to the metrics_uploader path to upload metrics." am: 4a2e443ec2
Original change: https://android-review.googlesource.com/c/platform/build/+/1360984

Change-Id: I852698af98313059afc92cfeca1b8bcb5ecef91d
2020-07-13 18:09:16 +00:00
Patrice Arruda
4a2e443ec2 Merge "Set ANDROID_ENABLE_METRICS_UPLOAD to the metrics_uploader path to upload metrics." 2020-07-13 17:56:27 +00:00
Roland Levillain
eac977277e Merge "Turn COVERAGE_PATHS and COVERAGE_EXCLUDE_PATHS into obsolete variables." am: 18a4837e07
Original change: https://android-review.googlesource.com/c/platform/build/+/1356640

Change-Id: Id412fc685fa6d93c7776d6ac51779ed7f16e1312
2020-07-13 14:46:05 +00:00
Roland Levillain
18a4837e07 Merge "Turn COVERAGE_PATHS and COVERAGE_EXCLUDE_PATHS into obsolete variables." 2020-07-13 14:31:26 +00:00
Colin Cross
7090c900e2 Merge "Use unzip -DD" am: 3227fc587c
Original change: https://android-review.googlesource.com/c/platform/build/+/1360910

Change-Id: I99c61e3bf42df2453beab4c997cf24797837277d
2020-07-13 06:09:23 +00:00
Colin Cross
3227fc587c Merge "Use unzip -DD" 2020-07-13 05:58:28 +00:00
Colin Cross
c27d795b63 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: I6f08ba8695d90a8225cfc04e679755e6296deed0
2020-07-12 05:38:03 +00:00
Roland Levillain
e9ea935a96 Merge "Revert^2 "Turn uses of COVERAGE_PATHS and COVERAGE_EXCLUDE_PATHS into errors."" am: ce637304a0
Original change: https://android-review.googlesource.com/c/platform/build/+/1360377

Change-Id: Icc11599563b34e07c8c84cd57a263773e74640dc
2020-07-11 14:49:28 +00:00
Roland Levillain
ce637304a0 Merge "Revert^2 "Turn uses of COVERAGE_PATHS and COVERAGE_EXCLUDE_PATHS into errors."" 2020-07-11 14:32:10 +00:00
Patrice Arruda
d990f70fa2 Set ANDROID_ENABLE_METRICS_UPLOAD to the metrics_uploader path to upload metrics.
This is to collect metrics from our RBE dogfooders. This CL will be
rolledback once the metrics pipeline is turned live.

Bug: b/140638454
Test: source the script and then "m nothing". Monitored the uploading
      of the metrics.
Change-Id: Ide996a44a5a651ed026d7c8272283675fbb092b5
2020-07-10 23:22:49 +00:00
Julien Desprez
1021a5529f Merge "Add new jar that will replace tradefed.jar" am: f7d4d1e885
Original change: https://android-review.googlesource.com/c/platform/build/+/1359882

Change-Id: I50e595e96532da46ced417f702dd3f9411d70bb5
2020-07-10 21:50:32 +00:00
Julien Desprez
f7d4d1e885 Merge "Add new jar that will replace tradefed.jar" 2020-07-10 21:32:21 +00:00
Roland Levillain
be3c3719d4 Revert^2 "Turn uses of COVERAGE_PATHS and COVERAGE_EXCLUDE_PATHS into errors."
All known uses of environment variables `COVERAGE_PATHS` and
`COVERAGE_EXCLUDE_PATHS` (in AOSP and downstream branches) have
been replaced with `NATIVE_COVERAGE_PATHS` and
`NATIVE_COVERAGE_EXCLUDE_PATHS` (resp.).

This reverts commit 62d9912677.

Reason for revert: The cause of the build breakages caused by the
initial change has been addressed.

Test: m nothing
Test: Check that `m nothing COVERAGE_PATHS=art` fails.
Test: Check that `m nothing COVERAGE_EXCLUDE_PATHS=art` fails.
Test: Check the Android Build for build errors related to these variables.
Bug: 158212027
Bug: 160769227
Change-Id: Ic267e1b61e84bc6f016a3eb57efe7f9b859adb42
2020-07-10 11:00:32 +00:00
Julien Desprez
b8f37694a3 Add new jar that will replace tradefed.jar
for compatibility with across branches, still need to
export tradefed.jar.

Test: make cts
Bug: 149758913
Change-Id: I101cba5dc3abe483b4dfbe6a113e24960e0e07ba
2020-07-09 15:31:35 -07:00
Kelvin Zhang
dd940c163d Merge "Fix validate_target_files for target files modified by" am: 757fd2768e
Original change: https://android-review.googlesource.com/c/platform/build/+/1350724

Change-Id: Ie7fa2d166c9a2101bcf482188a602389cf059ded
2020-07-09 00:45:51 +00:00
Kelvin Zhang
757fd2768e Merge "Fix validate_target_files for target files modified by" 2020-07-09 00:32:52 +00:00
Orion Hodson
cc990adddc Merge "Revert "Turn uses of COVERAGE_PATHS and COVERAGE_EXCLUDE_PATHS into errors."" am: be88cd9140
Original change: https://android-review.googlesource.com/c/platform/build/+/1358402

Change-Id: I54de42fe4c310db107330d7e3b14b4675c3d1d90
2020-07-08 14:17:47 +00:00
Orion Hodson
be88cd9140 Merge "Revert "Turn uses of COVERAGE_PATHS and COVERAGE_EXCLUDE_PATHS into errors."" 2020-07-08 14:00:55 +00:00
Lais Andrade
62d9912677 Revert "Turn uses of COVERAGE_PATHS and COVERAGE_EXCLUDE_PATHS into errors."
This reverts commit ace5860719.

Reason for revert: Droidcop-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_rvc-dev-plus-aosp&target=build_test3&lkgb=6662220&lkbb=6662382&fkbb=6662228
Bug: 158212027
Bug: 160769227
Test: N/A revert
Change-Id: I0d366adcc735e9cc417d28013afb0386dea1fa64
2020-07-08 13:58:23 +00:00
Roland Levillain
cd80a6afea Turn COVERAGE_PATHS and COVERAGE_EXCLUDE_PATHS into obsolete variables.
(cherry picked from commit c276bf4f3cc72e479d21c7bd0b34673d93e76f9a)

Test: m nothing
Bug: 158212027
Change-Id: Ibc0dbfd21465ab6fc5b826a52bf605910af283e7
Merged-In: Ibc0dbfd21465ab6fc5b826a52bf605910af283e7
2020-07-08 12:56:29 +01:00
Roland Levillain
e38c36fec0 Merge "Turn uses of COVERAGE_PATHS and COVERAGE_EXCLUDE_PATHS into errors." am: 01ce4a0b02
Original change: https://android-review.googlesource.com/c/platform/build/+/1356639

Change-Id: I511225870873c185f421bb2de7dba780fcff0fee
2020-07-08 10:24:29 +00:00
Roland Levillain
01ce4a0b02 Merge "Turn uses of COVERAGE_PATHS and COVERAGE_EXCLUDE_PATHS into errors." 2020-07-08 10:07:51 +00:00
Treehugger Robot
40fbb7c8db Merge "Move build.prop to ./etc subdir for some partitions" am: faac5a2e7d
Original change: https://android-review.googlesource.com/c/platform/build/+/1351285

Change-Id: Ia3a34b5372fa5add8e9783d8f87c680519695d51
2020-07-08 00:23:06 +00:00
Treehugger Robot
faac5a2e7d Merge "Move build.prop to ./etc subdir for some partitions" 2020-07-08 00:03:30 +00:00
Jooyung Han
7ec502edac Merge "Remove hidl VNDK libs" am: fb220803b6
Original change: https://android-review.googlesource.com/c/platform/build/+/1355675

Change-Id: I4227caf4f259dfb0cb2766e60945939ce3a17ecc
2020-07-07 18:16:46 +00:00
Jooyung Han
fb220803b6 Merge "Remove hidl VNDK libs" 2020-07-07 18:04:11 +00:00
Roland Levillain
ace5860719 Turn uses of COVERAGE_PATHS and COVERAGE_EXCLUDE_PATHS into errors.
All known uses of environment variables `COVERAGE_PATHS` and
`COVERAGE_EXCLUDE_PATHS` have been replaced with
`NATIVE_COVERAGE_PATHS` and `NATIVE_COVERAGE_EXCLUDE_PATHS` (resp.).

Test: m nothing
Test: Check that `m nothing COVERAGE_PATHS=art` fails.
Test: Check that `m nothing COVERAGE_EXCLUDE_PATHS=art` fails.
Test: Check the Android Build for build errors related to these variables.
Bug: 158212027
Change-Id: Icc7c1d9734e78c2bf327f00f04355700b5476648
2020-07-07 15:01:26 +01:00
Bill Yi
355e5e2e02 Merge "Merge android10-qpr3-release to aosp-master - DO NOT MERGE" am: 3cea91a6f7
Original change: https://android-review.googlesource.com/c/platform/build/+/1356542

Change-Id: I27afc208cb1491af9ca6653ccf4cef8e4eaec55b
2020-07-07 07:26:24 +00:00
Bill Yi
36039beafe Merge android10-qpr3-release to aosp-master - DO NOT MERGE am: a4d40c35a9
Original change: https://android-review.googlesource.com/c/platform/build/+/1356542

Change-Id: Iff9a578e391796e231aa944950f092343a7ef25b
2020-07-07 07:26:19 +00:00
Jooyung Han
861f077f09 Remove hidl VNDK libs
hidl libs are removed from VNDK unless used by other VNDK libs.

Bug: 143933769
Test: update-makefiles.sh && m com.android.vndk.current
Merged-In: I25a787defb1755107c0538eabd21a0bfcf8374b1
Change-Id: I25a787defb1755107c0538eabd21a0bfcf8374b1
(cherry picked from commit 9438fb2c15)
2020-07-07 16:20:41 +09:00
Bill Yi
3cea91a6f7 Merge "Merge android10-qpr3-release to aosp-master - DO NOT MERGE" 2020-07-07 07:14:49 +00:00
Bill Yi
a4d40c35a9 Merge android10-qpr3-release to aosp-master - DO NOT MERGE
Merged-In: I05e3e332007665f72a97b217a3e829441f87f811
Change-Id: I1119b2533299f722e1c8b7faa369925168024d25
2020-07-07 06:27:51 +00:00
Treehugger Robot
0712846afa Merge "add build.prop for other partitions to the dist out" am: 3f2e4cc4e6
Original change: https://android-review.googlesource.com/c/platform/build/+/1354463

Change-Id: I35a0900b5d9388fe560c20983874f3b5a776ffbe
2020-07-06 23:39:16 +00:00
Treehugger Robot
3f2e4cc4e6 Merge "add build.prop for other partitions to the dist out" 2020-07-06 23:24:49 +00:00
Kelvin Zhang
11a1e1b3bd Merge "Check for duplicate entries in build.prop in validation script" am: 46a6ab8c05
Original change: https://android-review.googlesource.com/c/platform/build/+/1352903

Change-Id: I6dc4b1959a77be08907479d9f8ab8a94c1378d79
2020-07-06 21:46:40 +00:00
Kelvin Zhang
46a6ab8c05 Merge "Check for duplicate entries in build.prop in validation script" 2020-07-06 21:13:01 +00:00
Kelvin Zhang
f2e846fb91 Check for duplicate entries in build.prop in validation script
Test: Added Unit test
Bug: 143013566
Change-Id: Ida14507a4a6034990bc81d5263ef1cea34f589c1
2020-07-06 15:13:11 -04:00
Treehugger Robot
1b97119e6b Merge "target-host-required: Be permissive when ALLOW_MISSING_DEPENDENCY is set" am: 19950004b5
Original change: https://android-review.googlesource.com/c/platform/build/+/1354465

Change-Id: I8627e44fc6f2af3fb753259b068b805a13828674
2020-07-06 10:15:05 +00:00
Treehugger Robot
19950004b5 Merge "target-host-required: Be permissive when ALLOW_MISSING_DEPENDENCY is set" 2020-07-06 09:52:22 +00:00
Yo Chiang
d23ac0e477 target-host-required: Be permissive when ALLOW_MISSING_DEPENDENCY is set
add-all-host-to-target-required-modules-deps and
add-all-target-to-host-required-modules-deps permit errors when
ALLOW_MISSING_DEPENDENCY is set to true.

The previous behavior may break when doing unbundled builds.

Bug: 160318430
Bug: 7456955
Test: TH art-target-arm build pass
Change-Id: I00818d27ce18f4072eff9fa98958be820b5cd1f8
Merged-In: I00818d27ce18f4072eff9fa98958be820b5cd1f8
(cherry picked from commit 2c7c8bb657)
2020-07-06 10:57:51 +08:00
Jiyong Park
0ee7115b2d add build.prop for other partitions to the dist out
Previously, only system/build.prop was registered as dist out. This
change adds build.prop in the other partitions to the dist out. This
will allow us to examine those build.prop files without downloading
the entire target-files.zip file.

Bug: 117892318
Test: examine the dist out
Change-Id: I6f4ba16d765336a57f0da90edba788a627f25e60
2020-07-03 09:59:10 +09:00
Ulyana Trafimovich
67c0e8f669 Merge "Remove mentions of deleted script construct_context.sh in comments." am: 4637537110
Original change: https://android-review.googlesource.com/c/platform/build/+/1351543

Change-Id: I1890bbce588ffa6b84141e3af7255507632d4f99
2020-07-02 09:20:25 +00:00
Ulyana Trafimovich
4637537110 Merge "Remove mentions of deleted script construct_context.sh in comments." 2020-07-02 09:06:27 +00:00
Treehugger Robot
03c37a44fa Merge "Dedup lists of NDK libraries from Soong." am: 0ee038dffa
Original change: https://android-review.googlesource.com/c/platform/build/+/1353644

Change-Id: I595981758ea45d8646567c13963e3bf79e9535a2
2020-07-02 02:29:20 +00:00
Treehugger Robot
0ee038dffa Merge "Dedup lists of NDK libraries from Soong." 2020-07-02 02:12:26 +00:00
Treehugger Robot
72392527eb Merge "rbe: Remove stray /" am: 13bf168b68
Original change: https://android-review.googlesource.com/c/platform/build/+/1334776

Change-Id: If4148da9e6a83444f6e4de3ab362a90bcb015357
2020-07-01 23:34:48 +00:00
Treehugger Robot
13bf168b68 Merge "rbe: Remove stray /" 2020-07-01 23:13:05 +00:00
Treehugger Robot
0e66a44a3c Merge "Add LOCAL_APKCERTS_FILE support." am: fd75d8deca
Original change: https://android-review.googlesource.com/c/platform/build/+/1354082

Change-Id: I67a393443ca8f85ca82d086c4b92936b6b6ac9b3
2020-07-01 20:04:18 +00:00
Treehugger Robot
fd75d8deca Merge "Add LOCAL_APKCERTS_FILE support." 2020-07-01 19:53:32 +00:00
Jaewoong Jung
704b454ca1 Add LOCAL_APKCERTS_FILE support.
This is used when Soong and Make don't know the full output file list,
and so use a tool to generate a per-module apkcerts.txt file instead.

Fixes: 160119159
Test: m apkcerts-list
Merged-In: I48183bc8cbf9dcc521f791812734205ed3f28f4c
Change-Id: I48183bc8cbf9dcc521f791812734205ed3f28f4c
2020-07-01 10:01:16 -07:00