Commit Graph

68039 Commits

Author SHA1 Message Date
Jihoon Kang
26b0dff329 Merge "Add additional java_api_library module to java testing" am: d1a038c183 am: 8ce85df02b am: 115dae4d1c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2541410

Change-Id: Ib53077770b1d8ea6014b4128f1d52986590da2f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18 04:43:54 +00:00
Jihoon Kang
115dae4d1c Merge "Add additional java_api_library module to java testing" am: d1a038c183 am: 8ce85df02b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2541410

Change-Id: I3744fac1c99f0b5df62e7ef29031c8a9e518a76a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18 04:25:30 +00:00
Jihoon Kang
8ce85df02b Merge "Add additional java_api_library module to java testing" am: d1a038c183
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2541410

Change-Id: Ie790bfc9e1aa042051b48efa9f08422332a033a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18 04:06:09 +00:00
Jihoon Kang
d1a038c183 Merge "Add additional java_api_library module to java testing" 2023-04-18 03:46:55 +00:00
Alex Márquez Pérez Muñíz Díaz Puras Thaureaux
4d49a68fe2 Merge "bp2build: migrate export_{,system_}include_dirs -> *includes for cc_prebuilt_library{,_static,_shared}" am: fecec28c34 am: 2c82fa615c am: d2b9df318d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2495176

Change-Id: If4d2c99133399bf771f28651cb16176615d4b0ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 22:39:54 +00:00
Romain Jobredeaux
cbba377c78 Merge "Allowlist CaptivePortalLogin and required dependencies." am: d7141be8ff am: 4ff491c45c am: 38d950e1b2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2537758

Change-Id: Icd567ea7ef711d62ca447e59d99e481866e22d18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 22:39:31 +00:00
Alex Márquez Pérez Muñíz Díaz Puras Thaureaux
d2b9df318d Merge "bp2build: migrate export_{,system_}include_dirs -> *includes for cc_prebuilt_library{,_static,_shared}" am: fecec28c34 am: 2c82fa615c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2495176

Change-Id: I9c36bbd4a9715358024764a6d50eee3c685af246
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 22:03:49 +00:00
Romain Jobredeaux
38d950e1b2 Merge "Allowlist CaptivePortalLogin and required dependencies." am: d7141be8ff am: 4ff491c45c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2537758

Change-Id: I2728f05498808aac862822c2be4cbd35c84f9017
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 22:03:11 +00:00
Jihoon Kang
fb502593cd Add additional java_api_library module to java testing
Module lib surface is comprised of contributions from art, conscrypt,
and i18n api domains. On top of this, the module lib api surface generates an additional stub library containing the contributions of the non-updatable api domains. Adding this additional module to the testing module enables more thorough testing of module lib api scope java_api_library modules.

Test: m
Change-Id: Ia648651fb9e6cba2642de7e8d39047d888bf49ce
2023-04-17 21:28:47 +00:00
Alex Márquez Pérez Muñíz Díaz Puras Thaureaux
2c82fa615c Merge "bp2build: migrate export_{,system_}include_dirs -> *includes for cc_prebuilt_library{,_static,_shared}" am: fecec28c34
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2495176

Change-Id: I613dab4c44eeef4b504effb8853b52d1a6ff9fea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 21:11:58 +00:00
Romain Jobredeaux
4ff491c45c Merge "Allowlist CaptivePortalLogin and required dependencies." am: d7141be8ff
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2537758

Change-Id: I95281c160d5b91ae86b6c32ce36e5602772f9d0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 21:11:11 +00:00
Alex Márquez Pérez Muñíz Díaz Puras Thaureaux
fecec28c34 Merge "bp2build: migrate export_{,system_}include_dirs -> *includes for cc_prebuilt_library{,_static,_shared}" 2023-04-17 21:01:21 +00:00
Romain Jobredeaux
d7141be8ff Merge "Allowlist CaptivePortalLogin and required dependencies." 2023-04-17 20:33:00 +00:00
Ramy Medhat
39d6e26e79 Merge "Enable reclient cache directory." am: 93c52efc15 am: 7e0ea34591 am: 15dad682a2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2517415

Change-Id: Ie8db0e26c5bfb4f4f14df579796a441af82aad14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 15:56:21 +00:00
Ramy Medhat
15dad682a2 Merge "Enable reclient cache directory." am: 93c52efc15 am: 7e0ea34591
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2517415

Change-Id: I33db4afa3e507833874cc1f1ab0bc839ea13ed06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 15:26:05 +00:00
Ramy Medhat
7e0ea34591 Merge "Enable reclient cache directory." am: 93c52efc15
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2517415

Change-Id: I68b1fc786560a94e846eb328c40f39d5d97f29f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 14:41:47 +00:00
Ramy Medhat
93c52efc15 Merge "Enable reclient cache directory." 2023-04-17 14:10:20 +00:00
Romain Jobredeaux
aa6e25df46 Allowlist CaptivePortalLogin and required dependencies.
Change-Id: I5ed5bfa70d5a7d179e8721df0e833315a2ada05a
Bug: 215230089
2023-04-17 09:50:04 -04:00
Jooyung Han
b6a6cd79e3 apex: skip symbol files when replaced with prebuilt am: 9551384f65 am: 7feafd1599 am: 1dda598b41
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2539650

Change-Id: I3e52306e7497b946ad9b38d9a29ef4ed9d118611
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 12:25:36 +00:00
Jooyung Han
1dda598b41 apex: skip symbol files when replaced with prebuilt am: 9551384f65 am: 7feafd1599
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2539650

Change-Id: I0eaebfef83f4d529fc266a9bd7ecab311e97e159
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 11:56:02 +00:00
Jooyung Han
7feafd1599 apex: skip symbol files when replaced with prebuilt am: 9551384f65
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2539650

Change-Id: I83dce36b783176aeeafc0d60ee20fe786fb4fec5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 11:26:36 +00:00
Jooyung Han
9551384f65 apex: skip symbol files when replaced with prebuilt
Apexer rule with symbol files causes "no build rule" error when the apex
is replaced with prebuilt.

Bug: 251299786
Test: m checkbuild (presubmit)
Change-Id: I7390f72c321beaeb49fcee4e02a219c07f184664
2023-04-17 15:25:17 +09:00
Florian Mayer
11056ff617 Merge "Add handling for libc_hwasan to Soong" am: 7de9aa1a7b am: a330922efa am: 61d9f8ed5b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2526301

Change-Id: If1d8ca808220bbaa1c2cf9edd4c38356616414e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-15 00:42:08 +00:00
Treehugger Robot
db02c03082 Merge "mixed builds correctly reference stubs libs" am: 0c3682be50 am: 4a94e7df5d am: 8587cf5ee0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2530121

Change-Id: Id58c8c29f7ebd2e8c674c0bff7a964f4e2495431
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-15 00:40:07 +00:00
Florian Mayer
61d9f8ed5b Merge "Add handling for libc_hwasan to Soong" am: 7de9aa1a7b am: a330922efa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2526301

Change-Id: I75b3b678a26f98c8167b68a75ab8c7776c878db9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 23:55:55 +00:00
Treehugger Robot
8587cf5ee0 Merge "mixed builds correctly reference stubs libs" am: 0c3682be50 am: 4a94e7df5d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2530121

Change-Id: I5212ace1d06d9b6a0c77e4784fede848fef01945
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 23:55:29 +00:00
Florian Mayer
a330922efa Merge "Add handling for libc_hwasan to Soong" am: 7de9aa1a7b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2526301

Change-Id: I2ca2d815ebf432962ebcbccb62d8c6ba65407d51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 23:38:37 +00:00
Treehugger Robot
4a94e7df5d Merge "mixed builds correctly reference stubs libs" am: 0c3682be50
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2530121

Change-Id: I701f371b0afb4003298786f96365b59f0efe616e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 23:37:13 +00:00
Florian Mayer
7de9aa1a7b Merge "Add handling for libc_hwasan to Soong" 2023-04-14 23:27:57 +00:00
Treehugger Robot
0c3682be50 Merge "mixed builds correctly reference stubs libs" 2023-04-14 23:07:21 +00:00
Cole Faust
55f7fafb62 Merge "bp2build support for python_test(_host)" am: ae31382119 am: 2958c917d1 am: 7bf85f7d57
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2535119

Change-Id: I71478bdff4e0321cc0302e3654bd81b959e1be48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 22:26:51 +00:00
Cole Faust
7bf85f7d57 Merge "bp2build support for python_test(_host)" am: ae31382119 am: 2958c917d1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2535119

Change-Id: If7a14c440c4a9f8a9d37eac678161b4db87be168
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 21:55:51 +00:00
Cole Faust
2958c917d1 Merge "bp2build support for python_test(_host)" am: ae31382119
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2535119

Change-Id: Ia7e551a6ffba649aa3a8712104f44093b038ce2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 21:24:19 +00:00
Cole Faust
ae31382119 Merge "bp2build support for python_test(_host)" 2023-04-14 20:49:01 +00:00
Cole Faust
3cec6f3609 Merge "Remove special handling of prebuilt_framework-res" am: 35dcf77fb6 am: 76093aad8d am: 4d76485722
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2536611

Change-Id: I194b57c9dd723a058f14f354b539da9407dc2128
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 20:08:50 +00:00
Cole Faust
4d76485722 Merge "Remove special handling of prebuilt_framework-res" am: 35dcf77fb6 am: 76093aad8d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2536611

Change-Id: I494711e2e3d19385289a08ece42ef02bba448d3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 19:36:42 +00:00
Cole Faust
76093aad8d Merge "Remove special handling of prebuilt_framework-res" am: 35dcf77fb6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2536611

Change-Id: I52045eed5b301db542a0b502e5845d48b7363bff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 19:06:52 +00:00
Romain Jobredeaux
cfcc356d45 Merge "Delete platform mapping specific bp2build code" am: 141dcbb6cc am: 9bdecbed5b am: ef13c66c45
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2517837

Change-Id: Iac036668c39a4043acf86f9295e50af4982e7d37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 18:51:57 +00:00
Mark Dacek
052ed1234a Merge "Fix issue where bazel-force-enabled-modules aren't actually analyzed." am: 4e37219e4c am: a2c259c1a7 am: 1554515dac
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494955

Change-Id: I19d2419321ac6ec6c3ada40186f3d1ef8dba6e00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 18:51:19 +00:00
Cole Faust
35dcf77fb6 Merge "Remove special handling of prebuilt_framework-res" 2023-04-14 18:35:35 +00:00
Romain Jobredeaux
ef13c66c45 Merge "Delete platform mapping specific bp2build code" am: 141dcbb6cc am: 9bdecbed5b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2517837

Change-Id: I72635ea4285b4b315131525af79d8032172915fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 18:18:29 +00:00
Mark Dacek
1554515dac Merge "Fix issue where bazel-force-enabled-modules aren't actually analyzed." am: 4e37219e4c am: a2c259c1a7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494955

Change-Id: I3f494a5a113ac4e8aff92b7050ac2e8954293d7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 18:18:08 +00:00
Romain Jobredeaux
9bdecbed5b Merge "Delete platform mapping specific bp2build code" am: 141dcbb6cc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2517837

Change-Id: I1f86860443980ea169d52920f963e19c34fab1ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 17:49:41 +00:00
Mark Dacek
a2c259c1a7 Merge "Fix issue where bazel-force-enabled-modules aren't actually analyzed." am: 4e37219e4c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494955

Change-Id: I1a65358259a2961d0479d58957a4f5b39ae7c971
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 17:49:14 +00:00
Romain Jobredeaux
141dcbb6cc Merge "Delete platform mapping specific bp2build code" 2023-04-14 17:34:13 +00:00
Mark Dacek
4e37219e4c Merge "Fix issue where bazel-force-enabled-modules aren't actually analyzed." 2023-04-14 17:13:13 +00:00
Sam Delmerico
ca438e6b72 mixed builds correctly reference stubs libs
Bug: 270408757
Test: go test
Test: m NeuralNetworksTest_shared_partial --bazel-mode-staging
  && verify that Ninja commands link libneuralnetworks via stubs
Change-Id: I19bf5a829cea7fd00c0f82511ad2bddbc40fae4f
2023-04-14 12:42:23 -04:00
Treehugger Robot
ddff6fe677 Merge "Differentiate between public and module-lib stub variants" am: 9e1117bf66 am: c78c37429f am: 6278923e21
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2536351

Change-Id: I898169a936da36ad7728f987dbe3d1aa122d2deb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 04:15:12 +00:00
Treehugger Robot
6278923e21 Merge "Differentiate between public and module-lib stub variants" am: 9e1117bf66 am: c78c37429f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2536351

Change-Id: I31728fca2733bb7f4519327e8abf3fd8cc5e30b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 03:45:00 +00:00
Treehugger Robot
c78c37429f Merge "Differentiate between public and module-lib stub variants" am: 9e1117bf66
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2536351

Change-Id: Ib6c39451e239c6fc92aab62c3b2e2435a524481b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14 03:12:45 +00:00