Commit Graph

73232 Commits

Author SHA1 Message Date
Zi Wang
19c149390a Merge "Bp2build: handle the case where java_library has only proto srcs" into main am: c90e1ec784 am: bc36c7e264 am: 7018df6938
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2748099

Change-Id: I257afc9987b2cac8aad668582a9d50f37f2f0981
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 03:02:52 +00:00
Zi Wang
7018df6938 Merge "Bp2build: handle the case where java_library has only proto srcs" into main am: c90e1ec784 am: bc36c7e264
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2748099

Change-Id: I869460457bdfcbd5a70081cac7b67ad04aed3345
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 02:13:58 +00:00
Zi Wang
bc36c7e264 Merge "Bp2build: handle the case where java_library has only proto srcs" into main am: c90e1ec784
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2748099

Change-Id: I61e88db98415997ea27b0d590e65f36dc8f1e153
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 01:19:40 +00:00
Zi Wang
c90e1ec784 Merge "Bp2build: handle the case where java_library has only proto srcs" into main 2023-09-13 00:30:39 +00:00
Ivan Lozano
3f3e4b699d Merge "rust: Emit frame pointers on 64-bit device targets." into main am: d753c2e53c am: 9f699945e0 am: 7b9b42697e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2748514

Change-Id: I4a2a16b7f580ee29c1c7918e809ffc99925abaf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 23:44:24 +00:00
Ivan Lozano
7b9b42697e Merge "rust: Emit frame pointers on 64-bit device targets." into main am: d753c2e53c am: 9f699945e0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2748514

Change-Id: Id888b807d82ed35cb3337b9acdaca5297ad50d01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 22:55:24 +00:00
Ivan Lozano
9f699945e0 Merge "rust: Emit frame pointers on 64-bit device targets." into main am: d753c2e53c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2748514

Change-Id: I6791c2f4ce4584c256a727dd1ff91c3214d0fea3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 22:01:29 +00:00
Sebastian Pickl
ff67ad2455 Merge "Revert "Change symlink_forest to use relative symlinks."" into main am: 3d2b08fe0d am: 802f9b563b am: 7f3f187beb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2748335

Change-Id: I587058c865a2986064483a2118168c3772ffa589
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 21:16:34 +00:00
Ivan Lozano
d753c2e53c Merge "rust: Emit frame pointers on 64-bit device targets." into main 2023-09-12 20:53:58 +00:00
Sebastian Pickl
7f3f187beb Merge "Revert "Change symlink_forest to use relative symlinks."" into main am: 3d2b08fe0d am: 802f9b563b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2748335

Change-Id: I2dfd44956fb50ae215baa56fe215aea6a94516ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 20:28:05 +00:00
Sebastian Pickl
802f9b563b Merge "Revert "Change symlink_forest to use relative symlinks."" into main am: 3d2b08fe0d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2748335

Change-Id: I3a95f282599f250da472e740abce57f0dfbc4209
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 19:39:18 +00:00
Elliott Hughes
d23bc8d300 Merge "riscv64: enable V." into main am: 5c12fb922d am: 0a6b62d62b am: 1ac73459cd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2679376

Change-Id: I8e5174beeee3082069298d31b3814e16836eb3c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 19:38:58 +00:00
Shikha Panwar
4191b2a993 Merge "Soong support for rollback index." into main am: 3942df00ec am: 49738e2c23 am: ee71fdb9dd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2745458

Change-Id: I5fcb916ef9f841632bfc173a370368bfc1980ace
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 19:35:16 +00:00
Sebastian Pickl
3d2b08fe0d Merge "Revert "Change symlink_forest to use relative symlinks."" into main 2023-09-12 18:53:47 +00:00
Sebastian Pickl
90355f79bf Revert "Change symlink_forest to use relative symlinks."
Revert submission 2673616-relativesymlinks-fix

Reason for revert: this breaks tests verified with go/abtd https://android-build.googleplex.com/builds/abtd/run/L36000000963001181

Bug: 300122962

Reverted changes: /q/submissionid:2673616-relativesymlinks-fix

Change-Id: I5a97c4fbe4df5727c0604a07137093d0f00c7776
2023-09-12 18:51:39 +00:00
Elliott Hughes
1ac73459cd Merge "riscv64: enable V." into main am: 5c12fb922d am: 0a6b62d62b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2679376

Change-Id: Ie1453733049630abccb12cb4fb420dbedf9968af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 18:47:57 +00:00
Shikha Panwar
ee71fdb9dd Merge "Soong support for rollback index." into main am: 3942df00ec am: 49738e2c23
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2745458

Change-Id: Id63460084d9c7527f0bc835744d34dfc15741a6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 18:47:41 +00:00
Elliott Hughes
0a6b62d62b Merge "riscv64: enable V." into main am: 5c12fb922d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2679376

Change-Id: Ia347a43c30988c7b67f70360f6e3d22d076d306c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 18:42:30 +00:00
Elliott Hughes
5c12fb922d Merge "riscv64: enable V." into main 2023-09-12 17:57:50 +00:00
Mark Dacek
0dc72266a2 Merge "Change symlink_forest to use relative symlinks." into main am: 4eabebec69 am: 5324bcac91 am: bb6dfc5c40
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2674136

Change-Id: I66d3c990eeb06d2773c5c20f4c6c187a584ca334
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 17:53:03 +00:00
Shikha Panwar
49738e2c23 Merge "Soong support for rollback index." into main am: 3942df00ec
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2745458

Change-Id: I25bde54ee5f512edb552ecca4b8babdefb4dfa8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 17:49:40 +00:00
Zi Wang
774c6eaf10 Bp2build: handle the case where java_library has only proto srcs
java_library doesn't accept deps when there are no srcs because
no compilation happens, but it accepts exports.

The deps from the module are not necessary for compiling the protos,
in which case they are unnecessary as deps on the java_library as well
since they are not be propagated to any dependencies.

So we can put the deps to exports and drop deps here.

Test: CI and added unit test

Bug: 285952385
Change-Id: Ie54a4ac0db592fb96fede64f0e67df309dca9c1d
2023-09-12 10:41:42 -07:00
Ivan Lozano
085efff213 rust: Emit frame pointers on 64-bit device targets.
Frame pointers can aid in unwinding and reading stack traces.

Bug: 298267402
Test: m rust
Change-Id: I48bf5ef9ffa9912d6af5fc2b7297f250d15718ea
2023-09-12 13:28:37 -04:00
Shikha Panwar
3942df00ec Merge "Soong support for rollback index." into main 2023-09-12 17:15:59 +00:00
Mark Dacek
bb6dfc5c40 Merge "Change symlink_forest to use relative symlinks." into main am: 4eabebec69 am: 5324bcac91
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2674136

Change-Id: I9fdb503c7b91bdf16f262a317ca0d201e66ba488
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 17:04:52 +00:00
Liz Kammer
f2d797f844 Merge "Sort do not convert for unconverted deps" into main am: 7ebb91a449 am: b6d89afe2d am: 7e36cd8da5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744700

Change-Id: I985cb71d8b9de30683f44546adca498fec5280cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 16:14:24 +00:00
Romain Jobredeaux
935c1b559f Merge "Re-order android_app bp2build converter logic." into main am: 2195f24ec4 am: 80a3c08c0c am: 0b02d44081
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744723

Change-Id: Iff9f8244e307f4c0a05a68c860c31f5f935057b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 16:13:55 +00:00
Mark Dacek
5324bcac91 Merge "Change symlink_forest to use relative symlinks." into main am: 4eabebec69
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2674136

Change-Id: I7dd8797e76e53e1277bf752c2bbbf03a448c71ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 16:10:40 +00:00
Mark Dacek
4eabebec69 Merge "Change symlink_forest to use relative symlinks." into main 2023-09-12 15:47:42 +00:00
Liz Kammer
7e36cd8da5 Merge "Sort do not convert for unconverted deps" into main am: 7ebb91a449 am: b6d89afe2d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744700

Change-Id: Ie7dbb1f52aedfede50220a34ee7e631d9366863a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 15:26:08 +00:00
Romain Jobredeaux
0b02d44081 Merge "Re-order android_app bp2build converter logic." into main am: 2195f24ec4 am: 80a3c08c0c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744723

Change-Id: I15b9f9c8674bda690ebb7a86ddbc281d978b415d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 15:25:58 +00:00
Liz Kammer
b6d89afe2d Merge "Sort do not convert for unconverted deps" into main am: 7ebb91a449
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744700

Change-Id: Id2fb4d9070d0880186c1c65c55b106ad26fa005b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 15:22:07 +00:00
Liz Kammer
7ebb91a449 Merge "Sort do not convert for unconverted deps" into main 2023-09-12 14:39:28 +00:00
Romain Jobredeaux
80a3c08c0c Merge "Re-order android_app bp2build converter logic." into main am: 2195f24ec4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744723

Change-Id: I9415e5badd071725187936d3b5f11243e27fbb15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 14:32:34 +00:00
Romain Jobredeaux
2195f24ec4 Merge "Re-order android_app bp2build converter logic." into main 2023-09-12 13:56:00 +00:00
Liz Kammer
f673c2ea9f Sort do not convert for unconverted deps
Test: n/a
Change-Id: Id86986f17d23fe47e47b303a1828478b8e887513
2023-09-12 09:08:17 -04:00
Shikha Panwar
e56c9017c1 Soong support for rollback index.
avbtool already supports --rollback_index. Allow soong support as well
to enable images to include it in their targets.

Test: Builds
Test: avbtool info_image on a target built using rule `avb_add_hash_footer`
Bug: 296830692
Change-Id: Id32f30d026b01172c5dadc0698938acb2c2c8e35
2023-09-12 11:42:29 +00:00
MarkDacek
b98b3a429f Change symlink_forest to use relative symlinks.
Also add script to remove the Bazel output base.
This will assist with supporting movable checkouts alongside
mixed builds.

Bug: 259191764
Test: m && (move topic and prepare_moved_top.sh) && m
Test: m && prepare_moved_top.sh && m
Test: build/soong/tests/relative_symlinks_test.sh

Change-Id: I0f53da8d99f752fad496cf3ac61b01f001b7296d
2023-09-12 04:02:23 +00:00
Treehugger Robot
e35ea9fd3a Merge "Allowlist packages instead of modules" into main am: 0e3da8162c am: 684cdf8a49 am: fcbdddd404
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2747533

Change-Id: I68e70d6ca2552ec2d964b99b494f54171fe427a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 03:56:58 +00:00
Treehugger Robot
b52f4c681c Merge changes from topic "aidl_interface_hdrs" into main am: 7db882793b am: b3b682c911 am: d5c3470d2d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2734380

Change-Id: I081aeaf6c3a8e62ea85ecf3a8717f358fdb99f62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 03:56:38 +00:00
Jooyung Han
8f0939d066 Merge changes from topics "fix-apex-linkerconfig", "fix-apex-vintf" into main am: fc7ba26f1c am: 6fb6ccd5a2 am: c5a20552ea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2745100

Change-Id: I571b29d809000c07be4ced1cab8cc60f103285a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 03:56:16 +00:00
Treehugger Robot
fcbdddd404 Merge "Allowlist packages instead of modules" into main am: 0e3da8162c am: 684cdf8a49
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2747533

Change-Id: I78c8d469213ec530976b9189cc10f443dbc327ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 03:06:42 +00:00
Treehugger Robot
d5c3470d2d Merge changes from topic "aidl_interface_hdrs" into main am: 7db882793b am: b3b682c911
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2734380

Change-Id: I25bcbf8f89cdfe7d8e0e41ab05312e7ac1c4cb6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 03:06:23 +00:00
Jooyung Han
c5a20552ea Merge changes from topics "fix-apex-linkerconfig", "fix-apex-vintf" into main am: fc7ba26f1c am: 6fb6ccd5a2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2745100

Change-Id: I9ac6b120bd3acf22ebf19a31449159d2aa1cd6aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 03:05:46 +00:00
Treehugger Robot
684cdf8a49 Merge "Allowlist packages instead of modules" into main am: 0e3da8162c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2747533

Change-Id: I29f570158b77e6623909c76464f80631236e0b48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 02:14:10 +00:00
Treehugger Robot
b3b682c911 Merge changes from topic "aidl_interface_hdrs" into main am: 7db882793b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2734380

Change-Id: I218ea1e982cce0b07d67d6b5017ffe9417af0246
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 02:13:44 +00:00
Jooyung Han
6fb6ccd5a2 Merge changes from topics "fix-apex-linkerconfig", "fix-apex-vintf" into main am: fc7ba26f1c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2745100

Change-Id: I0459dd6821213d80abce039a4ec417363fac22f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 02:12:53 +00:00
Treehugger Robot
0e3da8162c Merge "Allowlist packages instead of modules" into main 2023-09-12 01:53:49 +00:00
Treehugger Robot
7db882793b Merge changes from topic "aidl_interface_hdrs" into main
* changes:
  export SimpleModuleDoNotConvertBp2build for AIDL
  export SetStubsForDynamicDeps for use in AIDL
2023-09-12 01:52:03 +00:00
Jooyung Han
fc7ba26f1c Merge changes from topics "fix-apex-linkerconfig", "fix-apex-vintf" into main
* changes:
  apex: validate vintf fragments in vendor APEX
  apex: invoke `conv_linker_config validate` as validation
2023-09-12 01:39:07 +00:00