Commit Graph

91771 Commits

Author SHA1 Message Date
Maxim Siniavine
e85380ebc0 Merge "Revert "Add soong config variable Release_expose_flagged_api"" into main am: 377cf62987 am: 2af9c2423d am: 80956a4660 am: 06b5e27fae
Original change: https://android-review.googlesource.com/c/platform/build/+/2766349

Change-Id: Icf2dcfd46a137f9a3322c554d1af08b7be2e2b67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-28 04:49:29 +00:00
Maxim Siniavine
06b5e27fae Merge "Revert "Add soong config variable Release_expose_flagged_api"" into main am: 377cf62987 am: 2af9c2423d am: 80956a4660
Original change: https://android-review.googlesource.com/c/platform/build/+/2766349

Change-Id: Ic8803a9236e6df718ec6ba17573cfff63b953442
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-28 04:03:31 +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
Rajeev Kumar
38cd5c6794 Merge "Add devicelock to the list of individually toggleable module." into main am: d7965bd12c am: 77b936b764 am: 1125fdf90c am: 0ca3c372c8
Original change: https://android-review.googlesource.com/c/platform/build/+/2763932

Change-Id: I5ed23843738f835ff0d2d09bb45797160db40815
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 21:39:30 +00:00
Treehugger Robot
ded71658dd Merge "Prevent VABC from being disabled on release-key builds" into main am: ad7f4666a6 am: fc35a79c49 am: e1cc074017 am: aa666facfe
Original change: https://android-review.googlesource.com/c/platform/build/+/2764967

Change-Id: Ibaf55aabb43424af10f44a3ddd267d4e7e389574
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 21:38:27 +00:00
Jihoon Kang
250dd55194 Merge "Add soong config variable Release_expose_flagged_api" into main am: 19cd806de1 am: 3163daa603 am: 7ca3a3b2ea am: 8050a67147
Original change: https://android-review.googlesource.com/c/platform/build/+/2763272

Change-Id: I3cfb34a117fae63f3ff53551d888952b9c00bae4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 21:36:47 +00:00
Treehugger Robot
628d0fcc7b Merge "Fix custom image OTA generation with extracted target files" into main am: aad75f8f1b am: 2edf1903d8 am: d868a8471a am: b6c52581c0
Original change: https://android-review.googlesource.com/c/platform/build/+/2762658

Change-Id: I8c3b0263d49b7da668cd81607e222afdff4d75b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 21:36:02 +00:00
Rajeev Kumar
0ca3c372c8 Merge "Add devicelock to the list of individually toggleable module." into main am: d7965bd12c am: 77b936b764 am: 1125fdf90c
Original change: https://android-review.googlesource.com/c/platform/build/+/2763932

Change-Id: Ib7b5e6c6f217df4818e8f9b798773e2e5c018b85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 20:52:27 +00:00
Treehugger Robot
aa666facfe Merge "Prevent VABC from being disabled on release-key builds" into main am: ad7f4666a6 am: fc35a79c49 am: e1cc074017
Original change: https://android-review.googlesource.com/c/platform/build/+/2764967

Change-Id: I09d6a7e41c56b8a609a6ffc01cf470a816ac5a6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 20:52:05 +00:00
Jihoon Kang
8050a67147 Merge "Add soong config variable Release_expose_flagged_api" into main am: 19cd806de1 am: 3163daa603 am: 7ca3a3b2ea
Original change: https://android-review.googlesource.com/c/platform/build/+/2763272

Change-Id: I54fad33aada76dc68022c37dfd0bd7216fcbd30e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 20:50:16 +00:00
Treehugger Robot
b6c52581c0 Merge "Fix custom image OTA generation with extracted target files" into main am: aad75f8f1b am: 2edf1903d8 am: d868a8471a
Original change: https://android-review.googlesource.com/c/platform/build/+/2762658

Change-Id: I2fe03fe505df8ed46dc7d91e525db50eee36b08d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 20:49:50 +00: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
Treehugger Robot
e1cc074017 Merge "Prevent VABC from being disabled on release-key builds" into main am: ad7f4666a6 am: fc35a79c49
Original change: https://android-review.googlesource.com/c/platform/build/+/2764967

Change-Id: If5d7afdfbb9e058c13d1c117be1f9bf3fb8f3f3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 19:49:19 +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
Treehugger Robot
d868a8471a Merge "Fix custom image OTA generation with extracted target files" into main am: aad75f8f1b am: 2edf1903d8
Original change: https://android-review.googlesource.com/c/platform/build/+/2762658

Change-Id: Ic36ad264e760d6855d717abca741f1d222c119be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 19:47:32 +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
Treehugger Robot
fc35a79c49 Merge "Prevent VABC from being disabled on release-key builds" into main am: ad7f4666a6
Original change: https://android-review.googlesource.com/c/platform/build/+/2764967

Change-Id: Ia3364f47e6b16ada034af53dc102e8fa3b11c949
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 19:43:49 +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
Treehugger Robot
ad7f4666a6 Merge "Prevent VABC from being disabled on release-key builds" into main 2023-09-27 18:33:10 +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
Treehugger Robot
2edf1903d8 Merge "Fix custom image OTA generation with extracted target files" into main am: aad75f8f1b
Original change: https://android-review.googlesource.com/c/platform/build/+/2762658

Change-Id: I4db20eca539ab5e79c787444a9bf8d42bc61ac81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 17:50:25 +00:00
Mårten Kongstad
50491ebbbe Merge changes from topic "printflags-include-device-config" into main am: dd1ebe9300 am: 286ea9f8a8 am: 8bc2be2b5c am: 6f3642b88f
Original change: https://android-review.googlesource.com/c/platform/build/+/2763270

Change-Id: I08f9cc79a4b1dc4baa3a40de1eb3409bf8cac80c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 17:39:02 +00:00
Jihoon Kang
19cd806de1 Merge "Add soong config variable Release_expose_flagged_api" into main 2023-09-27 17:09:27 +00:00
Treehugger Robot
aad75f8f1b Merge "Fix custom image OTA generation with extracted target files" into main 2023-09-27 16:56:17 +00:00
Kelvin Zhang
2f9a9ae64b Prevent VABC from being disabled on release-key builds
VABC is mandated now, and plain VAB will be unsupported later.

Test: th
Change-Id: Iad19433c06b25246d4f7bffe5599035836e36076
2023-09-27 09:35:21 -07:00
Mårten Kongstad
6f3642b88f Merge changes from topic "printflags-include-device-config" into main am: dd1ebe9300 am: 286ea9f8a8 am: 8bc2be2b5c
Original change: https://android-review.googlesource.com/c/platform/build/+/2763270

Change-Id: Ib2c0f1c2ef4f5272b033089da09f9ce07faf6e19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 16:29:59 +00:00
Mårten Kongstad
8bc2be2b5c Merge changes from topic "printflags-include-device-config" into main am: dd1ebe9300 am: 286ea9f8a8
Original change: https://android-review.googlesource.com/c/platform/build/+/2763270

Change-Id: I1e9507028f029f29bb96a1ff5bf087fdc5ea3ee4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 15:28:25 +00:00
Mårten Kongstad
286ea9f8a8 Merge changes from topic "printflags-include-device-config" into main am: dd1ebe9300
Original change: https://android-review.googlesource.com/c/platform/build/+/2763270

Change-Id: I477c1da7dd79b0156819b748d1b2ac3a39dfe84b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 14:22:07 +00:00
Mårten Kongstad
dd1ebe9300 Merge changes from topic "printflags-include-device-config" into main
* changes:
  printflags: add printflags to PRODUCT_PACKAGES
  printflags: include device_config values
2023-09-27 13:04:40 +00:00
Mårten Kongstad
583a52478b printflags: add printflags to PRODUCT_PACKAGES
Include the printflags device tool in the system image by default.

Bug: 301547297
Test: adb shell printflags
Change-Id: I3b2d71c89742bd389f6cafff8d8ab25fb81c7b00
2023-09-27 10:42:04 +02:00
Mårten Kongstad
3bb7988492 printflags: include device_config values
Amend the default flag values read from
/<partition>/etc/aconfig_flags.pb with the currently used values as
stored in device_config.

Bug: 301547297
Test: atest printflags.test
Test: adb shell printflags
Change-Id: Ic11702a0ae093d2e9dc3ff543b5ca0684b67e0dc
2023-09-27 10:42:04 +02:00
Justin Yun
cd7c0300b5 Remove PRODUCT_PRODUCT_VNDK_VERSION from soong_config
We can remove PRODUCT_PRODUCT_VNDK_VERSION safely as soong does not
read it.

Bug: 302255959
Test: m
Change-Id: I1d4080b8e6f8b04c0c1333bcd9bf055d329fdd71
2023-09-27 16:38:13 +09: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
197191ebd4 Merge "Remove architecture name from names of HOST_*.mk files." into main am: 1741facdbf am: cd4c262258 am: 6311f5a3a5 am: 823bd5dbd7
Original change: https://android-review.googlesource.com/c/platform/build/+/2694564

Change-Id: Ife50cfeb0bcbc70b1468211c87599c90cff46042
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 01:07:06 +00:00
Treehugger Robot
823bd5dbd7 Merge "Remove architecture name from names of HOST_*.mk files." into main am: 1741facdbf am: cd4c262258 am: 6311f5a3a5
Original change: https://android-review.googlesource.com/c/platform/build/+/2694564

Change-Id: Ib2a8f2b3a5015cc99b9ef00682a134fe60a669eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-27 00:25:11 +00: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
Kelvin Zhang
0fda62973b Fix custom image OTA generation with extracted target files
Bug: 301909132
Test: ota_from_target_files --custom_image vendor=vendor.img
target_files.zip ota.zip

Change-Id: I9db6e21d47174670e23f461b6107068cbfa35d0f
2023-09-26 16:08:17 -07: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
Jihoon Kang
1ddc046b62 Merge "Add PRODUCT_NEXT_RELEASE_HID_FLAGGED_API for sdk targets" into main am: 596d514744 am: 452241468c am: 5d2cf49036 am: 462f1cba6b
Original change: https://android-review.googlesource.com/c/platform/build/+/2756249

Change-Id: Iee9fe45de38bba4dde3dd054584ff844545d8ed4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 21:24:10 +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
462f1cba6b Merge "Add PRODUCT_NEXT_RELEASE_HID_FLAGGED_API for sdk targets" into main am: 596d514744 am: 452241468c am: 5d2cf49036
Original change: https://android-review.googlesource.com/c/platform/build/+/2756249

Change-Id: I2e1ed1a224d85c5238887eb73cee0a820e1a3b1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 20:40:59 +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