Commit Graph

76566 Commits

Author SHA1 Message Date
Jingwen Chen
3284042a0e Merge "[bp2build] android_test bp2build." into main am: 088c4b652b am: 3aaf1a80bd am: 3a02b22205 am: cd2454b172 am: 278d4778c8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2727561

Change-Id: I7594547b6f80d7b63cde2458d556ccad3b7d508e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 02:46:52 +00:00
Jihoon Kang
b2386a378a Merge "Create java_api_contribution_import from sdk_library_import" into main am: 18a33e51c6 am: 578ece61ed am: 567f0186a3 am: f8b75c06ba am: 999d6f8b0a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2748475

Change-Id: Id2100cd5a805d7d4579530992e4fb65958796e18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 02:46:28 +00:00
Treehugger Robot
9e4277c9c0 Merge changes I8466db71,I83180699 into main am: e50b0f5558 am: 0efaada4cd am: 0053d8082b am: 4e5024f516 am: 75625e3a04
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752165

Change-Id: I4c6e652c3c77bfd2c3022c10b33e8c6271b0bb9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 02:45:01 +00:00
Jingwen Chen
278d4778c8 Merge "[bp2build] android_test bp2build." into main am: 088c4b652b am: 3aaf1a80bd am: 3a02b22205 am: cd2454b172
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2727561

Change-Id: I7f57a7958fab989c1568d6e74b22ecc9e28f4454
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 01:42:20 +00:00
Jihoon Kang
999d6f8b0a Merge "Create java_api_contribution_import from sdk_library_import" into main am: 18a33e51c6 am: 578ece61ed am: 567f0186a3 am: f8b75c06ba
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2748475

Change-Id: Ic17e5e48dd0dda5b555581d0145830e3b472362a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 01:42:00 +00:00
Treehugger Robot
75625e3a04 Merge changes I8466db71,I83180699 into main am: e50b0f5558 am: 0efaada4cd am: 0053d8082b am: 4e5024f516
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752165

Change-Id: I11fef7f50736c02e8c81f5cb86909e0c4dd1d6ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 01:41:40 +00:00
Jingwen Chen
cd2454b172 Merge "[bp2build] android_test bp2build." into main am: 088c4b652b am: 3aaf1a80bd am: 3a02b22205
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2727561

Change-Id: Ia68b1b272897630c77a39db7b3f7153ccbeadc77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 01:02:23 +00:00
Jihoon Kang
f8b75c06ba Merge "Create java_api_contribution_import from sdk_library_import" into main am: 18a33e51c6 am: 578ece61ed am: 567f0186a3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2748475

Change-Id: Iffc00859104be5075a47822104d49aaf56cb5257
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 01:02:07 +00:00
Treehugger Robot
4e5024f516 Merge changes I8466db71,I83180699 into main am: e50b0f5558 am: 0efaada4cd am: 0053d8082b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752165

Change-Id: Id73c1aed26ada4164b430084513cc29e93f35d7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 01:01:58 +00:00
Treehugger Robot
bf686ca719 Merge changes Ie081e153,If9745083 into main am: 8c04f3fd7a am: dc09fa0f8d am: 09b2d89725 am: 2339cd2432 am: 8571241195
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2753352

Change-Id: I5a54dd04f8fc6bc8b641e3d42931f5c8ded9d641
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 00:12:50 +00:00
Treehugger Robot
b6fb869ebd Merge "Unconditionally generate hash-based proguard mapping files" into main am: 46465666cc am: 92547162cd am: 96d1710972 am: e08ad862bf am: 2df2ef3e02
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752996

Change-Id: Iba1ec2aae50ddf406597b47e7cae5dc50a8d30f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 00:11:44 +00:00
Jingwen Chen
3a02b22205 Merge "[bp2build] android_test bp2build." into main am: 088c4b652b am: 3aaf1a80bd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2727561

Change-Id: I629c0b2f44b1a50cb4f487d077f63036cf96862d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 00:11:04 +00:00
Treehugger Robot
c9a581f5dc Merge "don't compress JNI libs extracted from aar_import" into main am: 35bc07cb2a am: 16542620eb am: fcc7fcf1eb am: 1edc01ae07 am: ed965f2258
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2636192

Change-Id: I2c8f767315f91cf3039b5a963f452ad62bde615b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 00:10:56 +00:00
Jihoon Kang
567f0186a3 Merge "Create java_api_contribution_import from sdk_library_import" into main am: 18a33e51c6 am: 578ece61ed
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2748475

Change-Id: Ia0ecca22ae35d210bec2567f0c3adbacb38860fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 00:10:55 +00:00
Treehugger Robot
0053d8082b Merge changes I8466db71,I83180699 into main am: e50b0f5558 am: 0efaada4cd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752165

Change-Id: Id91c263c06e3316ad27b237ce475a65384b6bdf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 00:09:38 +00:00
Treehugger Robot
8225cbfc71 Merge "Sort always convert by type list" into main am: 35f1ae0721 am: 48b6649189 am: 69be5dd734 am: 72ea2dc659 am: 5545f6aecc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2754805

Change-Id: I24c7944653e30b8da3307fb096f74078f59453d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 00:07:04 +00:00
Jingwen Chen
3aaf1a80bd Merge "[bp2build] android_test bp2build." into main am: 088c4b652b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2727561

Change-Id: Id15bc7e836370645f6777ecc4ad1f34cd678ba07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 00:04:46 +00:00
Jingwen Chen
088c4b652b Merge "[bp2build] android_test bp2build." into main 2023-09-18 23:27:14 +00:00
Jihoon Kang
578ece61ed Merge "Create java_api_contribution_import from sdk_library_import" into main am: 18a33e51c6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2748475

Change-Id: I86d682265a510ee60359c2517250c5f7459d3182
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-18 23:16:25 +00:00
Treehugger Robot
0efaada4cd Merge changes I8466db71,I83180699 into main am: e50b0f5558
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752165

Change-Id: Ic32fdf1452442b879c86d52f94f9de03317ae566
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-18 23:15:08 +00:00
Treehugger Robot
8571241195 Merge changes Ie081e153,If9745083 into main am: 8c04f3fd7a am: dc09fa0f8d am: 09b2d89725 am: 2339cd2432
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2753352

Change-Id: Iaf49f4d870ea3a33c3f012c030c96514f9483cf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-18 23:10:50 +00:00
Treehugger Robot
2df2ef3e02 Merge "Unconditionally generate hash-based proguard mapping files" into main am: 46465666cc am: 92547162cd am: 96d1710972 am: e08ad862bf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752996

Change-Id: I1be966663aceca21e624c185d583bfe868371b23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-18 23:09:58 +00:00
Treehugger Robot
ed965f2258 Merge "don't compress JNI libs extracted from aar_import" into main am: 35bc07cb2a am: 16542620eb am: fcc7fcf1eb am: 1edc01ae07
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2636192

Change-Id: I3a333961706ffad831dbe1ec3c07154af7a391f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-18 23:09:18 +00:00
Treehugger Robot
5545f6aecc Merge "Sort always convert by type list" into main am: 35f1ae0721 am: 48b6649189 am: 69be5dd734 am: 72ea2dc659
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2754805

Change-Id: I162fa2aeda2f30ea6d104daf2b7a91cdb3d498e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-18 23:05:30 +00:00
Treehugger Robot
2339cd2432 Merge changes Ie081e153,If9745083 into main am: 8c04f3fd7a am: dc09fa0f8d am: 09b2d89725
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2753352

Change-Id: Ic47be47b0d41ad6fbe92666bf0b6cb7959d4990a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-18 22:28:29 +00:00
Treehugger Robot
e08ad862bf Merge "Unconditionally generate hash-based proguard mapping files" into main am: 46465666cc am: 92547162cd am: 96d1710972
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752996

Change-Id: I780cca1308f0fba5be6a25851bd995ae39b94230
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-18 22:28:14 +00:00
Treehugger Robot
1edc01ae07 Merge "don't compress JNI libs extracted from aar_import" into main am: 35bc07cb2a am: 16542620eb am: fcc7fcf1eb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2636192

Change-Id: I408bc2c939902636c58c7dc6ad131f3644e32370
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-18 22:27:34 +00:00
Jihoon Kang
18a33e51c6 Merge "Create java_api_contribution_import from sdk_library_import" into main 2023-09-18 22:24:51 +00:00
Treehugger Robot
72ea2dc659 Merge "Sort always convert by type list" into main am: 35f1ae0721 am: 48b6649189 am: 69be5dd734
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2754805

Change-Id: I6a494785326820115fb40e1bd8ed31bad2e4fe0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-18 22:24:48 +00:00
Treehugger Robot
e50b0f5558 Merge changes I8466db71,I83180699 into main
* changes:
  Sort api files by api surface in java_api_library
  Add java_api_contribution_import module type
2023-09-18 22:23:33 +00:00
Treehugger Robot
09b2d89725 Merge changes Ie081e153,If9745083 into main am: 8c04f3fd7a am: dc09fa0f8d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2753352

Change-Id: I245b1bee60a9fc145f706f59186e8e72082b1e30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-18 20:34:36 +00:00
Treehugger Robot
96d1710972 Merge "Unconditionally generate hash-based proguard mapping files" into main am: 46465666cc am: 92547162cd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752996

Change-Id: I25d720af1c0cfc711a77e31f66506bd767353672
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-18 20:34:27 +00:00
Treehugger Robot
fcc7fcf1eb Merge "don't compress JNI libs extracted from aar_import" into main am: 35bc07cb2a am: 16542620eb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2636192

Change-Id: I44642943e4154ac2d13cdfbdcda4a6bc5035838a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-18 20:33:46 +00:00
Treehugger Robot
69be5dd734 Merge "Sort always convert by type list" into main am: 35f1ae0721 am: 48b6649189
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2754805

Change-Id: I40e4eb44041fb5e9ff920e8dc68d16a9d7a5a7d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-18 20:33:37 +00:00
Treehugger Robot
dc09fa0f8d Merge changes Ie081e153,If9745083 into main am: 8c04f3fd7a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2753352

Change-Id: If2438b236487c56b55fe35de18c6d1ae6530c195
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-18 20:28:29 +00:00
Jihoon Kang
71c868340e Create java_api_contribution_import from sdk_library_import
This change modifies sdk_library_import so that it directly creates
java_api_contribution per api scope. The module creates api_contribution
module for api scopes where the api file is specified.

Test: m nothing && MODULE_BUILD_FROM_SOURCE=false m nothing
--build-from-text-stub and inspect ninja dependency of java_api_library
Bug: 300175323

Change-Id: I74be3b4f1efef7f7d1cb8bd7b6c893b9cef0f370
2023-09-18 19:33:28 +00:00
Jihoon Kang
8fe1982e8b Sort api files by api surface in java_api_library
metalava requires api files to be sorted in the narrower api scope to
the wider api scope when passed as inputs. Previously, the api files
were sorted based on the naming convention, but some api files in
prebuilts do not necessarily follow the naming convention (i.e.
*-current.txt). Therefore, utilize the api surface information provided
by the java_api_contribution provider instead of the naming convention
to sort the api files.

Test: m nothing
Bug: 300175323
Change-Id: I8466db712bff8fef906186bd272d85682877533d
2023-09-18 19:33:01 +00:00
Treehugger Robot
8c04f3fd7a Merge changes Ie081e153,If9745083 into main
* changes:
  Stub/Impl selection for sdk variants
  bp2build converter for ndk_library
2023-09-18 19:21:15 +00:00
Treehugger Robot
92547162cd Merge "Unconditionally generate hash-based proguard mapping files" into main am: 46465666cc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752996

Change-Id: I826e56a4f20739e0fc05f94ecddb68b6fc938309
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-18 18:56:21 +00:00
Treehugger Robot
16542620eb Merge "don't compress JNI libs extracted from aar_import" into main am: 35bc07cb2a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2636192

Change-Id: I7c94b0fb24d2c4a272308a932f1261638d94a546
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-18 18:56:02 +00:00
Treehugger Robot
48b6649189 Merge "Sort always convert by type list" into main am: 35f1ae0721
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2754805

Change-Id: Ib624dd4be4dd06aae0f6ab4338113089d3b4fb36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-18 18:55:13 +00:00
Treehugger Robot
46465666cc Merge "Unconditionally generate hash-based proguard mapping files" into main 2023-09-18 18:33:38 +00:00
Treehugger Robot
35bc07cb2a Merge "don't compress JNI libs extracted from aar_import" into main 2023-09-18 18:20:52 +00:00
Treehugger Robot
35f1ae0721 Merge "Sort always convert by type list" into main 2023-09-18 18:03:58 +00:00
Jared Duke
b832fbb643 Unconditionally generate hash-based proguard mapping files
Previously, this was restricted to targets that enable R8 full mode, but
that was really just a temporary carveout to avoid disrupting other
targets. Since then, R8 full mode has been enabled by default for all
app targets, and the hash-based mapping mechanism is further integrated
into various debugging and retracing pipelines.

As of now, there are are only a very small number of targets that have
enabled optimization/obfuscation and are still using R8 compat mode, so
the build-time impact of this change should be minimal, and there should
be no functional runtime side effects.

Bug: 297566172
Test: m framework-appsearch + inspect proguard mapping
Change-Id: I5dfea60f60dc37b8445c8fddba6a4eab0dc41d96
2023-09-18 16:05:16 +00:00
Liz Kammer
4fc71fff30 Sort always convert by type list
Test: CI
Change-Id: Icdf1f4e8132d959b494e2570854ee06973a816b0
2023-09-18 09:11:18 -04:00
Jingwen Chen
e12c083198 [bp2build] android_test bp2build.
android_test is just an android_app, but the test bits are handled
purely in Starlark (tradefed_test_impl).

This enables building HelloWorldTests (android_test) with Bazel.

Bug: 297030120
Bug: 297029612
Test: WIP
Change-Id: I6d287c94b31698ea247da48e4cd6b5a75bc71e11
2023-09-18 12:39:06 +00:00
Treehugger Robot
43e6b35185 Merge "Handle bad rename" into main am: faa7c7c102 am: 2aa5b5dec2 am: 93a212402a am: 46f9650c89 am: 094228c3ab
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2754006

Change-Id: Idba7f72d8a39256fa448c8ce0b0bb1936f8c4971
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 08:37:47 +00:00
Treehugger Robot
094228c3ab Merge "Handle bad rename" into main am: faa7c7c102 am: 2aa5b5dec2 am: 93a212402a am: 46f9650c89
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2754006

Change-Id: I9ae9abcffc32c637d0bebce4e5221d095030c92b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 07:35:17 +00:00
Treehugger Robot
46f9650c89 Merge "Handle bad rename" into main am: faa7c7c102 am: 2aa5b5dec2 am: 93a212402a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2754006

Change-Id: Ie71a7cc2132b24ec461216875c2798ba4536077a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 06:54:02 +00:00