Commit Graph

67777 Commits

Author SHA1 Message Date
Jihoon Kang
a9e89fa323 Merge "Add dep_api_srcs property to java_api_library module" am: 91a86d4112 am: 6f8a62b72a am: 22bd36e459
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2485976

Change-Id: I18de957424949775bfa3a6fec6534d37bb0d4f86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 00:58:19 +00:00
Jiyong Park
9ca0439444 Merge "Assert that platform_sdk_codename is set" am: 7a64621169 am: 04657453e7 am: ebbb91a105
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2505641

Change-Id: I17430affd34b3753289dc3ebcc9e2c1d11f7b81d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 00:55:50 +00:00
Jihoon Kang
22bd36e459 Merge "Add dep_api_srcs property to java_api_library module" am: 91a86d4112 am: 6f8a62b72a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2485976

Change-Id: Ia5b308ba2e6462f9c00ce1331f1cad28bc9e07b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 00:26:04 +00:00
Jiyong Park
ebbb91a105 Merge "Assert that platform_sdk_codename is set" am: 7a64621169 am: 04657453e7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2505641

Change-Id: I40d0e33b7dba5106348fb5a6ba7fa4033803d653
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 00:25:44 +00:00
Treehugger Robot
8f178a6b5c [automerger skipped] Merge changes from topic "fdo_profile" am: 43a2a9a5c6 am: e85290a035 -s ours am: aa8518fad3 -s ours
am skip reason: Merged-In Ia14679285b92f3f14ff269392a61f978c71311b2 with SHA-1 611f036669 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2517917

Change-Id: I5fecf22be51cbac663f5486926c693d72e6b826b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 00:10:38 +00:00
Vinh Tran
b676e3e52f [automerger skipped] Implement fdo_profile module type am: 44cb78c988 am: 23f946553a -s ours am: ceefbc19f2 -s ours
am skip reason: Merged-In I687d798a02d9743c92804fea36fb4ae3a7a0e5e3 with SHA-1 0ccc232691 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2517916

Change-Id: I8c1cc5136f91588cd1d508eba4f4ea1bbfabc161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 00:10:32 +00:00
Jihoon Kang
6f8a62b72a Merge "Add dep_api_srcs property to java_api_library module" am: 91a86d4112
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2485976

Change-Id: I18a81f505a5d1e3ea81627d3b3dee3ef18da0aa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 23:56:11 +00:00
Jiyong Park
04657453e7 Merge "Assert that platform_sdk_codename is set" am: 7a64621169
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2505641

Change-Id: I512e9b14b265ab11199fb016dfc01dc57c402b7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 23:54:58 +00:00
Jihoon Kang
91a86d4112 Merge "Add dep_api_srcs property to java_api_library module" 2023-04-03 23:42:19 +00:00
Treehugger Robot
aa8518fad3 [automerger skipped] Merge changes from topic "fdo_profile" am: 43a2a9a5c6 am: e85290a035 -s ours
am skip reason: Merged-In Ia14679285b92f3f14ff269392a61f978c71311b2 with SHA-1 611f036669 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2517917

Change-Id: Ic2375d2731b5d825867ecd1ac6e688ce4307d523
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 23:38:36 +00:00
Vinh Tran
ceefbc19f2 [automerger skipped] Implement fdo_profile module type am: 44cb78c988 am: 23f946553a -s ours
am skip reason: Merged-In I687d798a02d9743c92804fea36fb4ae3a7a0e5e3 with SHA-1 0ccc232691 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2517916

Change-Id: I37796f24b8da56d26add87c7a1a4286cf95a59a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 23:38:31 +00:00
Jiyong Park
7a64621169 Merge "Assert that platform_sdk_codename is set" 2023-04-03 23:28:58 +00:00
Treehugger Robot
e85290a035 Merge changes from topic "fdo_profile" am: 43a2a9a5c6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2517917

Change-Id: I6b80173900757238510d864344d3dec8a6ecf2e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 23:11:14 +00:00
Vinh Tran
23f946553a Implement fdo_profile module type am: 44cb78c988
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2517916

Change-Id: Iba1313ac84b7fc0f07debc8eda9414b221ce0e20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 23:11:06 +00:00
Treehugger Robot
43a2a9a5c6 Merge changes from topic "fdo_profile"
* changes:
  Reimplement afdo support for rust
  Implement fdo_profile module type
2023-04-03 22:35:25 +00:00
Treehugger Robot
55d539dede Merge "Set OUT_DIR=out with no src_deps." am: d61ea3580d am: 3295e672e2 am: 3bf2755434
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2518975

Change-Id: Id49ce416d6cbb493e990ac6b9401189abd32caf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 22:04:58 +00:00
Liz Kammer
4f2c1d9be1 Merge "Allowlist more of system/timezone" am: 5342482043 am: 17ea43ba7f am: a838260a9d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2511255

Change-Id: Iaed67f59fe88c7c0a73be7d09fa03d27e90d92d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 22:01:28 +00:00
Treehugger Robot
3bf2755434 Merge "Set OUT_DIR=out with no src_deps." am: d61ea3580d am: 3295e672e2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2518975

Change-Id: I4116612ed839ee66098f02ab1b65de0fb4c794dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 21:34:11 +00:00
Liz Kammer
a838260a9d Merge "Allowlist more of system/timezone" am: 5342482043 am: 17ea43ba7f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2511255

Change-Id: I1eb1a501817c26fe4fe8cfedc0d59f84c80f1096
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 21:29:11 +00:00
Treehugger Robot
3295e672e2 Merge "Set OUT_DIR=out with no src_deps." am: d61ea3580d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2518975

Change-Id: Iec20dffdd5b00d2f6d1d2aebca78bce45601f495
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 21:03:23 +00:00
Liz Kammer
17ea43ba7f Merge "Allowlist more of system/timezone" am: 5342482043
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2511255

Change-Id: I6e2c317b54f3455c6da31c3c5236701bd2dbf5e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 21:01:10 +00:00
Treehugger Robot
ee0ae49674 Merge changes Ib9ff4eb5,If27a050c am: 71585a0187 am: 2448d10b58 am: 7190c6776a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2516456

Change-Id: Icfe3bdd0065b2c60233ea6a3b184a9b274d4896f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 20:58:41 +00:00
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
Treehugger Robot
d61ea3580d Merge "Set OUT_DIR=out with no src_deps." 2023-04-03 19:01:58 +00:00
Jihoon Kang
01e522cac5 Add dep_api_srcs property to java_api_library module
Users can pass the jar-file creating module via dep_api_srcs property in
java_api_library to create the jar file not by compiling the stubs
generated from metalava but by extracting and zipping the class files
from the jar file of the input module.

Test: m android-non-updatable.stubs.from-text
Bug: 273381329
Change-Id: Id1b75179111cc7ff45faaff58388db1347bb18e5
2023-04-03 17:53:40 +00:00
Liz Kammer
5342482043 Merge "Allowlist more of system/timezone" 2023-04-03 17:43:17 +00:00
Treehugger Robot
7190c6776a Merge changes Ib9ff4eb5,If27a050c am: 71585a0187 am: 2448d10b58
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2516456

Change-Id: If8f27ecc9eb82fa16b54f038ef248f9e35a5863f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 17:38:45 +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
Treehugger Robot
2448d10b58 Merge changes Ib9ff4eb5,If27a050c am: 71585a0187
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2516456

Change-Id: Ieeba53d45323bde3a481ad7b73127472872828aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 17:11:08 +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
Treehugger Robot
71585a0187 Merge changes Ib9ff4eb5,If27a050c
* changes:
  add *.from-text modules to the java test fixture
  Create a SetBuildFromTextStub method
2023-04-03 16:44:08 +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
Jiyong Park
3a00e3defb Assert that platform_sdk_codename is set
This is already the case for bazel. Soong should do the same.

Bug: 271277773
Test: m nothing
Change-Id: Ibb680801872bd04eade511e1a174cc629af80722
2023-04-03 20:36:40 +09: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
Peter Collingbourne
0dcd62e8a0 Set OUT_DIR=out with no src_deps.
Some Rust crates with no src_deps have generated files checked in in an
"out" subdirectory and included via a reference to $OUT_DIR, such as
external/rust/crates/userfaultfd-sys.

Astonishingly, some people must be leaving $OUT_DIR set to the default
value of "out", because with $OUT_DIR set to this value, building these
crates would presumably succeed. For everyone else, the build fails
when building one of these crates because it will attempt to load from
the wrong directory. Presumably these crates should be using src_deps
instead (and once that's fixed, we should probably *unset* $OUT_DIR in
rustc invocations to prevent the same thing from happening again), but
for now, fix the build with non-default OUT_DIR by explicitly setting
OUT_DIR to "out" if there are no src_deps.

Change-Id: I09f99424fc01a1e42e910622c77ab8f7312819bd
2023-04-01 01:34:19 -07: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