Commit Graph

22772 Commits

Author SHA1 Message Date
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
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
Yo Chiang
6a63341a93 Merge "Add symlinks support for prebuilt_etc modules" am: cb240bc9c1
Change-Id: Id69bc8b2fcaf0b9c2c48919054256eefcf7a7e31
2020-05-29 13:40:05 +00:00
Kousik Kumar
d996ff6a68 Merge "Add support for remote-execution / caching of jar/zip actions" am: c4cdba07d3
Change-Id: If86f8d80e00c881f79177990cc34cc40f7ba1c58
2020-05-29 13:39:58 +00:00
Treehugger Robot
460b1abf4e Merge "java_sdk_library: Propagate shared_library to snapshot" am: ad43500655
Change-Id: I7ecb6160d3becdda66ee5a8bef21774c73ebdf49
2020-05-29 13:39:51 +00:00
TreeHugger Robot
e3a5ad660d Merge "Collect permitted packages from java_sdk_library instances" into rvc-dev am: 5cfbb4332f
Change-Id: I3d5a7d6de21cfc988f146caef84ae1b8b1fd2a33
2020-05-29 13:32:49 +00:00
TreeHugger Robot
5cfbb4332f Merge "Collect permitted packages from java_sdk_library instances" into rvc-dev 2020-05-29 13:18:05 +00:00
Ivan Lozano
c0ccb6b443 Fix darwin shared library and proc macro suffixes.
Darwin builds aren't using the correct suffix for shared libraries or
proc macros (.dylib). This fixes that.

Bug: 155302034
Test: "cd external/rust; mma" no longer indicates wrong extension.
Change-Id: I5093e0bcc78dbb2dd9fcf39069f326101bb8f411
2020-05-29 13:08:27 +00:00
Jiyong Park
33c7736936 Notice file embededd in APEX is deterministic
Bug: 157724521
Test: m
Change-Id: I25f6cd9dd0679af6acfc2594314d11fa53ae2151
2020-05-29 22:00:16 +09:00
TreeHugger Robot
7bda45c615 Merge "Ensure package check is run for java_library in APEX" into rvc-dev am: 484129dfb9
Change-Id: I7a4efa288fb419a8a04c01c6b3c64b5a172dd255
2020-05-29 11:54:58 +00:00
TreeHugger Robot
484129dfb9 Merge "Ensure package check is run for java_library in APEX" into rvc-dev 2020-05-29 11:40:19 +00:00
Paul Duffin
a105cf99d0 Collect permitted packages from java_sdk_library instances
Switching an updatable boot jar from java_library to java_sdk_library
changed the contents of the updatable-bcp-packages.txt due to the code
requiring the module to be *Library. This change updates that to allow
it to be any module that implements the
PermittedPackagesForUpdatableBootJars interface which is *Library and
anything that embeds that like *SdkLibrary.

Bug: 155164730
Test: m droid and check the contents of system/etc/updatable-bcp-packages.txt
Change-Id: I464af74628da311734f102f77ec8158daec5b32d
2020-05-29 12:35:18 +01:00
Paul Duffin
e739f1ed9f Collect permitted packages from java_sdk_library instances
Switching an updatable boot jar from java_library to java_sdk_library
changed the contents of the updatable-bcp-packages.txt due to the code
requiring the module to be *Library. This change updates that to allow
it to be any module that implements the
PermittedPackagesForUpdatableBootJars interface which is *Library and
anything that embeds that like *SdkLibrary.

Bug: 155164730
Test: m droid and check the contents of system/etc/updatable-bcp-packages.txt
Change-Id: I464af74628da311734f102f77ec8158daec5b32d
2020-05-29 12:31:41 +01:00
Orion Hodson
6c27abd294 Merge "Add some app modules to the allowed whitelist." into rvc-dev-plus-aosp 2020-05-29 11:16:40 +00:00
Dan Albert
555760552b Add some app modules to the allowed whitelist.
Test: treehugger
Bug: 152482542
Change-Id: Ia7adf690cd6dca1408ae0a340860eaeae6c1d4b4
Merged-In: Ia7adf690cd6dca1408ae0a340860eaeae6c1d4b4
(cherry picked from commit 6b6d387a75)
Exempt-From-Owner-Approval: already +2'ed by owner
2020-05-29 11:08:38 +00:00
Jooyung Han
0441ceb569 Merge changes from topic "apk-jni-enforce" into rvc-dev am: de58c39bd6
Change-Id: Ib163e2407527c33c773179f1109b705c4f5202e5
2020-05-29 10:48:21 +00:00
Jooyung Han
5bac03f31c [automerger skipped] Reland "enforce sdk_version for JNI libs for updatable APKs" am: af7f91fc9d -s ours
am skip reason: Change-Id I08543ccee7dfda0559a1fca108ceb5c28f84943f with SHA-1 bbc3fb780b is in history

Change-Id: I38070a6373b75de80f7079d6d095469d795bc5b5
2020-05-29 10:48:18 +00:00
Jooyung Han
de58c39bd6 Merge changes from topic "apk-jni-enforce" into rvc-dev
* changes:
  Use sdkSpec to compare sdk_versions of APK/JNI
  Reland "enforce sdk_version for JNI libs for updatable APKs"
2020-05-29 10:33:59 +00:00
Paul Duffin
fa5b73bcb6 java_sdk_library: Propagate shared_library to snapshot am: a84756c827
Change-Id: Ibb843f87f8c3a93743fac6c6658f8fca7be44a56
2020-05-29 10:16:46 +00:00
Jiyong Park
d023ce9a28 [automerger skipped] Add default_to_stubs option to java_sdk_library am: 27fc414b84 -s ours
am skip reason: Change-Id Id2acc3cafb71d1e90d4fdc9c0c70a73983355e0f with SHA-1 932cdfeb06 is in history

Change-Id: Ic5e4bb98acde0b972f0700d80e54400f4e6f8c00
2020-05-29 09:51:12 +00:00
Paul Duffin
c552427032 Ensure package check is run for java_library in APEX
Package checks were not being run for java libraries that were in an
APEX and not on the platform. This change fixes that and updates the
script to report all failing classes to make it easier to update the
list of packages.

Test: m java
Bug: 157633658
Change-Id: I28044e08d3a40e9f3464bb2158ef6a28d57264d1
(cherry picked from commit 63d8febd35)
2020-05-29 09:18:13 +01:00