StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
76,571 Commits 1 Branch 0 Tags
aa9f3054a1007338666fe4ca10f1ad4fe73f3040
Commit Graph

76571 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
aa9f3054a1 Merge "Change ifneq(,$(A) $(B)) to ifneq(,$(strip $(A) $(B)))" am: 6a95477b0f am: 4f8d04b603 am: d75823a4bf am: 4d1a91b455 
Original change: https://android-review.googlesource.com/c/platform/build/+/1941497

Change-Id: I975fdc387f0eefd898dd0475521c9b43ffdc3e44
 2022-01-08 19:17:50 +00:00
Treehugger Robot
4d1a91b455 Merge "Change ifneq(,$(A) $(B)) to ifneq(,$(strip $(A) $(B)))" am: 6a95477b0f am: 4f8d04b603 am: d75823a4bf 
Original change: https://android-review.googlesource.com/c/platform/build/+/1941497

Change-Id: I32ef66c673653e2ed32bd824c6d59a181327a222
 2022-01-08 19:06:33 +00:00
Treehugger Robot
d75823a4bf Merge "Change ifneq(,$(A) $(B)) to ifneq(,$(strip $(A) $(B)))" am: 6a95477b0f am: 4f8d04b603 
Original change: https://android-review.googlesource.com/c/platform/build/+/1941497

Change-Id: I4a164373f540863d6f7062347e9eb90261659202
 2022-01-08 18:54:23 +00:00
Treehugger Robot
4f8d04b603 Merge "Change ifneq(,$(A) $(B)) to ifneq(,$(strip $(A) $(B)))" am: 6a95477b0f 
Original change: https://android-review.googlesource.com/c/platform/build/+/1941497

Change-Id: I38c3f73271a7b2daa9ab4fe877c5bf39933fd5f8
 2022-01-08 18:37:28 +00:00
Treehugger Robot
6a95477b0f Merge "Change ifneq(,$(A) $(B)) to ifneq(,$(strip $(A) $(B)))" 2022-01-08 18:20:12 +00:00
Yi-Yo Chiang
8193900f87 Change ifneq(,$(A) $(B)) to ifneq(,$(strip $(A) $(B))) 
Else the branch condition would always evaluate to true, making the
other branch useless and wrong!

Bug: 211741246
Test: m dist
Change-Id: I4791712632cbe0d5a9e20962c8425dd20bbe0bfd
 2022-01-08 15:59:02 +00:00
Treehugger Robot
82ad6d35f4 Merge "Write signature size even when it's empty" am: 555c3a7dc7 am: 77f7f00e3d am: 5c8ad6415b am: b7015798b9 
Original change: https://android-review.googlesource.com/c/platform/build/+/1938523

Change-Id: I824c50ffea8cd8e122d473b068520d5faf3df014
 2022-01-08 03:17:21 +00:00
Treehugger Robot
8d77820a48 Merge "Fix GetCareMap for small images" am: 8ef44309b2 am: 2dbcae4a5a am: 04d6278863 am: bcf6567964 
Original change: https://android-review.googlesource.com/c/platform/build/+/1940646

Change-Id: Ibf3103142e5bb05c4e0e8d5df3b6916e2341d39e
 2022-01-08 03:17:07 +00:00
Treehugger Robot
b7015798b9 Merge "Write signature size even when it's empty" am: 555c3a7dc7 am: 77f7f00e3d am: 5c8ad6415b 
Original change: https://android-review.googlesource.com/c/platform/build/+/1938523

Change-Id: I41e953d68ee5517d29a6d407f9c788d74401bb25
 2022-01-08 02:59:41 +00:00
Treehugger Robot
bcf6567964 Merge "Fix GetCareMap for small images" am: 8ef44309b2 am: 2dbcae4a5a am: 04d6278863 
Original change: https://android-review.googlesource.com/c/platform/build/+/1940646

Change-Id: I0c55d4bf678808d755b1b96a48150a563e0fa31f
 2022-01-08 02:59:23 +00:00
Treehugger Robot
5c8ad6415b Merge "Write signature size even when it's empty" am: 555c3a7dc7 am: 77f7f00e3d 
Original change: https://android-review.googlesource.com/c/platform/build/+/1938523

Change-Id: Iba8bebb734f888f98803ebfd6433577b9fa6ebf4
 2022-01-08 02:47:01 +00:00
Treehugger Robot
04d6278863 Merge "Fix GetCareMap for small images" am: 8ef44309b2 am: 2dbcae4a5a 
Original change: https://android-review.googlesource.com/c/platform/build/+/1940646

Change-Id: Ie35729573af9a37253342549b7feac68f705856e
 2022-01-08 02:46:52 +00:00
Treehugger Robot
77f7f00e3d Merge "Write signature size even when it's empty" am: 555c3a7dc7 
Original change: https://android-review.googlesource.com/c/platform/build/+/1938523

Change-Id: I694f6cf73b31f63c2bbc10e7748320adc4d8b116
 2022-01-08 02:27:21 +00:00
Treehugger Robot
2dbcae4a5a Merge "Fix GetCareMap for small images" am: 8ef44309b2 
Original change: https://android-review.googlesource.com/c/platform/build/+/1940646

Change-Id: I2232100525f8ae17ea886f3923557244568f5dd9
 2022-01-08 02:27:11 +00:00
Treehugger Robot
555c3a7dc7 Merge "Write signature size even when it's empty" 2022-01-08 02:20:11 +00:00
Treehugger Robot
8ef44309b2 Merge "Fix GetCareMap for small images" 2022-01-08 02:14:02 +00:00
Treehugger Robot
17555f1157 Merge "Add missing dependencies of fs-verity manifest APK" am: d541c6c898 am: c10c51039e am: 51d95fc646 am: a96408cb32 
Original change: https://android-review.googlesource.com/c/platform/build/+/1941183

Change-Id: Ic75c69859fef81740642f854400456810d34f343
 2022-01-07 23:35:25 +00:00
Treehugger Robot
a96408cb32 Merge "Add missing dependencies of fs-verity manifest APK" am: d541c6c898 am: c10c51039e am: 51d95fc646 
Original change: https://android-review.googlesource.com/c/platform/build/+/1941183

Change-Id: I140d0188356062ba214289fc60d2cef5310b3551
 2022-01-07 23:20:55 +00:00
Treehugger Robot
51d95fc646 Merge "Add missing dependencies of fs-verity manifest APK" am: d541c6c898 am: c10c51039e 
Original change: https://android-review.googlesource.com/c/platform/build/+/1941183

Change-Id: Iefb5d275489b9c5adce2e5a621557d06326322d1
 2022-01-07 23:07:01 +00:00
Kelvin Zhang
98ef7bb157 Fix GetCareMap for small images 
Change-Id: Iac518e36dbb2fe9303e84d502cd7dfe74621c0af
 2022-01-07 14:59:01 -08:00
Treehugger Robot
c10c51039e Merge "Add missing dependencies of fs-verity manifest APK" am: d541c6c898 
Original change: https://android-review.googlesource.com/c/platform/build/+/1941183

Change-Id: I5df8c04c4660fa930b57dd8a9fc4757724885d2c
 2022-01-07 22:48:29 +00:00
Treehugger Robot
d541c6c898 Merge "Add missing dependencies of fs-verity manifest APK" 2022-01-07 22:28:25 +00:00
Victor Hsieh
be1029af71 Add missing dependencies of fs-verity manifest APK 
Otheriwse, the build complains about missing files when
PRODUCT_SYSTEM_FSVERITY_GENERATE_METADATA is enabled (aosp/1937717).

Bug: 206326351
Test: clobber, set PRODUCT_SYSTEM_FSVERITY_GENERATE_METADATA := true, build
Change-Id: I11d18914d63cab0b84ae711f2334747cb26ca234
 2022-01-07 11:07:52 -08:00
Edwin Wong
fd7751d5c6 Merge "Update current.txt for DRM AIDL changes" 2022-01-07 19:07:08 +00:00
Bill Yi
2cffc27ac5 [automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: 1ebd070c8d -s ours am: 0e8235cbfe -s ours am: ac95deb6b0 -s ours am: 7c059cbe3e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I89e1c184baeb4d35a601fee88673b54f6250d31e
 2022-01-07 18:57:06 +00:00
Bill Yi
7c059cbe3e [automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: 1ebd070c8d -s ours am: 0e8235cbfe -s ours am: ac95deb6b0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I487108636b04c128c18a415f204a4d7082c67d77
 2022-01-07 18:34:10 +00:00
Bill Yi
ac95deb6b0 [automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: 1ebd070c8d -s ours am: 0e8235cbfe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic64f2f5081c007cd18a0e3da38e64def3aabbbaa
 2022-01-07 18:16:23 +00:00
Bill Yi
0e8235cbfe [automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: 1ebd070c8d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1fe1d646ac6a2881216196849401534fc09ea3a2
 2022-01-07 17:48:53 +00:00
Bill Yi
1ebd070c8d Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" 2022-01-07 17:29:11 +00:00
Treehugger Robot
6da4fdf0df [automerger skipped] Merge "Add android.hardware.bluetooth.audio-V1-ndk.so" am: 097f6bc1da am: a029ebb6dc am: 1f7cbd5dd6 am: 5f1458f6d9 -s ours 
am skip reason: Merged-In I62e1ce426f741b0e241ebf409fa2e9ea91f8fe73 with SHA-1 39d7b2bb93 is already in history

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

Change-Id: I47ca612453b1b50f3c1116b13508b7b2cc774a69
 2022-01-07 16:32:49 +00:00
Treehugger Robot
338cbbc79b [automerger skipped] Merge "Add a.hardware.audio.common and a.media.audio.common" am: 1c2c284063 am: 03990e11c4 am: d695dfdc70 am: e2a927ed97 -s ours 
am skip reason: Merged-In Ia953963380794591eae6b1140d180dc36dfbe7ca with SHA-1 53a14bc621 is already in history

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

Change-Id: I6bba60c44adf82c2015855ceb297a56eb534e8dd
 2022-01-07 16:31:12 +00:00
Treehugger Robot
5f1458f6d9 Merge "Add android.hardware.bluetooth.audio-V1-ndk.so" am: 097f6bc1da am: a029ebb6dc am: 1f7cbd5dd6 
Original change: https://android-review.googlesource.com/c/platform/build/+/1908872

Change-Id: I4f72846d4d54f53e9f4396c6ef5aca9b638d387f
 2022-01-07 16:18:04 +00:00
Treehugger Robot
e2a927ed97 Merge "Add a.hardware.audio.common and a.media.audio.common" am: 1c2c284063 am: 03990e11c4 am: d695dfdc70 
Original change: https://android-review.googlesource.com/c/platform/build/+/1937128

Change-Id: Ifb11629a6fd8e2711692f92d1a61e465c3108780
 2022-01-07 16:16:30 +00:00
Treehugger Robot
1f7cbd5dd6 Merge "Add android.hardware.bluetooth.audio-V1-ndk.so" am: 097f6bc1da am: a029ebb6dc 
Original change: https://android-review.googlesource.com/c/platform/build/+/1908872

Change-Id: Ibe52ddcbe6a70ad77e8eeb7fcf9b9e751677601c
 2022-01-07 15:56:43 +00:00
Treehugger Robot
d695dfdc70 Merge "Add a.hardware.audio.common and a.media.audio.common" am: 1c2c284063 am: 03990e11c4 
Original change: https://android-review.googlesource.com/c/platform/build/+/1937128

Change-Id: Ieeec05c4a07fa886fefc63605f4ce0449f92c4f2
 2022-01-07 15:55:02 +00:00
Treehugger Robot
a029ebb6dc Merge "Add android.hardware.bluetooth.audio-V1-ndk.so" am: 097f6bc1da 
Original change: https://android-review.googlesource.com/c/platform/build/+/1908872

Change-Id: I59037fa9eb46f8abf22f26e8c3f77c5cc68eb341
 2022-01-07 13:28:43 +00:00
Treehugger Robot
03990e11c4 Merge "Add a.hardware.audio.common and a.media.audio.common" am: 1c2c284063 
Original change: https://android-review.googlesource.com/c/platform/build/+/1937128

Change-Id: I7e3c5ef5a50f6ebe8efca6d409fcd6bab19c9fc2
 2022-01-07 13:26:35 +00:00
Treehugger Robot
097f6bc1da Merge "Add android.hardware.bluetooth.audio-V1-ndk.so" 2022-01-07 13:07:25 +00:00
Treehugger Robot
1c2c284063 Merge "Add a.hardware.audio.common and a.media.audio.common" 2022-01-07 13:07:10 +00:00
Yi-yo Chiang
118eb02283 Merge "Verbose warning message for PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT" am: ec918431a5 am: 21013eaa18 am: bb52d2bc9d am: 246e4a3e06 
Original change: https://android-review.googlesource.com/c/platform/build/+/1860893

Change-Id: I45530f98bec5eebb7437adefe000fd717715e7b6
 2022-01-07 06:29:55 +00:00
Yi-yo Chiang
8c6de6b0ec Merge "Unconditionally copy the system build.prop into target_files archive" am: 5709c4a93f am: 5efc0feefa am: c0db3151ce am: 94e499b4e2 
Original change: https://android-review.googlesource.com/c/platform/build/+/1935974

Change-Id: I3e03404ad18edc127daef02d6f11b5b5aef14b92
 2022-01-07 06:29:26 +00:00
Yi-yo Chiang
246e4a3e06 Merge "Verbose warning message for PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT" am: ec918431a5 am: 21013eaa18 am: bb52d2bc9d 
Original change: https://android-review.googlesource.com/c/platform/build/+/1860893

Change-Id: I1525b4622f1bb5450abca544c0f0e1b9ddc24538
 2022-01-07 06:13:12 +00:00
Yi-yo Chiang
94e499b4e2 Merge "Unconditionally copy the system build.prop into target_files archive" am: 5709c4a93f am: 5efc0feefa am: c0db3151ce 
Original change: https://android-review.googlesource.com/c/platform/build/+/1935974

Change-Id: Ic00a587220728e5ad253c1407381074f2fa37ba0
 2022-01-07 06:13:02 +00:00
Yi-yo Chiang
bb52d2bc9d Merge "Verbose warning message for PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT" am: ec918431a5 am: 21013eaa18 
Original change: https://android-review.googlesource.com/c/platform/build/+/1860893

Change-Id: I2de2ea18016b144882859a4f0b222e29a62dbfd7
 2022-01-07 05:56:37 +00:00
Yi-yo Chiang
c0db3151ce Merge "Unconditionally copy the system build.prop into target_files archive" am: 5709c4a93f am: 5efc0feefa 
Original change: https://android-review.googlesource.com/c/platform/build/+/1935974

Change-Id: Id4e5f7272b0debf649c4cef83c9eb835b060fb90
 2022-01-07 05:56:21 +00:00
Yi-yo Chiang
21013eaa18 Merge "Verbose warning message for PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT" am: ec918431a5 
Original change: https://android-review.googlesource.com/c/platform/build/+/1860893

Change-Id: Iaa9365f9f6ff51a7accb95da3093886969925b9d
 2022-01-07 05:42:41 +00:00
Yi-yo Chiang
5efc0feefa Merge "Unconditionally copy the system build.prop into target_files archive" am: 5709c4a93f 
Original change: https://android-review.googlesource.com/c/platform/build/+/1935974

Change-Id: I1801eff75b29ed42fbde2129e2366ec8ae0b5969
 2022-01-07 05:42:24 +00:00
Yi-yo Chiang
ec918431a5 Merge "Verbose warning message for PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT" 2022-01-07 05:30:23 +00:00
Yi-yo Chiang
5709c4a93f Merge "Unconditionally copy the system build.prop into target_files archive" 2022-01-07 05:27:35 +00:00
Treehugger Robot
cfbdb4bd4a Merge "Move fsverity metadata generation to Makefile" am: 7c88c9c1e6 am: 2d6411ed06 am: eea503cf81 am: 9c4a78ceae 
Original change: https://android-review.googlesource.com/c/platform/build/+/1937129

Change-Id: I8a3b44b5cd20af1089dccd61c041e8cd97638fda
 2022-01-07 04:39:34 +00:00