Jihoon Kang
3e3b687dcd
Merge "Revert^2 "Add soong config variable Release_expose_flagged_api"" into main am: a65cdd5024
am: 078aa1a5ee
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2768376
Change-Id: I6a101aba8f3351381b73cc7046d292985b436157
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 18:32:50 +00:00
Jihoon Kang
078aa1a5ee
Merge "Revert^2 "Add soong config variable Release_expose_flagged_api"" into main am: a65cdd5024
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2768376
Change-Id: I606e80325d05f52132acf1d940f362649817e141
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 18:02:14 +00:00
Jihoon Kang
a65cdd5024
Merge "Revert^2 "Add soong config variable Release_expose_flagged_api"" into main
2023-10-03 17:55:17 +00:00
Jihoon Kang
00328e40be
Revert^2 "Add soong config variable Release_expose_flagged_api"
...
This reverts commit 453d74ba48
.
Change-Id: Ic5cc83ebe396ccf05b51b8306b79a61dbb689807
2023-10-03 01:02:07 +00:00
Treehugger Robot
4ed24d84ed
Merge "Delete staging directory after creating module package zip" into main am: 517308b890
am: 5a5685a6a9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2767637
Change-Id: I619efebd9c2181489b358d2036fee2dbef939021
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-30 03:09:48 +00:00
Treehugger Robot
5a5685a6a9
Merge "Delete staging directory after creating module package zip" into main am: 517308b890
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2767637
Change-Id: I560705e092b2ee8d0e0a5b5ed6786b9aa307dff8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-30 02:02:18 +00:00
Colin Cross
585967c08a
Delete staging directory after creating module package zip
...
The staging directory isn't used after the module packaging zip is
built. Delete the staging directory to reduce disk usage without
affecting incremental build performance.
Bug: 302573555
Change-Id: I377c60714f78760d0b6c2588935c12e10a9ed224
Test: treehugger
2023-09-30 00:37:38 +00:00
Cole Faust
2dcd7616e6
Merge "Revert^3 "Make the target_files zip reflect the recent partition change"" into main am: 985332eaca
am: 1c1740fab4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2768628
Change-Id: I88c09eef0e9c19d5c98b3c5ad251efc384a57ffb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-29 19:48:48 +00:00
Cole Faust
1c1740fab4
Merge "Revert^3 "Make the target_files zip reflect the recent partition change"" into main am: 985332eaca
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2768628
Change-Id: I739819707a9a5de49224ebd9bcf9b9d7bdc3a838
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-29 18:41:28 +00:00
Cole Faust
985332eaca
Merge "Revert^3 "Make the target_files zip reflect the recent partition change"" into main
2023-09-29 18:09:39 +00:00
Xin Li
c04229bbea
Merge "Merge UP1A.231005.007" into aosp-main-future
2023-09-29 06:40:54 +00:00
Cole Faust
c517d2faf7
Merge "Remove other partition's AVB properties" into main am: 06223362d7
am: dce3a9d66c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2768106
Change-Id: I2000ed49ecf8a97054e4ed6c8425d8f5f6177633
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-29 00:54:17 +00:00
Cole Faust
83fe17e0a4
Revert^3 "Make the target_files zip reflect the recent partition change"
...
This reverts commit cb63de55b7
.
Reason for revert: Still more broken devices
Change-Id: Ic55ba78dd9c2e34dc96549ac8aba65fdbefd379b
2023-09-29 00:22:27 +00:00
Cole Faust
dce3a9d66c
Merge "Remove other partition's AVB properties" into main am: 06223362d7
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2768106
Change-Id: I027f479e7cb807eec39a09dd23c5f37107246c4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-28 23:48:44 +00:00
Cole Faust
13d374ab41
Remove other partition's AVB properties
...
This is to ensure a partition doesn't need to be aware of the other
partitions in order to be built.
Also sort the image info file so it's easier to compare with bazel.
Bug: 297269187
Test: m && emulator on sdk_phone_x86_64-userdebug
Change-Id: I8e4b2049f602c8db109bf53e1359751a9ed9dd7a
2023-09-28 12:04:56 -07:00
Cole Faust
8e6660f733
Merge "Add extra variables to soong.variables" into main am: b78b334041
am: 2b24df300d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2765709
Change-Id: I53ddc0c3d6ed256a4673a4fea2aeaa35bf40c33d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-28 18:28:22 +00:00
Cole Faust
2b24df300d
Merge "Add extra variables to soong.variables" into main am: b78b334041
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2765709
Change-Id: I51944fa8d61be1f2ba4a3ab3732ad77d9103245f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-28 17:23:44 +00:00
Cole Faust
b78b334041
Merge "Add extra variables to soong.variables" into main
2023-09-28 16:38:28 +00:00
Maxim Siniavine
80956a4660
Merge "Revert "Add soong config variable Release_expose_flagged_api"" into main am: 377cf62987
am: 2af9c2423d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2766349
Change-Id: I3637c727b5d4ce10881310df311520461293040d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-28 03:02:10 +00:00
Maxim Siniavine
2af9c2423d
Merge "Revert "Add soong config variable Release_expose_flagged_api"" into main am: 377cf62987
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2766349
Change-Id: Ia1f46a2112240fc26a90a223e903f16bf6ce3ae6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-28 01:55:21 +00:00
Maxim Siniavine
377cf62987
Merge "Revert "Add soong config variable Release_expose_flagged_api"" into main
2023-09-28 01:08:44 +00:00
Maxim Siniavine
453d74ba48
Revert "Add soong config variable Release_expose_flagged_api"
...
Revert submission 2755310
Reason for revert: Broken build b/302407753
Reverted changes: /q/submissionid:2755310
Change-Id: If2b09e6609cdd4c47eea12cb2d877c3874e0560b
2023-09-28 01:02:02 +00:00
Xin Li
5cca3caa48
Merge UP1A.231005.007
...
Bug: 291102124
Merged-In: Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f
Change-Id: I4a0d6dfe3a5b4642f5c4cdf257c84c1634888699
2023-09-27 16:08:15 -07:00
Cole Faust
c874c70f45
Add extra variables to soong.variables
...
Also always use BUILD_NUMBER_FROM_FILE in the BUILD_FINGERPRINT.
The build number file now always exists, even if HAS_BUILD_NUMBER is
false.
Bug: 297269187
Test: m bazel_sandwich
Change-Id: Idf745b600b167e5cec161e07139be09a037bdc13
2023-09-27 13:44:56 -07:00
Rajeev Kumar
1125fdf90c
Merge "Add devicelock to the list of individually toggleable module." into main am: d7965bd12c
am: 77b936b764
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2763932
Change-Id: I9d44d9d28a6b29766c499836bdb382e502b54da4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-27 19:50:28 +00:00
Jihoon Kang
7ca3a3b2ea
Merge "Add soong config variable Release_expose_flagged_api" into main am: 19cd806de1
am: 3163daa603
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2763272
Change-Id: Ib8380984c004bd2847c3eed24b20e6bb1f09c846
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-27 19:47:53 +00:00
Rajeev Kumar
77b936b764
Merge "Add devicelock to the list of individually toggleable module." into main am: d7965bd12c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2763932
Change-Id: If8e176fbff2d58c3b94f9a09fb57b18446fc36d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-27 19:45:19 +00:00
Rajeev Kumar
d7965bd12c
Merge "Add devicelock to the list of individually toggleable module." into main
2023-09-27 19:06:11 +00:00
Jihoon Kang
3163daa603
Merge "Add soong config variable Release_expose_flagged_api" into main am: 19cd806de1
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2763272
Change-Id: I1054493df1c337790d479531cb8d103ac917577f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-27 17:52:34 +00:00
Rajeev Kumar
e71b6333c4
Add devicelock to the list of individually toggleable module.
...
Bug: 300099037
Test: Builds successfully
Change-Id: I4231021982819cf227f3f1298c376635e160ab72
2023-09-26 20:16:57 -07:00
Treehugger Robot
6311f5a3a5
Merge "Remove architecture name from names of HOST_*.mk files." into main am: 1741facdbf
am: cd4c262258
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2694564
Change-Id: I7102a14dca424d2f0cb3f4113765db3bed3bf101
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 23:34:02 +00:00
Treehugger Robot
cd4c262258
Merge "Remove architecture name from names of HOST_*.mk files." into main am: 1741facdbf
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2694564
Change-Id: I588d140258ed188b1393aa4fa5180629a8b74358
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 22:38:01 +00:00
Jihoon Kang
ccebab160e
Add soong config variable Release_expose_flagged_api
...
The variable is a release config variable which will be used to
determine whether if the api marked @FlaggedApi is exposed or not.
Test: m nothing
Bug: 299570421
Change-Id: Iad902b5ceb2e6d6e9f8fc3b81d54ce3d1896f9eb
2023-09-26 22:32:37 +00:00
Treehugger Robot
1741facdbf
Merge "Remove architecture name from names of HOST_*.mk files." into main
2023-09-26 21:15:42 +00:00
Jihoon Kang
5d2cf49036
Merge "Add PRODUCT_NEXT_RELEASE_HID_FLAGGED_API for sdk targets" into main am: 596d514744
am: 452241468c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2756249
Change-Id: Ifd9cac6afb96aae06489e881ce8e14dc3b7ec414
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 19:19:18 +00:00
Jihoon Kang
452241468c
Merge "Add PRODUCT_NEXT_RELEASE_HID_FLAGGED_API for sdk targets" into main am: 596d514744
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2756249
Change-Id: I1ca8eeb8b673300129ac45cba722f8d97cbfcf17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 18:20:33 +00:00
Jihoon Kang
596d514744
Merge "Add PRODUCT_NEXT_RELEASE_HID_FLAGGED_API for sdk targets" into main
2023-09-26 17:49:25 +00:00
Jiyong Park
73e96ba97a
Merge "Export BINDER_DEATH_RECIPIENT_WEAK_FROM_JNI to soong" into main am: 343fabb483
am: a0d2642141
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2759039
Change-Id: I26b39d20e6c7fdc36d091bc0551fb85e8e88ce6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 14:18:07 +00:00
Jiyong Park
a0d2642141
Merge "Export BINDER_DEATH_RECIPIENT_WEAK_FROM_JNI to soong" into main am: 343fabb483
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2759039
Change-Id: I14b2daadbf7b0b3f4bd6a1ee7c8bbc44eb8235a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 13:15:00 +00:00
Jiyong Park
343fabb483
Merge "Export BINDER_DEATH_RECIPIENT_WEAK_FROM_JNI to soong" into main
2023-09-26 12:02:49 +00:00
Kiyoung Kim
7cb1d764e9
Merge "Do not compare KEEP_VNDK with false" into main am: 65aa4c8429
am: 230d729bec
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2759034
Change-Id: If02c45e01cab1d810642447655d8d9d1d1f1eda7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 07:49:15 +00:00
Kiyoung Kim
230d729bec
Merge "Do not compare KEEP_VNDK with false" into main am: 65aa4c8429
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2759034
Change-Id: I1ca24eec0a4d6544d5e65a6d4c2f38bf6e483adf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-26 06:49:47 +00:00
Kiyoung Kim
65aa4c8429
Merge "Do not compare KEEP_VNDK with false" into main
2023-09-26 06:08:05 +00:00
Cole Faust
c8d832ea98
Merge "Revert^2 "Make the target_files zip reflect the recent partition change"" into main am: 00bf14b0f3
am: a2cd1601df
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2758437
Change-Id: I9b9e62c073286cd3499dd9471c7491485a773efd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 22:48:06 +00:00
Cole Faust
a2cd1601df
Merge "Revert^2 "Make the target_files zip reflect the recent partition change"" into main am: 00bf14b0f3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2758437
Change-Id: Icd045c1f6a439be7d31c07cf13a62e1a1a3f511a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 21:49:58 +00:00
Cole Faust
00bf14b0f3
Merge "Revert^2 "Make the target_files zip reflect the recent partition change"" into main
2023-09-25 21:07:57 +00:00
Cole Faust
cb63de55b7
Revert^2 "Make the target_files zip reflect the recent partition change"
...
This reverts commit 612b362ca3
.
Reason for revert: Excluding the failing product in ag/24856527
Change-Id: I28664302a7fd98ce9bd88e6ce9679b53846b1859
2023-09-25 19:41:25 +00:00
Cole Faust
2ed335ad17
Merge "Add partition-related variables to soong_config.mk" into main am: 252e5a39fe
am: 0e107dc3dd
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2758047
Change-Id: Id531962e18408214891d58743ad3845e814421d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 19:08:58 +00:00
Cole Faust
0e107dc3dd
Merge "Add partition-related variables to soong_config.mk" into main am: 252e5a39fe
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2758047
Change-Id: I54361f5122d4d2bcbe9d678cbdefd7d60949c66c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 18:09:20 +00:00
Cole Faust
252e5a39fe
Merge "Add partition-related variables to soong_config.mk" into main
2023-09-25 17:08:34 +00:00