Dan Albert
ae2e7cf645
Merge changes from topic "module-rule-tracing" am: ef530fdf9a
am: d3bcae7208
am: 9530bfba04
am: 65e23a90b3
am: 760ae18831
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2617860
Change-Id: Iab9aea34736316a4e7dfb921b80bbd0e2ffbba70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 01:31:37 +00:00
Dan Albert
760ae18831
Merge changes from topic "module-rule-tracing" am: ef530fdf9a
am: d3bcae7208
am: 9530bfba04
am: 65e23a90b3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2617860
Change-Id: I77b729384f42ec2fe61c94c1516b3b14a3c531cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 00:44:48 +00:00
Dan Albert
65e23a90b3
Merge changes from topic "module-rule-tracing" am: ef530fdf9a
am: d3bcae7208
am: 9530bfba04
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2617860
Change-Id: I09fc357de938231dba15afe4eef3a8be5d1ab681
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-27 23:37:11 +00:00
Dan Albert
9530bfba04
Merge changes from topic "module-rule-tracing" am: ef530fdf9a
am: d3bcae7208
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2617860
Change-Id: Ie0f3c87a52d06210d7277a969ed48e3be7db9545
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-27 22:53:59 +00:00
Dan Albert
d3bcae7208
Merge changes from topic "module-rule-tracing" am: ef530fdf9a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2617860
Change-Id: I2668f18a1b4a61574afb3e8dc518bfb87c19c34e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-27 22:11:39 +00:00
Dan Albert
ef530fdf9a
Merge changes from topic "module-rule-tracing"
...
* changes:
Trace time spent in cp rules for dist targets.
Trace build time by module name.
2023-06-27 21:19:46 +00:00
Daniel Zheng
d1826996d7
Merge "Adding recovery image" am: e86aa7b965
am: abecf30a5c
am: 9ef45d62c5
am: 5d636ea855
am: 9b84a1c0a0
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2636171
Change-Id: Ic937c91883a6d78d2d07cbe4a9732350a24b6b0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-27 19:58:58 +00:00
Devin Moore
2cb20dc050
Merge "Pass system_ext and product dirs to libvintf" am: 8c9a990807
am: c704aef70c
am: bdf1d2ca5c
am: 9a1f6292ce
am: 4cf8e8f5fb
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2611512
Change-Id: I57906891f221480d41e44ddecb3d0ae5a77415c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-27 19:56:18 +00:00
Daniel Zheng
9b84a1c0a0
Merge "Adding recovery image" am: e86aa7b965
am: abecf30a5c
am: 9ef45d62c5
am: 5d636ea855
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2636171
Change-Id: I7404b78aaab37bcea23632a52f09538fa354ed23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-27 18:50:05 +00:00
Devin Moore
4cf8e8f5fb
Merge "Pass system_ext and product dirs to libvintf" am: 8c9a990807
am: c704aef70c
am: bdf1d2ca5c
am: 9a1f6292ce
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2611512
Change-Id: I799871e37d6b73266cbe825420435d664bbd03b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-27 18:49:05 +00:00
Daniel Zheng
5d636ea855
Merge "Adding recovery image" am: e86aa7b965
am: abecf30a5c
am: 9ef45d62c5
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2636171
Change-Id: I428816bfc12162fc3008f062efb0323f6e5b8ad5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-27 18:05:05 +00:00
Devin Moore
9a1f6292ce
Merge "Pass system_ext and product dirs to libvintf" am: 8c9a990807
am: c704aef70c
am: bdf1d2ca5c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2611512
Change-Id: Ic57aa84d0f5ca0d5fb470133d03c0b1b07a3e807
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-27 18:04:06 +00:00
Daniel Zheng
9ef45d62c5
Merge "Adding recovery image" am: e86aa7b965
am: abecf30a5c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2636171
Change-Id: I7970e845e7f062e970ab9e2c5f18b2ec3f93b6f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-27 17:15:11 +00:00
Devin Moore
bdf1d2ca5c
Merge "Pass system_ext and product dirs to libvintf" am: 8c9a990807
am: c704aef70c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2611512
Change-Id: I95fd70c1c30bb6a84a60a21f01635b8a28f6afd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-27 17:14:24 +00:00
Daniel Zheng
abecf30a5c
Merge "Adding recovery image" am: e86aa7b965
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2636171
Change-Id: I615f88d5e7bb0f477653229902dd40019f1a9f58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-27 16:32:39 +00:00
Devin Moore
c704aef70c
Merge "Pass system_ext and product dirs to libvintf" am: 8c9a990807
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2611512
Change-Id: Idad3c5b0ed8c1451e3b83b8688624ac07cce3a66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-27 16:31:27 +00:00
Daniel Zheng
e86aa7b965
Merge "Adding recovery image"
2023-06-27 16:07:27 +00:00
Devin Moore
8c9a990807
Merge "Pass system_ext and product dirs to libvintf"
2023-06-27 15:45:30 +00:00
Xin Li
dfb913d479
[automerger skipped] Merge "Merge Android 13 QPR3" am: 24c928cda8
-s ours am: 8476205b04
-s ours am: 823af11644
-s ours am: 53b2cabdd2
-s ours am: ea6caff90b
-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: I05b4fe0caa6f2bc6029881d7464ce4d1fb9fac57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-27 07:27:59 +00:00
Xin Li
747cbc2834
[automerger skipped] Merge Android 13 QPR3 am: 7f534ea9b9
-s ours am: 420d124c7f
-s ours am: 5f70b9bf78
-s ours am: f586549b0b
-s ours am: d67e7d6870
-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: Ifc1fdbfad8bdc1ca3c1dade199e3c4d6ffa4ef4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-27 07:25:59 +00:00
Xin Li
ea6caff90b
[automerger skipped] Merge "Merge Android 13 QPR3" am: 24c928cda8
-s ours am: 8476205b04
-s ours am: 823af11644
-s ours am: 53b2cabdd2
-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: I7f3e7b322485548aaf7ef84464b67f7b31e7a910
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-27 01:16:21 +00:00
Xin Li
d67e7d6870
[automerger skipped] Merge Android 13 QPR3 am: 7f534ea9b9
-s ours am: 420d124c7f
-s ours am: 5f70b9bf78
-s ours am: f586549b0b
-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: Ib80216d8a001909d7423bad01ce0400826524599
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-27 01:14:21 +00:00
Xin Li
53b2cabdd2
[automerger skipped] Merge "Merge Android 13 QPR3" am: 24c928cda8
-s ours am: 8476205b04
-s ours am: 823af11644
-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: I52c0ef5b49c5f5c1f1d3345b8b9a75a80080cd92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-27 00:34:52 +00:00
Xin Li
f586549b0b
[automerger skipped] Merge Android 13 QPR3 am: 7f534ea9b9
-s ours am: 420d124c7f
-s ours am: 5f70b9bf78
-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: I2fdac253dd4639ad466768263f05018123b7db3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-27 00:32:50 +00:00
Treehugger Robot
e68480949f
Merge "aconfig: add dump --format=textproto" am: 571cd07796
am: f29ee8722d
am: 475043109a
am: 40fe34bdc6
am: dc946e18fc
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2637956
Change-Id: I8b8d19ba3516d7c82e4a87eb5b8147395c89ce26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-27 00:26:42 +00:00
Lukács T. Berki
cabf917c86
Merge "Change initialization message." am: 9235b7a2b4
am: b2ff7bf25e
am: 06b0646b95
am: 860e332c5f
am: fc00552609
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2635674
Change-Id: I2d7fe40e8ca8c31ace793ed1a0fae327d900fcf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-27 00:23:17 +00:00
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