Commit Graph

73373 Commits

Author SHA1 Message Date
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
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
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
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
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
Treehugger Robot
93a212402a Merge "Handle bad rename" into main am: faa7c7c102 am: 2aa5b5dec2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2754006

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

Change-Id: I7b69be23892d062d8cfacf03d8fa66a45809da73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-16 05:01:58 +00:00
Treehugger Robot
faa7c7c102 Merge "Handle bad rename" into main 2023-09-16 03:52:51 +00:00
Liz Kammer
00543dc61c Handle bad rename
Cleanspec wasn't working, so let's handle it in Soong

Test: create an invalid file, run m nothing, verify it is removed
Change-Id: I55d3c9344541b8e504887225a660044e14204427
2023-09-15 21:22:55 -04:00
Treehugger Robot
d4f118cb2f Merge "Allowlist ndk STL dependencies" into main am: 9f7028852c am: 3a01b22df2 am: 62c3214586
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2750725

Change-Id: Ie6eb329eaa3f7304088778548346bfa32d7e0d86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 22:53:49 +00:00
Zi Wang
8f1e3e697c Merge changes from topic "drop_deps_no_srcs" into main am: 5d982b398e am: cccefd7433 am: 7ccd48617c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752995

Change-Id: I8b85af966cb9126b45ed39c97776ed65b0d71409
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 22:53:07 +00:00
Edward Liaw
c7ed522e1a Merge "sh_binary: Implement OutputFileProducer for sh_test" into main am: f3b7e79cc7 am: 05f4b4dd0f am: 5e95201ca8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2697523

Change-Id: I4482ccc26b10e716a659128ae0f4b8cd02e952b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 22:52:57 +00:00
Treehugger Robot
66863f6f3b Merge "Implement bp2build converter for fdo_profile" into main am: 5293f01b3f am: b5a1dfb557 am: b3130adf9e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2615930

Change-Id: Ia5c1d2ebbda7d73910dfd5aaf5c5673d943c02d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 22:50:27 +00:00
Treehugger Robot
62c3214586 Merge "Allowlist ndk STL dependencies" into main am: 9f7028852c am: 3a01b22df2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2750725

Change-Id: I7a00b33722f51121531b30b3981846f1b32e6c62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 21:58:04 +00:00
Zi Wang
7ccd48617c Merge changes from topic "drop_deps_no_srcs" into main am: 5d982b398e am: cccefd7433
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752995

Change-Id: I2bf4f8a67332da3d970ed7e24fc612658c4523ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 21:57:54 +00:00
Edward Liaw
5e95201ca8 Merge "sh_binary: Implement OutputFileProducer for sh_test" into main am: f3b7e79cc7 am: 05f4b4dd0f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2697523

Change-Id: Ic53e1c7965ce3df6c2394847873ae7a6a146251e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 21:57:31 +00:00
Treehugger Robot
b3130adf9e Merge "Implement bp2build converter for fdo_profile" into main am: 5293f01b3f am: b5a1dfb557
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2615930

Change-Id: I5f1466bc66a2108e15efcd36789311b20fbdc198
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 21:55:48 +00:00
Treehugger Robot
3a01b22df2 Merge "Allowlist ndk STL dependencies" into main am: 9f7028852c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2750725

Change-Id: I6419fd0cb9cb50e9f2d993df8d77456458a3c5b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 21:49:46 +00:00
Treehugger Robot
9f7028852c Merge "Allowlist ndk STL dependencies" into main 2023-09-15 21:23:49 +00:00
Zi Wang
cccefd7433 Merge changes from topic "drop_deps_no_srcs" into main am: 5d982b398e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2752995

Change-Id: I095b48f0bbe31fdc65df43a81693b7dfb7c60da8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 20:59:17 +00:00
Edward Liaw
05f4b4dd0f Merge "sh_binary: Implement OutputFileProducer for sh_test" into main am: f3b7e79cc7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2697523

Change-Id: Ia2e034fae5fb4911c613580c87a9d2f4a1600140
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 20:59:00 +00:00
Treehugger Robot
b5a1dfb557 Merge "Implement bp2build converter for fdo_profile" into main am: 5293f01b3f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2615930

Change-Id: Ibd550eab55f703303f98fa6233e5e12387d8f26d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 20:56:21 +00:00
Zi Wang
5d982b398e Merge changes from topic "drop_deps_no_srcs" into main
* changes:
  Always drop deps from java_library with no srcs
  Do not append deps to exports when java_library has only proto srcs
2023-09-15 20:39:35 +00:00
Edward Liaw
f3b7e79cc7 Merge "sh_binary: Implement OutputFileProducer for sh_test" into main 2023-09-15 20:33:46 +00:00
Treehugger Robot
12fb0d47d5 Merge "Enable target features for riscv64 Rust builds" into main am: 2e3f8e6b35 am: ec8bdaef40 am: 6653797f3c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2750768

Change-Id: I6f50034f3817c7d6d63283c7d08704f42970a84c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 20:07:13 +00:00
Kousik Kumar
e252ef195e Merge "Remove unused symlink code" into main am: 7a07b85fb5 am: c2bcfdb2ba am: ffd4c59db4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2753025

Change-Id: I4bab93cf43b27387cf3ed2038f57d8364caf2c4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 20:05:45 +00:00
Treehugger Robot
5293f01b3f Merge "Implement bp2build converter for fdo_profile" into main 2023-09-15 19:54:22 +00:00
Treehugger Robot
6653797f3c Merge "Enable target features for riscv64 Rust builds" into main am: 2e3f8e6b35 am: ec8bdaef40
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2750768

Change-Id: Ia1d047e67f246d7b65bee6991d8c4e12251fe170
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 19:13:30 +00:00
Kousik Kumar
ffd4c59db4 Merge "Remove unused symlink code" into main am: 7a07b85fb5 am: c2bcfdb2ba
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2753025

Change-Id: I438d19f4d0892961d484fd673582405e0e6c9174
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 19:12:51 +00:00
Treehugger Robot
ec8bdaef40 Merge "Enable target features for riscv64 Rust builds" into main am: 2e3f8e6b35
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2750768

Change-Id: Ib0895ef14b71adab8e18caf2ba5be3780b5c3372
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 19:09:59 +00:00
Treehugger Robot
2e3f8e6b35 Merge "Enable target features for riscv64 Rust builds" into main 2023-09-15 18:42:40 +00:00
Yu Liu
bde239e2be Merge "Support aconfig_declarations, aconfig_values and aconfig_value_set" into main am: e6153b54bc am: 8c21c60e66 am: adf6ac190a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2741124

Change-Id: I2a8a07952fdc90a40305a853fe6148a77553f3ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 18:19:12 +00:00
Kousik Kumar
c2bcfdb2ba Merge "Remove unused symlink code" into main am: 7a07b85fb5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2753025

Change-Id: I224878f9df52c7dc8feb1015bfed969fe3e77400
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 18:17:15 +00:00
Kousik Kumar
7a07b85fb5 Merge "Remove unused symlink code" into main 2023-09-15 17:49:07 +00:00
Zi Wang
dd93636f1e Always drop deps from java_library with no srcs
This is the follow up from aosp/2750763

Test: CI and added unit test

Bug: 285952385
Change-Id: I64703ee4fa742b718ffb43f2af1b6ab43ddeb606
2023-09-15 10:37:16 -07:00
Yu Liu
adf6ac190a Merge "Support aconfig_declarations, aconfig_values and aconfig_value_set" into main am: e6153b54bc am: 8c21c60e66
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2741124

Change-Id: I9f8f098809a0da6374e2fd9eae5cfce736bc4c1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 17:27:13 +00:00
Yu Liu
8c21c60e66 Merge "Support aconfig_declarations, aconfig_values and aconfig_value_set" into main am: e6153b54bc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2741124

Change-Id: I69520f0c66a3b42c7c161cedbf06ae711d9f93e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 17:22:06 +00:00
Yu Liu
e6153b54bc Merge "Support aconfig_declarations, aconfig_values and aconfig_value_set" into main 2023-09-15 16:46:01 +00:00
Vinh Tran
ce40b92c84 Implement bp2build converter for fdo_profile
Ignore-AOSP-First: ag/24746588, in the same topic, is in an internal repo. This CL will be cherry-picked to AOSP afterward.
Test: go test
Bug: 277091218
Change-Id: I389d9535ea176991a1faa9beb46352b93363acd2
Merged-In: I389d9535ea176991a1faa9beb46352b93363acd2
2023-09-15 10:45:17 -04:00
Christopher Parsons
d5b7f6888d Merge "Add unit test for parsing build files in bp2build" into main am: 3671c385c7 am: 215849163c am: 13d1c0064b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2751688

Change-Id: I3fa16b7faa5891a8376fef8759dac5e51cd8aff8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 03:06:49 +00:00