Commit Graph

71354 Commits

Author SHA1 Message Date
Treehugger Robot
f5898b3e40 Merge "Suppress resourceshrinker stdout in soong" am: ece97e5658 am: 1890f082a7 am: b12365df34 am: 7a67e5ca42 am: 64b4d69f9e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2629191

Change-Id: Ie1c320e0c806d86c892b0107edd2cf439d8fb602
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-01 03:02:25 +00:00
Treehugger Robot
64b4d69f9e Merge "Suppress resourceshrinker stdout in soong" am: ece97e5658 am: 1890f082a7 am: b12365df34 am: 7a67e5ca42
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2629191

Change-Id: Id2a2b8d8d44c5e4ae817d69d99ac6e105141b998
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-01 02:19:30 +00:00
Treehugger Robot
7a67e5ca42 Merge "Suppress resourceshrinker stdout in soong" am: ece97e5658 am: 1890f082a7 am: b12365df34
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2629191

Change-Id: Id3005c689e4d8b5badecc6a6a6c414fc86464abc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-01 01:37:17 +00:00
Treehugger Robot
b12365df34 Merge "Suppress resourceshrinker stdout in soong" am: ece97e5658 am: 1890f082a7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2629191

Change-Id: Ib3a05347c5bb1b9aea274cb740f063f9013c02a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-01 00:53:18 +00:00
Treehugger Robot
1890f082a7 Merge "Suppress resourceshrinker stdout in soong" am: ece97e5658
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2629191

Change-Id: I7b82f1d75e7d055b4963804c995e57f714fee1cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-01 00:13:05 +00:00
Treehugger Robot
ece97e5658 Merge "Suppress resourceshrinker stdout in soong" 2023-06-30 23:26:28 +00:00
Treehugger Robot
dab9ef4682 Merge "Disable rust in Kythe builds for now" am: c627847e1b am: a726553b19 am: c7d5c825e5 am: f1325039a3 am: 85d683545c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2643054

Change-Id: I393eb328ad563ae941b3333ee53c8883dd624e19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 20:36:58 +00:00
Treehugger Robot
85d683545c Merge "Disable rust in Kythe builds for now" am: c627847e1b am: a726553b19 am: c7d5c825e5 am: f1325039a3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2643054

Change-Id: Ib3b601b39b1adad56cf5ca88e019cf1249d75692
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 19:50:32 +00:00
Treehugger Robot
f1325039a3 Merge "Disable rust in Kythe builds for now" am: c627847e1b am: a726553b19 am: c7d5c825e5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2643054

Change-Id: I18ea7b352cfa2d7aee8abc102c6a39e63626d551
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 19:06:36 +00:00
Treehugger Robot
c7d5c825e5 Merge "Disable rust in Kythe builds for now" am: c627847e1b am: a726553b19
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2643054

Change-Id: I2a99ccbe9553926b8f4ec0f607c67c722366d9c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 18:23:09 +00:00
Treehugger Robot
3fe49c448c Merge "Don't use RBE for bp2build/queryview/api_bp2build/json_module_graph, even with USE_RBE=true." am: b54a3d08ac am: 2ec2dbc3ec am: 9eba82453d am: 5d36548f49 am: 5f3dfc299c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2643172

Change-Id: I9d8534450e7b21fb70cefacc4d0ef83bb7467994
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 17:58:43 +00:00
Treehugger Robot
a726553b19 Merge "Disable rust in Kythe builds for now" am: c627847e1b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2643054

Change-Id: I55ded9e23f27007a1d6641548626d9c6045c9b7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 17:43:44 +00:00
Treehugger Robot
5f3dfc299c Merge "Don't use RBE for bp2build/queryview/api_bp2build/json_module_graph, even with USE_RBE=true." am: b54a3d08ac am: 2ec2dbc3ec am: 9eba82453d am: 5d36548f49
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2643172

Change-Id: Iba8218aeff3fb5520d26985f0899e2812028cccc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 17:21:43 +00:00
Treehugger Robot
c627847e1b Merge "Disable rust in Kythe builds for now" 2023-06-30 16:42:26 +00:00
Treehugger Robot
5d36548f49 Merge "Don't use RBE for bp2build/queryview/api_bp2build/json_module_graph, even with USE_RBE=true." am: b54a3d08ac am: 2ec2dbc3ec am: 9eba82453d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2643172

Change-Id: If1efb45745501cef1a329c6ec8c0d97cf2bde513
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 16:40:03 +00:00
Treehugger Robot
9eba82453d Merge "Don't use RBE for bp2build/queryview/api_bp2build/json_module_graph, even with USE_RBE=true." am: b54a3d08ac am: 2ec2dbc3ec
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2643172

Change-Id: Ibab1acb0717ef58831dc8faa7dc01fde60b224d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 15:52:59 +00:00
Treehugger Robot
2ec2dbc3ec Merge "Don't use RBE for bp2build/queryview/api_bp2build/json_module_graph, even with USE_RBE=true." am: b54a3d08ac
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2643172

Change-Id: I09e2111f8eca21cce6bc64accb83d43fcabc5b6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 15:16:25 +00:00
Treehugger Robot
b54a3d08ac Merge "Don't use RBE for bp2build/queryview/api_bp2build/json_module_graph, even with USE_RBE=true." 2023-06-30 14:35:49 +00:00
Nicolas Geoffray
b603b627a7 Merge "Don't strip oat files on host." am: 3799533b87 am: 51ba0cf62a am: 5f1a60b3ff am: 3329a4e764 am: 032c8074b1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2640035

Change-Id: Icae2b148980cca26f10063df48e07aede46cd3df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 14:08:03 +00:00
Nicolas Geoffray
032c8074b1 Merge "Don't strip oat files on host." am: 3799533b87 am: 51ba0cf62a am: 5f1a60b3ff am: 3329a4e764
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2640035

Change-Id: Iadb004ecb92961d163019fd3b4b39e344b6a04ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 13:30:27 +00:00
Treehugger Robot
b87706fec2 Merge "Extract class files from dep_api_srcs instead of java files" am: 043893465c am: e2be65ac9b am: c3f42dcf7b am: 52adedba36 am: c2c0f70a59
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2637669

Change-Id: Ic07c0426e97cb381ca01ce4b6af8e536a6353af1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 13:05:14 +00:00
Nicolas Geoffray
3329a4e764 Merge "Don't strip oat files on host." am: 3799533b87 am: 51ba0cf62a am: 5f1a60b3ff
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2640035

Change-Id: Ia6cbaeac9c23452129979f6f10e33dac62d422bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 12:48:02 +00:00
Treehugger Robot
c2c0f70a59 Merge "Extract class files from dep_api_srcs instead of java files" am: 043893465c am: e2be65ac9b am: c3f42dcf7b am: 52adedba36
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2637669

Change-Id: Idbf839588d9f5a08541bc8bda86a3686a17dcdd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 12:27:38 +00:00
Nicolas Geoffray
5f1a60b3ff Merge "Don't strip oat files on host." am: 3799533b87 am: 51ba0cf62a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2640035

Change-Id: I384d022f73587fb18dd573faf5606fd3c6927479
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 12:02:00 +00:00
Treehugger Robot
52adedba36 Merge "Extract class files from dep_api_srcs instead of java files" am: 043893465c am: e2be65ac9b am: c3f42dcf7b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2637669

Change-Id: Ia1a4eeb78e6aa98dbc8e033a385a6f00fb7f7177
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 11:45:13 +00:00
Nicolas Geoffray
51ba0cf62a Merge "Don't strip oat files on host." am: 3799533b87
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2640035

Change-Id: I64d7150c9ae382ba2bc835f039a2776ce665478a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 11:25:18 +00:00
Treehugger Robot
c3f42dcf7b Merge "Extract class files from dep_api_srcs instead of java files" am: 043893465c am: e2be65ac9b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2637669

Change-Id: I9dc0588479a585966a4664af120e0e3e08099f80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 10:59:26 +00:00
Nicolas Geoffray
3799533b87 Merge "Don't strip oat files on host." 2023-06-30 10:49:50 +00:00
Treehugger Robot
e2be65ac9b Merge "Extract class files from dep_api_srcs instead of java files" am: 043893465c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2637669

Change-Id: I4d0ee0399f5262ae7a845497e13953ebd3aba877
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 10:24:21 +00:00
Treehugger Robot
043893465c Merge "Extract class files from dep_api_srcs instead of java files" 2023-06-30 09:36:42 +00:00
Jingwen Chen
d7ccde11d6 Don't use RBE for bp2build/queryview/api_bp2build/json_module_graph,
even with USE_RBE=true.

These are alternate modes of soong_build that don't use rbe/reclient.

This lets us to remove USE_RBE=false from the bp2build run.

Test: presubmits
Change-Id: I439f9cf7e92ec85ca56baec5f62a83ee49b510d4
2023-06-30 09:32:32 +00:00
Jingwen Chen
a41ff98f5d Merge "Revert "add media.swcodec to Bazel prod allowlist"" am: 661b2ee719 am: 2fcebc1959 am: f3a74c87c9 am: ac2a58feaa am: 13dbbaca3f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2645429

Change-Id: I87c735dc699b58d8978871a69b721c632fe073e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 07:51:03 +00:00
Jingwen Chen
13dbbaca3f Merge "Revert "add media.swcodec to Bazel prod allowlist"" am: 661b2ee719 am: 2fcebc1959 am: f3a74c87c9 am: ac2a58feaa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2645429

Change-Id: I9efe5caf92cd7c224535d6c987baed897724775a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 07:08:58 +00:00
Jingwen Chen
ac2a58feaa Merge "Revert "add media.swcodec to Bazel prod allowlist"" am: 661b2ee719 am: 2fcebc1959 am: f3a74c87c9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2645429

Change-Id: I5cc2a0cd3b2beaed876c91b38245d60bf61f5d27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 06:27:16 +00:00
Treehugger Robot
9477031d76 Merge "Ensure we get cross refs for Bazel-built artifacts" am: bf815a135a am: 8e9910fbcc am: b99a3def27 am: 3658def394 am: e795ed3ffa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2643055

Change-Id: I21792476fcf99449eb088cd52414a5311c3bfa9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 06:23:26 +00:00
Treehugger Robot
e795ed3ffa Merge "Ensure we get cross refs for Bazel-built artifacts" am: bf815a135a am: 8e9910fbcc am: b99a3def27 am: 3658def394
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2643055

Change-Id: Ic80e6a0d5bb4d24da08fd2e5d9320a4d1b86f7c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 05:45:18 +00:00
Jingwen Chen
f3a74c87c9 Merge "Revert "add media.swcodec to Bazel prod allowlist"" am: 661b2ee719 am: 2fcebc1959
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2645429

Change-Id: I63aeb8d6ba11f38a2d062d6bc2d2868c34f2ac0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 05:42:01 +00:00
Jingwen Chen
2fcebc1959 Merge "Revert "add media.swcodec to Bazel prod allowlist"" am: 661b2ee719
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2645429

Change-Id: I22fd98cdddcf259acb35e6d0feb39f63eb4e11ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 05:03:11 +00:00
Treehugger Robot
3658def394 Merge "Ensure we get cross refs for Bazel-built artifacts" am: bf815a135a am: 8e9910fbcc am: b99a3def27
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2643055

Change-Id: I0f69d8bed0b138a217641ad89e43260f8672ab1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 05:01:26 +00:00
Jingwen Chen
661b2ee719 Merge "Revert "add media.swcodec to Bazel prod allowlist"" 2023-06-30 04:23:40 +00:00
Treehugger Robot
b99a3def27 Merge "Ensure we get cross refs for Bazel-built artifacts" am: bf815a135a am: 8e9910fbcc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2643055

Change-Id: I9dfafd3d5c98351c3ecb0eb2f4839b29166317ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 04:17:21 +00:00
Treehugger Robot
8e9910fbcc Merge "Ensure we get cross refs for Bazel-built artifacts" am: bf815a135a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2643055

Change-Id: Iec60f938197c1d453930ca132a3823986ae1ee83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 03:14:03 +00:00
Treehugger Robot
bf815a135a Merge "Ensure we get cross refs for Bazel-built artifacts" 2023-06-30 02:22:27 +00:00
Cole Faust
4f9bf72b31 Commend out dcla_apex_comparison_test.sh am: a56663f695 am: a87f147338 am: dd05416a08 am: 2393deb255 am: 52b352eae9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2644916

Change-Id: If161245c5efe02a231cfb5ef27c530334811df61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 23:00:59 +00:00
Treehugger Robot
995c8f610a Merge "Fix FirstUniqueStrings after conversion to generics" am: da169a1ee3 am: e5f8e56262 am: 146391ed48 am: 987869d644 am: cd925b6d9e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2640231

Change-Id: Ife997d61025215a9a83877db9fb6ba6a2c00bec8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 23:00:01 +00:00
Jihoon Kang
ca198c2639 Extract class files from dep_api_srcs instead of java files
Currently, stub java files are extracted from srcjar file provided from
dep_api_srcs in java_api_library module generated in java_sdk_library
per api scope. However, compiling the java files may lead to difference
in the content of the generated class files even if the stub java files
are equivalent, as javac may arbitrarily add overridden methods. Thus,
create a stub jar file instead of creating a stub srcjar file and
compiling it, in order to guarantee stub jar files content equivalence
and thus enable hiddenapi during from-text stub build.

Note that this change does not fully resolve differences between the
full api surface csv and the per sdk_library csv. Instead, it removes
the difference caused by methods arbitrarily added by javac.

This change also renames dep_api_srcs to full_api_surface_stubs to be
more intuitive.

Test: rebase on top of aosp/2617274 and `m --build-from-text-stub`
Bug: 275570206
Change-Id: I22b6d56624633681f5c3b000370b5782655c7b8d
2023-06-29 22:43:05 +00:00
Trevor Radcliffe
061012475c Revert "add media.swcodec to Bazel prod allowlist"
This reverts commit b1274236e8.

Reason for revert: 
b/289418267

Change-Id: I0a94675e09a82b55d62e58dbeea0d3186c754ed3
2023-06-29 22:30:18 +00:00
Cole Faust
52b352eae9 Commend out dcla_apex_comparison_test.sh am: a56663f695 am: a87f147338 am: dd05416a08 am: 2393deb255
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2644916

Change-Id: I63f33f546277d45f6dde70f87ea86a0747bfa1cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 22:14:10 +00:00
Treehugger Robot
cd925b6d9e Merge "Fix FirstUniqueStrings after conversion to generics" am: da169a1ee3 am: e5f8e56262 am: 146391ed48 am: 987869d644
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2640231

Change-Id: I09c814f44879d86e1568125babff7331647c83dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 22:13:25 +00:00
Cole Faust
2393deb255 Commend out dcla_apex_comparison_test.sh am: a56663f695 am: a87f147338 am: dd05416a08
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2644916

Change-Id: I7d5711d8dab3719c155107fe973ad1fac93300ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 21:31:31 +00:00