Spandan Das
01d5dd882c
Merge "Rename core stubs to .txt stubs if applicable" am: 77e3278c50
am: ac7b7d2a89
am: 83f7ac9d8d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2514796
Change-Id: I13629ee9000f208c25ad53fe478bdd61b6be0823
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 20:57:43 +00:00
Spandan Das
83f7ac9d8d
Merge "Rename core stubs to .txt stubs if applicable" am: 77e3278c50
am: ac7b7d2a89
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2514796
Change-Id: I40690db4a0672546c4ec3918c3932d8b5364f75e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 17:38:31 +00:00
Spandan Das
ac7b7d2a89
Merge "Rename core stubs to .txt stubs if applicable" am: 77e3278c50
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2514796
Change-Id: Ia51784b2371933e8531d3f6e02e0d6a27a7bda21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 17:10:07 +00:00
Spandan Das
77e3278c50
Merge "Rename core stubs to .txt stubs if applicable"
2023-04-03 16:37:53 +00:00
Alix Espino
8c7fd7c0da
Merge "Simplify logic in Soong ApiLevelFromUserWithConfig" am: 2173e6545a
am: 0e5c5598aa
am: 46214cca30
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2509779
Change-Id: I45d3f130196a3162e8bcf084489fcced7a08bfed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 15:08:39 +00:00
Alix Espino
46214cca30
Merge "Simplify logic in Soong ApiLevelFromUserWithConfig" am: 2173e6545a
am: 0e5c5598aa
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2509779
Change-Id: Ib404917275df195b9aa6fbdea8cfef386b880b22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 14:38:24 +00:00
Alix Espino
0e5c5598aa
Merge "Simplify logic in Soong ApiLevelFromUserWithConfig" am: 2173e6545a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2509779
Change-Id: Ia66beba64d45559d643e3e0d95a41b90096a8321
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 14:08:25 +00:00
Alix Espino
2173e6545a
Merge "Simplify logic in Soong ApiLevelFromUserWithConfig"
2023-04-03 13:41:02 +00:00
Treehugger Robot
99fc0f1a2b
Merge "Remove stub-annotations from art stubs system modules" am: 1c102d34b7
am: 5485148807
am: da56dee349
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2515531
Change-Id: I59aebc304bf7571fdc896f86bc85a0fdbcf26791
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 12:23:00 +00:00
Treehugger Robot
da56dee349
Merge "Remove stub-annotations from art stubs system modules" am: 1c102d34b7
am: 5485148807
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2515531
Change-Id: I3ab8e00e2f2db7021648ed07bc9d1f72dfc8e1a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 11:52:23 +00:00
Treehugger Robot
5485148807
Merge "Remove stub-annotations from art stubs system modules" am: 1c102d34b7
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2515531
Change-Id: I18714e495c91f0fbabc7aac909fbaa8656a22380
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 11:22:59 +00:00
Treehugger Robot
1c102d34b7
Merge "Remove stub-annotations from art stubs system modules"
2023-04-03 10:49:15 +00:00
Rebecca Chyung
7532bf0c00
Merge "Revert "Fix NDK library sysroot arrangement."" am: 20d1290cfa
am: 81aa6bdb90
am: 4dcde51f55
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2519695
Change-Id: Ib46af04ecff022a41b9ae8623f9b99e2f2fb542c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 07:37:56 +00:00
Rebecca Chyung
4dcde51f55
Merge "Revert "Fix NDK library sysroot arrangement."" am: 20d1290cfa
am: 81aa6bdb90
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2519695
Change-Id: I7bf8c938b8661db54525ca52bd487761dcb44dc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 07:07:12 +00:00
Rebecca Chyung
81aa6bdb90
Merge "Revert "Fix NDK library sysroot arrangement."" am: 20d1290cfa
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2519695
Change-Id: Ia577d10a077bcc20f4855ad219563041816ceb38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-03 06:37:44 +00:00
Rebecca Chyung
20d1290cfa
Merge "Revert "Fix NDK library sysroot arrangement.""
2023-04-03 06:08:42 +00:00
Rebecca Chyung
961cf1cf9c
Revert "Fix NDK library sysroot arrangement."
...
This reverts commit 169256f535
.
Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/build-details/9868109/targets/mokey-userdebug , bug b/276513771
Change-Id: Iea77994cd4ff0f61a8fa72e52cd1b601bc7cc1a0
2023-04-03 06:06:58 +00:00
Treehugger Robot
42545edfe2
Merge "Fix rust snapshotInfo provider bug" am: 553d89a825
am: 073e939604
am: af9434424a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2516919
Change-Id: I32eaff4799ae7681e5e3f063fe10141d1432bd2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-01 08:02:36 +00:00
Treehugger Robot
af9434424a
Merge "Fix rust snapshotInfo provider bug" am: 553d89a825
am: 073e939604
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2516919
Change-Id: Id79460e2cf4ff396cc3f9c90f73b8ea2ef0b2f20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-01 07:31:24 +00:00
Treehugger Robot
073e939604
Merge "Fix rust snapshotInfo provider bug" am: 553d89a825
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2516919
Change-Id: I8d1c35eabe99b6fe030f894845e3f7ff9d660057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-01 07:02:49 +00:00
Treehugger Robot
553d89a825
Merge "Fix rust snapshotInfo provider bug"
2023-04-01 06:41:25 +00:00
Treehugger Robot
5223987def
Merge "Add spdx-tools and licenseclassifier to soong mocks" am: 88c8d207ca
am: 3ec1c4afb6
am: 85fd7a274e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2516997
Change-Id: I47fcae9515e545119320b300b4b97e9e9652c422
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 23:24:59 +00:00
Treehugger Robot
85fd7a274e
Merge "Add spdx-tools and licenseclassifier to soong mocks" am: 88c8d207ca
am: 3ec1c4afb6
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2516997
Change-Id: Id4d32c29f498a81928d320263a316e8dddd033c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 22:30:30 +00:00
Treehugger Robot
3ec1c4afb6
Merge "Add spdx-tools and licenseclassifier to soong mocks" am: 88c8d207ca
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2516997
Change-Id: I82b616c851bd3e1368fdbadb0f0942c8df7589a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 21:55:53 +00:00
Treehugger Robot
88c8d207ca
Merge "Add spdx-tools and licenseclassifier to soong mocks"
2023-03-31 21:25:37 +00:00
Treehugger Robot
196382c13e
Merge changes Ie9d465f5,Idd89d656,I0a13a0e7 am: cdbb1a999f
am: 09a2632958
am: 5a512834bf
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2513924
Change-Id: Ibecb97ca51c3417413d2eaced72ff41b17f0b5f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 20:36:43 +00:00
Peter Collingbourne
118b91d716
Merge "cuttlefish: Stop building the CVD host package tarball by default." am: bc03688e7c
am: ec7692848e
am: 7ed6e09075
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2493076
Change-Id: Ife1d1cc2173fbb7d304f68b26a05909da36cc2f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 20:36:06 +00:00
Dan Albert
c37acf6301
Merge "Fix NDK library sysroot arrangement." am: dfe24db34f
am: ab431f14c7
am: b08cb5967f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2516116
Change-Id: If08259fd2474d6381d6f175ac71681635e6c1e6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 20:31:31 +00:00
Treehugger Robot
5a512834bf
Merge changes Ie9d465f5,Idd89d656,I0a13a0e7 am: cdbb1a999f
am: 09a2632958
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2513924
Change-Id: I913ad013d9e6c5fa7014e1958c5c6a2c312ca5e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 20:24:41 +00:00
TreeHugger Robot
bb1566991b
Merge changes from topic "fdo_profile" into tm-qpr-dev-plus-aosp am: dfa331524c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/22298584
Change-Id: Idc3faaab80174688c12432316ddf8fefd471ee87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 20:21:05 +00:00
Vinh Tran
29a840a6f7
Implement fdo_profile module type am: 0ccc232691
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/22245858
Change-Id: I6e8cb1824b9e9f7b52c8f15c1a902e32da6f572b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 20:20:50 +00:00
Peter Collingbourne
7ed6e09075
Merge "cuttlefish: Stop building the CVD host package tarball by default." am: bc03688e7c
am: ec7692848e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2493076
Change-Id: I2c4a8408e1956ed34a0574c9f265ca09d362eede
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 20:10:47 +00:00
Treehugger Robot
f5b59e98d4
Merge "rename aidl/library.bzl to aidl/aidl_library.bzl" am: 840d49a564
am: 0110b797e8
am: 2caef94970
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2515436
Change-Id: Ibe1ef9d638b20f38753b767d24674bc97b6c337d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 20:10:39 +00:00
Treehugger Robot
09a2632958
Merge changes Ie9d465f5,Idd89d656,I0a13a0e7 am: cdbb1a999f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2513924
Change-Id: Iab38550e6f6c0ca4ae1fdc57e7e36bd40c3bc082
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 20:03:05 +00:00
Peter Collingbourne
ec7692848e
Merge "cuttlefish: Stop building the CVD host package tarball by default." am: bc03688e7c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2493076
Change-Id: I9e122775c4f7ca6fa306aeac397c07629e329afc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 20:02:15 +00:00
Dan Albert
b08cb5967f
Merge "Fix NDK library sysroot arrangement." am: dfe24db34f
am: ab431f14c7
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2516116
Change-Id: I225a82f2f9d0b9ae0422c492e5c2c004c03b9b62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 19:57:08 +00:00
Dan Albert
ab431f14c7
Merge "Fix NDK library sysroot arrangement." am: dfe24db34f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2516116
Change-Id: Ia7107e8e8cd27b7ad01e9f142fc751248c8a2fc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 19:56:25 +00:00
TreeHugger Robot
dfa331524c
Merge changes from topic "fdo_profile" into tm-qpr-dev-plus-aosp
...
* changes:
Reimplement afdo support for rust
Implement fdo_profile module type
2023-03-31 19:48:47 +00:00
Treehugger Robot
2caef94970
Merge "rename aidl/library.bzl to aidl/aidl_library.bzl" am: 840d49a564
am: 0110b797e8
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2515436
Change-Id: Iedba879630a79ef8559bb24c9392bc28846305c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 19:48:14 +00:00
Treehugger Robot
cdbb1a999f
Merge changes Ie9d465f5,Idd89d656,I0a13a0e7
...
* changes:
Create core_platform system modules from .txt files
Create system modules using .txt stubs
Create a defaults module for stripping out annotations
2023-03-31 19:37:01 +00:00
Spandan Das
a335e1de36
Remove stub-annotations from art stubs system modules
...
This system module is used to compile conscrypt and icu stubs. These
have migrated to java_sdk_library that set `annotations_enabled: true`
explicitly.
Test: m
Test: TH
Change-Id: I65ceb1fbf0dcdbb3504b69ebce6ca8f0b67e964d
2023-03-31 19:28:55 +00:00
Treehugger Robot
0110b797e8
Merge "rename aidl/library.bzl to aidl/aidl_library.bzl" am: 840d49a564
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2515436
Change-Id: Ib6f8a3783f82fb461e4034c5285851a7d9653dad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 19:18:09 +00:00
Peter Collingbourne
bc03688e7c
Merge "cuttlefish: Stop building the CVD host package tarball by default."
2023-03-31 19:09:32 +00:00
Dan Albert
dfe24db34f
Merge "Fix NDK library sysroot arrangement."
2023-03-31 18:54:46 +00:00
Treehugger Robot
840d49a564
Merge "rename aidl/library.bzl to aidl/aidl_library.bzl"
2023-03-31 18:26:33 +00:00
Ibrahim Kanouche
7c1de51d9e
Add spdx-tools and licenseclassifier to soong mocks
...
Change-Id: I8d394fe1f0633f433b76f66929294e6537e1f809
2023-03-31 17:19:29 +00:00
Treehugger Robot
bed1d1cb11
Merge changes I1ed3ab24,I68678ddf am: 2d704998f4
am: 9b9cda6b14
am: b05664f90c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2513937
Change-Id: Ibc9e5b8bea86717c670ff8d22bb8bf9a814a9c23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 17:08:05 +00:00
Sam Delmerico
aeabcb7869
Merge "improve error handling for SourceRootDirs" am: b72610665c
am: dad03f387c
am: e0033ac012
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2516015
Change-Id: Icfaf13bc59e3ac50a57f7c5e68fe6d4fe565b29d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 17:06:37 +00:00
Treehugger Robot
b05664f90c
Merge changes I1ed3ab24,I68678ddf am: 2d704998f4
am: 9b9cda6b14
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2513937
Change-Id: I15a0015fa6465708436254fde8efa6ed05446359
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 15:53:06 +00:00
Sam Delmerico
e0033ac012
Merge "improve error handling for SourceRootDirs" am: b72610665c
am: dad03f387c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2516015
Change-Id: Ic7fdeefd50a9e482b12a65d7ba78d2cd03a032c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 15:52:49 +00:00