Commit graph

23095 commits

Author SHA1 Message Date
Jiyong Park
7a12fd11ee Merge "Use Stem where output file name is expected in APEX" am: 0e666433cd am: 611703096e
Change-Id: I94d8f5541deea86310ad3b249b670c61623f3b96
2020-06-01 01:02:03 +00:00
Jiyong Park
611703096e Merge "Use Stem where output file name is expected in APEX" am: 0e666433cd
Change-Id: I9adbbb23e7af54994cb76ac587285282450ac76c
2020-06-01 00:49:23 +00:00
Jiyong Park
0e666433cd Merge "Use Stem where output file name is expected in APEX" 2020-06-01 00:35:48 +00:00
Inseob Kim
7c26c8c95c Merge "Capture libeigen's header correctly" into rvc-dev am: c344620ed6
Change-Id: Ie0a1438f17d720a423d1aae4bc0832fe7d1d0e43
2020-05-31 16:04:51 +00:00
Inseob Kim
c344620ed6 Merge "Capture libeigen's header correctly" into rvc-dev 2020-05-31 15:49:54 +00:00
TreeHugger Robot
7ee272cdcb [automerger skipped] Merge "Add support for remote-execution / caching of jar/zip actions" into rvc-dev am: 07e99ad358 -s ours
am skip reason: Change-Id Ia17b532fbb282be414adf879914870082dd0841b with SHA-1 366afc5011 is in history

Change-Id: I3d50ef9cf2c826b53fabb8fc1d68182cce495b79
2020-05-31 02:29:10 +00:00
TreeHugger Robot
07e99ad358 Merge "Add support for remote-execution / caching of jar/zip actions" into rvc-dev 2020-05-31 02:17:58 +00:00
Kousik Kumar
f1cadc742c [automerger skipped] Merge "Add support for remote-execution / caching of signapk actions" into rvc-dev am: 6619d28c15 -s ours
am skip reason: Change-Id I4b8c21320c2f38914ef39d3d8f036d885fab4e72 with SHA-1 309b1c0da3 is in history

Change-Id: I40958809b0eeecc942f54b57fd434848a38ad7b9
2020-05-31 01:19:04 +00:00
Kousik Kumar
b2d43d54f0 [automerger skipped] Merge "Add support for remote-execution / caching of turbine actions" into rvc-dev am: 6888f1cb7a -s ours
am skip reason: Change-Id I85c334e6998c6dd2a68460b3580d50fffd900e6f with SHA-1 1372c1b430 is in history

Change-Id: I368aa61260137a0b1303c0d4e520b63492a2ab87
2020-05-31 01:18:51 +00:00
Kousik Kumar
6619d28c15 Merge "Add support for remote-execution / caching of signapk actions" into rvc-dev 2020-05-31 01:10:18 +00:00
Kousik Kumar
6888f1cb7a Merge "Add support for remote-execution / caching of turbine actions" into rvc-dev 2020-05-31 01:10:05 +00:00
Jiyong Park
39f867b523 [automerger skipped] Merge "Notice file embededd in APEX is deterministic" into rvc-dev am: 327b057e84 -s ours
am skip reason: Change-Id I25f6cd9dd0679af6acfc2594314d11fa53ae2151 with SHA-1 33c7736936 is in history

Change-Id: I86daca0dcdb2293c6f7494801756db69f07b4729
2020-05-30 22:44:39 +00:00
Jiyong Park
327b057e84 Merge "Notice file embededd in APEX is deterministic" into rvc-dev 2020-05-30 22:35:47 +00:00
Kousik Kumar
c05da0a90e Add support for remote-execution / caching of jar/zip actions
Test: Ran a build with `RBE_JAR="true" RBE_JAR_EXEC_STRATEGY="remote"
RBE_ZIP="true" RBE_ZIP_EXEC_STRATEGY="remote" ... use_rbe m` and that
succeeded.

Bug: b/156765207
Change-Id: Ia17b532fbb282be414adf879914870082dd0841b
Merged-In: Ia17b532fbb282be414adf879914870082dd0841b
2020-05-30 19:59:10 +00:00
Kousik Kumar
15e9d0dbf8 Add support for remote-execution / caching of signapk actions
Test: "RBE_SIGNAPK=true RBE_SIGNAPK_EXEC_STRATEGY=remote ... use_rbe m" on crosshatch-userdebug and
signapk targets worked
Bug: b/156765091

Change-Id: I4b8c21320c2f38914ef39d3d8f036d885fab4e72
Merged-In: I4b8c21320c2f38914ef39d3d8f036d885fab4e72
2020-05-30 19:58:58 +00:00
Kousik Kumar
d8c3955119 Add support for remote-execution / caching of turbine actions
Test: Ran a sample turbine action with:
RBE_TURBINE_EXEC_STRATEGY="remote" RBE_TURBINE="true" ... use_rbe m out/soong/.intermediates/external/protobuf/libprotobuf-java-micro/android_common/turbine/libprotobuf-java-micro.jar
and checked in reproxy_log.txt that remote-metadata had status SUCCESS.

Bug: b/156765475
Change-Id: I85c334e6998c6dd2a68460b3580d50fffd900e6f
Merged-In: I85c334e6998c6dd2a68460b3580d50fffd900e6f
2020-05-30 12:58:20 -07:00
Jiyong Park
cbe50c7073 Use Stem where output file name is expected in APEX
Bug: 157638999
Test: m
Merged-In: I4a4892bc2941cf1301d210fc3107c02f0e7b13b7
(cherry picked from commit f1493cc0f2)
Change-Id: I4a4892bc2941cf1301d210fc3107c02f0e7b13b7
2020-05-30 21:15:24 +09:00
Jiyong Park
402ace6c25 Notice file embededd in APEX is deterministic
Exempt-From-Owner-Approval: cherry-pick from AOSP

Bug: 157724521
Test: m
Merged-In: I25f6cd9dd0679af6acfc2594314d11fa53ae2151
(cherry picked from commit 33c7736936)
Change-Id: I25f6cd9dd0679af6acfc2594314d11fa53ae2151
2020-05-30 12:11:16 +00:00
Treehugger Robot
94d161a3c7 Merge "Notice file embededd in APEX is deterministic" am: 9980c6e111 am: bd7f948507
Change-Id: I2cf22542513eff83fefef1503954015ffd3be6a9
2020-05-30 08:30:11 +00:00
Treehugger Robot
bd7f948507 Merge "Notice file embededd in APEX is deterministic" am: 9980c6e111
Change-Id: I25651a62edfcfc111af3591433e2f525b168158e
2020-05-30 08:12:24 +00:00
Treehugger Robot
9980c6e111 Merge "Notice file embededd in APEX is deterministic" 2020-05-30 07:54:31 +00:00
Jiyong Park
f1493cc0f2 Use Stem where output file name is expected in APEX
Bug: 157638999
Test: m
Change-Id: I4a4892bc2941cf1301d210fc3107c02f0e7b13b7
2020-05-30 13:26:55 +09:00
Dan Willemsen
3478f71075 [automerger skipped] Better handling of low memory situations am: 104d9eb54a -s ours
am skip reason: Change-Id Ieb008e9f462d5f40fb65781d94cf116b1caf8446 with SHA-1 570a292bab is in history

Change-Id: I8432f1abab02ff187f89fa62ea0aa9c2acbe7ce5
2020-05-29 23:12:13 +00:00
Ulyana Trafimovich
95c433f3b1 Merge "Don't use obsolete "org.apache.http.legacy.impl" in class loader context." am: 7c9db5d13f am: 8eb051e918
Change-Id: Id7c70c49f64890d872203eeef39dc50ed7febd36
2020-05-29 21:52:56 +00:00
Anton Hansson
28090556c5 Merge "Revert "Fix missing headers of vendor snapshot"" am: ae9170cdd0 am: 67c96391f6
Change-Id: Ia8a38740a9c9cdb96bdab768b7fe94c43be8d4dd
2020-05-29 21:52:40 +00:00
Dan Willemsen
104d9eb54a Better handling of low memory situations
Drop down to a single high-mem task when we've got <=16GB, as the system
probably isn't completely free RAM, ninja will be using a couple gigs,
along with whatever "normal" actions will be running concurrently. So
it's unlikely that we can handle two 6-8GB actions along with everything
else.

Also print warnings when we detect <=16GB total RAM, or when we're
running more parallel jobs than than we have GB RAM. These both notify
the user and suggest lowering the `-j` value if they run into problems.

Bug: 141066538
Test: fake totalRAM to [0.5,8,16]GB, checking warning
Test: fake totalRAM to 17GB, `m -j4 nothing` has no warning
Test: `m -j187 nothing` on a 188GB system
Test: `m -j188 nothing` on a 188GB system
Change-Id: Ieb008e9f462d5f40fb65781d94cf116b1caf8446
Merged-In: Ieb008e9f462d5f40fb65781d94cf116b1caf8446
(cherry picked from commit 570a292bab)
2020-05-29 21:45:06 +00:00
Ulyana Trafimovich
8eb051e918 Merge "Don't use obsolete "org.apache.http.legacy.impl" in class loader context." am: 7c9db5d13f
Change-Id: I850b040c92fb063c0f78feeabc5156e703643582
2020-05-29 21:43:25 +00:00
Anton Hansson
67c96391f6 Merge "Revert "Fix missing headers of vendor snapshot"" am: ae9170cdd0
Change-Id: Iec1b1e87e7c56020e063cee826c5d870fbc69684
2020-05-29 21:39:31 +00:00
TreeHugger Robot
7a7868d48a [automerger skipped] Merge "Refactor RBE support for Javac/R8/D8 to use the remoteexec package." into rvc-dev am: 42ffc3f000 -s ours
am skip reason: Change-Id I1607f8cfb4d2c3cbb3672152bbeb561d9968bc60 with SHA-1 1dcc27e47c is in history

Change-Id: Ia56580a7bbd5eb8274f343de18214207091871f9
2020-05-29 19:50:10 +00:00
TreeHugger Robot
42ffc3f000 Merge "Refactor RBE support for Javac/R8/D8 to use the remoteexec package." into rvc-dev 2020-05-29 19:33:20 +00:00
Ulyana Trafimovich
7c9db5d13f Merge "Don't use obsolete "org.apache.http.legacy.impl" in class loader context." 2020-05-29 17:14:46 +00:00
Ivan Lozano
07e9547850 Merge "Fix darwin shared library and proc macro suffixes." am: a8450fd2be am: b780886a06
Change-Id: Ib5dc75f0132e49aaf2f4fbb1128ba7c8c3890637
2020-05-29 16:57:54 +00:00
Ivan Lozano
b780886a06 Merge "Fix darwin shared library and proc macro suffixes." am: a8450fd2be
Change-Id: If83470ca15fb0e4469d41d614ca4bb917bbf5b27
2020-05-29 16:44:43 +00:00
TreeHugger Robot
222c98a96a [automerger skipped] Merge "pom2bp: add apex_available/min_sdk_version" into rvc-dev am: d5c8c67875 -s ours
am skip reason: Change-Id I201ebabaa533c5ee19e394ab30ca2fa0e3d7ce0e with SHA-1 43d3025cd5 is in history

Change-Id: I095b567924f76c715f0e75dea43fb492a16b07d5
2020-05-29 16:20:57 +00:00
Anton Hansson
ae9170cdd0 Merge "Revert "Fix missing headers of vendor snapshot"" 2020-05-29 16:18:08 +00:00
Anton Hansson
0fcdd53e10 Revert "Fix missing headers of vendor snapshot"
This reverts commit b6a586241e.

Reason for revert: b/157737963

Change-Id: Ic72e14ba2d8c3bfbc61906bf668a3e56619f04a4
2020-05-29 16:11:19 +00:00
TreeHugger Robot
d5c8c67875 Merge "pom2bp: add apex_available/min_sdk_version" into rvc-dev 2020-05-29 16:06:11 +00:00
Ulya Trafimovich
df00ddecb6 Don't use obsolete "org.apache.http.legacy.impl" in class loader context.
This library no longer exists on device and "org.apache.http.legacy"
should be used instead. The error lingered in the code for a while
because the code was not exercised at all. (The only app that sets
EnforceUsesLibraries is GoogleDialer (not in AOSP), and it specifies
"org.apache.http.legacy" explicitly as an optional used library.)

Test: lunch aosp_cf_x86_phone-userdebug && m
Change-Id: I05fa115476315d35a8877fc42bd1c2042f72f2de
2020-05-29 15:00:30 +01:00
Paul Duffin
88bd62cd3e Collect permitted packages from java_sdk_library instances am: e739f1ed9f am: a9c49f5f97
Change-Id: Ib44fd4dccd6c93e21e7b00ccfeb1c067573d4370
2020-05-29 13:57:32 +00:00
Paul Duffin
05bf1191fa Merge "Fix prebuilt test on mac" am: 75ab309e33 am: 36c5664a30
Change-Id: I9a7e0e98152b00a8178e5c4fa9520b080c7f7e79
2020-05-29 13:57:25 +00:00
Inseob Kim
8d3b712ae0 Merge "Fix missing headers of vendor snapshot" am: 705e6e8ce9 am: e4f0a009a0
Change-Id: I6aca5aaa25ed643b2a56cbf719d803555b427ce3
2020-05-29 13:57:18 +00:00
Treehugger Robot
77060be6c7 Merge "Ensure package check is run for java_library in APEX" am: b719d60d20 am: 99deb0858e
Change-Id: I5fb6f77f6146b1c06121caac5efee392dc90da16
2020-05-29 13:57:10 +00:00
Yo Chiang
da0ce643af Merge "Add symlinks support for prebuilt_etc modules" am: cb240bc9c1 am: 6a63341a93
Change-Id: If9bfe3e9b4df1f10b4075f9ed48e603264d378a8
2020-05-29 13:57:04 +00:00
Kousik Kumar
2b6185810a Merge "Add support for remote-execution / caching of jar/zip actions" am: c4cdba07d3 am: d996ff6a68
Change-Id: I41f544531788cfdf7a16560e24f27c9d31b186ad
2020-05-29 13:56:58 +00:00
Treehugger Robot
fbdd5e74e7 Merge "java_sdk_library: Propagate shared_library to snapshot" am: ad43500655 am: 460b1abf4e
Change-Id: I0513782b61ffb1de7b54c29dcab61a9ec513aa2b
2020-05-29 13:56:51 +00:00
Ivan Lozano
a8450fd2be Merge "Fix darwin shared library and proc macro suffixes." 2020-05-29 13:44:13 +00:00
Paul Duffin
a9c49f5f97 Collect permitted packages from java_sdk_library instances am: e739f1ed9f
Change-Id: I7178f6fcd6e017cd7b00929eed61b5f3a51888f6
2020-05-29 13:40:29 +00:00
Paul Duffin
36c5664a30 Merge "Fix prebuilt test on mac" am: 75ab309e33
Change-Id: I99136df04fe8ca2f15bf516c006ddd32b9ae4536
2020-05-29 13:40:24 +00:00
Inseob Kim
e4f0a009a0 Merge "Fix missing headers of vendor snapshot" am: 705e6e8ce9
Change-Id: I4e0e34d218f6b739b65e020106ce02c2615f75f8
2020-05-29 13:40:17 +00:00
Treehugger Robot
99deb0858e Merge "Ensure package check is run for java_library in APEX" am: b719d60d20
Change-Id: Icb95b6cb68b370bb571eae951c1e124c15e1f223
2020-05-29 13:40:11 +00:00