Commit Graph

89050 Commits

Author SHA1 Message Date
Treehugger Robot
1dca77d834 Merge "Add 34.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS" am: c4ebac631b am: 2a87d85bf5 am: e0ec64b4e1 am: 6f126db966 am: 317612844e
Original change: https://android-review.googlesource.com/c/platform/build/+/2636336

Change-Id: I788d7568d2c3bfb38b93650061cf20bc84f0055c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 00:22:24 +00:00
Mårten Kongstad
5294f2bd7c Merge "aconfig: add proto bug field" am: 37cb74b3e4 am: 4a294a65b4 am: 4c30c59324 am: 3f0151dcc7 am: e509ff2c8c
Original change: https://android-review.googlesource.com/c/platform/build/+/2634549

Change-Id: I1463dcb02615817b62158f71a2bd82f08d3d966c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 00:22:07 +00:00
Mitch Phillips
c3de29bc66 Merge "[MTE] [gnu make] Add memtag_globals as a sanitizer target." am: 61ce7afb21 am: 49211348ea am: c6076a3bb6 am: c77b68f30d am: 1a4c6e41b4
Original change: https://android-review.googlesource.com/c/platform/build/+/2625936

Change-Id: Ia11cbe1eece1761c56cc0be946010b374e69be51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 00:19:43 +00:00
Gabriel Biren
a5899138fe Merge "Revert "Add rule to convert WIFI_FEATURE_IMU_DETECTION"" am: 6656e58856 am: dbe8cb7530 am: 3f30113322 am: 26efa8c17e am: 6d297cef98
Original change: https://android-review.googlesource.com/c/platform/build/+/2636149

Change-Id: Iaa1f7021f5bfd09a135990597cf8be3dbed6ff3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 00:17:37 +00:00
Treehugger Robot
dc946e18fc Merge "aconfig: add dump --format=textproto" am: 571cd07796 am: f29ee8722d am: 475043109a am: 40fe34bdc6
Original change: https://android-review.googlesource.com/c/platform/build/+/2637956

Change-Id: I03b67c91f9d5bc6820f65c50b67109063548fde9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 23:44:20 +00:00
Lukács T. Berki
fc00552609 Merge "Change initialization message." am: 9235b7a2b4 am: b2ff7bf25e am: 06b0646b95 am: 860e332c5f
Original change: https://android-review.googlesource.com/c/platform/build/+/2635674

Change-Id: Icc23665525a8ba82ac651ebea09cea96eaa24ffb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 23:39:40 +00:00
Jooyung Han
9c1f422132 Merge "Do not pass TARGET_FLATTEN_APEX to soong" am: bd7ef6bc94 am: 3e75b8234f am: 44abd26c56 am: 0d7864a723 am: 46cbaf2494
Original change: https://android-review.googlesource.com/c/platform/build/+/2632449

Change-Id: I37417dbadc3c6880809954007b934fa892d3fc1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 23:33:17 +00:00
Dan Albert
fd5f1e7596 Trace time spent in cp rules for dist targets.
Bug: http://b/259130368
Test: Used patched soong_trace.py to measure this
Change-Id: Ic85e35ad17b18fb316770cdebc3e01f45edfab44
2023-06-26 23:31:30 +00:00
Dan Albert
617597c0fa Trace build time by module name.
Bug: http://b/259130368
Test: built, manually examined trace file to find module_name
Change-Id: I2a20b60726e884ca82ba3244669d0257e9114222
2023-06-26 23:30:31 +00:00
Xin Li
823af11644 [automerger skipped] Merge "Merge Android 13 QPR3" am: 24c928cda8 -s ours am: 8476205b04 -s ours
am skip reason: Merged-In I33c7269d88483337838d4f4291d8639623633a5a with SHA-1 8fee18a6f3 is already in history

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

Change-Id: Idb9a6e235ba305888af9bb90fceab8eea945916a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 23:12:43 +00:00
Xin Li
5f70b9bf78 [automerger skipped] Merge Android 13 QPR3 am: 7f534ea9b9 -s ours am: 420d124c7f -s ours
am skip reason: Merged-In I33c7269d88483337838d4f4291d8639623633a5a with SHA-1 8fee18a6f3 is already in history

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

Change-Id: I86664b1bbb2d2c52b20f513afe4a41470e2b5081
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 23:10:42 +00:00
Treehugger Robot
317612844e Merge "Add 34.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS" am: c4ebac631b am: 2a87d85bf5 am: e0ec64b4e1 am: 6f126db966
Original change: https://android-review.googlesource.com/c/platform/build/+/2636336

Change-Id: I3ab57b5c44c9040859dea468400a351d79599ca3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 23:06:36 +00:00
Mårten Kongstad
e509ff2c8c Merge "aconfig: add proto bug field" am: 37cb74b3e4 am: 4a294a65b4 am: 4c30c59324 am: 3f0151dcc7
Original change: https://android-review.googlesource.com/c/platform/build/+/2634549

Change-Id: I4d3a102616868a634c369f6a9ab3f2a2dbca0005
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 23:06:20 +00:00
Mitch Phillips
1a4c6e41b4 Merge "[MTE] [gnu make] Add memtag_globals as a sanitizer target." am: 61ce7afb21 am: 49211348ea am: c6076a3bb6 am: c77b68f30d
Original change: https://android-review.googlesource.com/c/platform/build/+/2625936

Change-Id: Ida3b819211cd0d120e9bdf8838003a74b16beab2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 23:05:57 +00:00
Gabriel Biren
6d297cef98 Merge "Revert "Add rule to convert WIFI_FEATURE_IMU_DETECTION"" am: 6656e58856 am: dbe8cb7530 am: 3f30113322 am: 26efa8c17e
Original change: https://android-review.googlesource.com/c/platform/build/+/2636149

Change-Id: I449f8fa091e492d60ec50ba2614c84bd2db00db6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 23:03:56 +00:00
Xin Li
8476205b04 [automerger skipped] Merge "Merge Android 13 QPR3" am: 24c928cda8 -s ours
am skip reason: Merged-In I33c7269d88483337838d4f4291d8639623633a5a with SHA-1 8fee18a6f3 is already in history

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

Change-Id: I7334cc8ce73885f73697257e81c9a422790c3efb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 22:59:59 +00:00
Xin Li
420d124c7f [automerger skipped] Merge Android 13 QPR3 am: 7f534ea9b9 -s ours
am skip reason: Merged-In I33c7269d88483337838d4f4291d8639623633a5a with SHA-1 8fee18a6f3 is already in history

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

Change-Id: Iad2579acf3d13333c33f229f69f613ea40cdb6cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 22:57:57 +00:00
Jooyung Han
46cbaf2494 Merge "Do not pass TARGET_FLATTEN_APEX to soong" am: bd7ef6bc94 am: 3e75b8234f am: 44abd26c56 am: 0d7864a723
Original change: https://android-review.googlesource.com/c/platform/build/+/2632449

Change-Id: I3710b89916b6e93b8ff668aa258dc2b4f0b47a99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 22:48:46 +00:00
Xin Li
24c928cda8 Merge "Merge Android 13 QPR3" 2023-06-26 22:29:55 +00:00
Devin Moore
078bfdfeb4 Pass system_ext and product dirs to libvintf
Now that we have manifest fragements in system_ext, we need to tell
libvintf about them.

Test: lunch aosp_bramble-userdebug && m
Bug: 218588089
Change-Id: Iae56d3b8c790fa1d12321f8c3446a04a0ea816d5
2023-06-26 18:01:03 +00:00
Treehugger Robot
40fe34bdc6 Merge "aconfig: add dump --format=textproto" am: 571cd07796 am: f29ee8722d am: 475043109a
Original change: https://android-review.googlesource.com/c/platform/build/+/2637956

Change-Id: I66a8c11e0e63dc6e206fa975ef6a2f651735f499
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 16:29:21 +00:00
Treehugger Robot
475043109a Merge "aconfig: add dump --format=textproto" am: 571cd07796 am: f29ee8722d
Original change: https://android-review.googlesource.com/c/platform/build/+/2637956

Change-Id: I3248853e0d8715508d07f3896e8437bcf2c63519
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 15:44:16 +00:00
Treehugger Robot
f29ee8722d Merge "aconfig: add dump --format=textproto" am: 571cd07796
Original change: https://android-review.googlesource.com/c/platform/build/+/2637956

Change-Id: Idc6f136fb0b5592ad7662272258ec756fea73dbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 15:03:19 +00:00
Lukács T. Berki
860e332c5f Merge "Change initialization message." am: 9235b7a2b4 am: b2ff7bf25e am: 06b0646b95
Original change: https://android-review.googlesource.com/c/platform/build/+/2635674

Change-Id: I9c52077f5e2a3a2307aa34bf4ec3df373438aeb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 14:15:11 +00:00
Treehugger Robot
6f126db966 Merge "Add 34.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS" am: c4ebac631b am: 2a87d85bf5 am: e0ec64b4e1
Original change: https://android-review.googlesource.com/c/platform/build/+/2636336

Change-Id: I94b0c520cc5d2971f23bb21afe95e2c077433298
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 14:14:46 +00:00
Treehugger Robot
571cd07796 Merge "aconfig: add dump --format=textproto" 2023-06-26 13:59:41 +00:00
Lukács T. Berki
06b0646b95 Merge "Change initialization message." am: 9235b7a2b4 am: b2ff7bf25e
Original change: https://android-review.googlesource.com/c/platform/build/+/2635674

Change-Id: Ica47124275ea284a586d0b02b013c7f7d27ce6b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 13:26:13 +00:00
Treehugger Robot
e0ec64b4e1 Merge "Add 34.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS" am: c4ebac631b am: 2a87d85bf5
Original change: https://android-review.googlesource.com/c/platform/build/+/2636336

Change-Id: I9a29b2d6c0e4a64f84be7bf75345eed85a26a732
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 13:25:49 +00:00
Lukács T. Berki
b2ff7bf25e Merge "Change initialization message." am: 9235b7a2b4
Original change: https://android-review.googlesource.com/c/platform/build/+/2635674

Change-Id: I8ba1178f3ddf30e304c0c5c7907cede559e95124
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 12:45:42 +00:00
Treehugger Robot
2a87d85bf5 Merge "Add 34.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS" am: c4ebac631b
Original change: https://android-review.googlesource.com/c/platform/build/+/2636336

Change-Id: I95bf6c190d0a8373913260c738cbe1af6bd64aa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 12:45:10 +00:00
Lukács T. Berki
9235b7a2b4 Merge "Change initialization message." 2023-06-26 12:08:18 +00:00
Treehugger Robot
c4ebac631b Merge "Add 34.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS" 2023-06-26 12:04:42 +00:00
Mårten Kongstad
3228b29cac aconfig: add dump --format=textproto
Teach `aconfig dump` to print its as text protobuf.

Bug: 288713733
Test: atest aconfig.test aconfig.test.java
Change-Id: Id31ce53226162a563fbe2d4841a8f6cf96c22436
2023-06-26 10:17:42 +02:00
Mårten Kongstad
3f0151dcc7 Merge "aconfig: add proto bug field" am: 37cb74b3e4 am: 4a294a65b4 am: 4c30c59324
Original change: https://android-review.googlesource.com/c/platform/build/+/2634549

Change-Id: Icc1379d0e62cd84f835c0088da8b63502cb1aba3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 08:09:16 +00:00
Mitch Phillips
c77b68f30d Merge "[MTE] [gnu make] Add memtag_globals as a sanitizer target." am: 61ce7afb21 am: 49211348ea am: c6076a3bb6
Original change: https://android-review.googlesource.com/c/platform/build/+/2625936

Change-Id: I3ab9dd553e2d83c5cffbf0744f9c298b1ce766db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 08:08:55 +00:00
Mårten Kongstad
4c30c59324 Merge "aconfig: add proto bug field" am: 37cb74b3e4 am: 4a294a65b4
Original change: https://android-review.googlesource.com/c/platform/build/+/2634549

Change-Id: Ic6b8eb3f55f522b7cc401e26c554c69e353c3854
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 07:19:18 +00:00
Mitch Phillips
c6076a3bb6 Merge "[MTE] [gnu make] Add memtag_globals as a sanitizer target." am: 61ce7afb21 am: 49211348ea
Original change: https://android-review.googlesource.com/c/platform/build/+/2625936

Change-Id: I205582b4e6914f5363b8ef5ef9b588e948794637
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 07:18:58 +00:00
Lukacs T. Berki
3a958ff8a0 Change initialization message.
There are now two newer build systems.

Test: Presubmit.
Change-Id: I9e62e9223ddc757d71f1b404e1cc0a0634b740d4
2023-06-26 07:04:42 +00:00
Mårten Kongstad
4a294a65b4 Merge "aconfig: add proto bug field" am: 37cb74b3e4
Original change: https://android-review.googlesource.com/c/platform/build/+/2634549

Change-Id: I0c846a9c290ab59f1dc3a46e9d519f9a318c5793
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 06:38:33 +00:00
Mitch Phillips
49211348ea Merge "[MTE] [gnu make] Add memtag_globals as a sanitizer target." am: 61ce7afb21
Original change: https://android-review.googlesource.com/c/platform/build/+/2625936

Change-Id: I02a301fb3f60fd35bf63e3d7c7f0eb0451e5a876
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 06:38:11 +00:00
Mårten Kongstad
37cb74b3e4 Merge "aconfig: add proto bug field" 2023-06-26 06:27:48 +00:00
Mitch Phillips
61ce7afb21 Merge "[MTE] [gnu make] Add memtag_globals as a sanitizer target." 2023-06-26 05:50:11 +00:00
Pranav Gupta
ed6219e6db DO NOT MERGE: Enable mainline prebuilts for device targets am: 20545fcf21 am: a047ea2b58 am: 459bc8ccf2
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23770789

Change-Id: I98dcb1437d37838720b6b25864aa97bea7227ba0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-24 17:19:20 +00:00
Pranav Gupta
5379e51548 DO NOT MERGE: Enable mainline prebuilts for device targets am: 20545fcf21 am: a047ea2b58 am: 9506648892
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23770789

Change-Id: I5aa500cd8885075c6a83f5d6011f6c62a8f8241a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-24 17:13:23 +00:00
Pranav Gupta
459bc8ccf2 DO NOT MERGE: Enable mainline prebuilts for device targets am: 20545fcf21 am: a047ea2b58
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23770789

Change-Id: I61335352118772d2abcf5a3e01597a16a9552792
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-24 16:32:40 +00:00
Pranav Gupta
9506648892 DO NOT MERGE: Enable mainline prebuilts for device targets am: 20545fcf21 am: a047ea2b58
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23770789

Change-Id: Iea8919344cf58868cc3d0c6e5270b2c041fec284
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-24 16:28:14 +00:00
Pranav Gupta
e9a48a29c2 DO NOT MERGE: Enable mainline prebuilts for device targets am: 20545fcf21 am: db3e60fecc am: 4e7aeed8ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23770789

Change-Id: I771e41884c5e864cc4467366f34fe0335e228f9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-24 02:54:55 +00:00
Gabriel Biren
26efa8c17e Merge "Revert "Add rule to convert WIFI_FEATURE_IMU_DETECTION"" am: 6656e58856 am: dbe8cb7530 am: 3f30113322
Original change: https://android-review.googlesource.com/c/platform/build/+/2636149

Change-Id: I5e6067027ffa457ac1fae24b2e884854575a89bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 18:30:59 +00:00
Gabriel Biren
3f30113322 Merge "Revert "Add rule to convert WIFI_FEATURE_IMU_DETECTION"" am: 6656e58856 am: dbe8cb7530
Original change: https://android-review.googlesource.com/c/platform/build/+/2636149

Change-Id: Ie28a6a9acf185c0dbe23612a66a6834364409664
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 17:40:22 +00:00
Gabriel Biren
dbe8cb7530 Merge "Revert "Add rule to convert WIFI_FEATURE_IMU_DETECTION"" am: 6656e58856
Original change: https://android-review.googlesource.com/c/platform/build/+/2636149

Change-Id: Ib0bd147c4123216fad664af54ceec95d05edf89d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23 17:00:31 +00:00