StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
74,220 Commits 1 Branch 0 Tags
cfd8d0ef1b02101a779bf09a147fa5c0b07840d5
Commit Graph

74220 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gabriel Biren
cfd8d0ef1b Merge "Add Wifi supplicant AIDL interface support." am: 23e4ccd2ba am: ac3f304f30 am: 7dd0c7905e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16482080

Change-Id: I00d7a855c7e71f76eec17ee0fabe136e38f03190
 2021-12-16 18:49:54 +00:00
Gabriel Biren
7dd0c7905e Merge "Add Wifi supplicant AIDL interface support." am: 23e4ccd2ba am: ac3f304f30 
Original change: https://android-review.googlesource.com/c/platform/build/+/1859994

Change-Id: Ie3980bc12b0e74b69c1949916b352360c0debf32
 2021-12-16 15:43:32 +00:00
Gabriel Biren
ac3f304f30 Merge "Add Wifi supplicant AIDL interface support." am: 23e4ccd2ba 
Original change: https://android-review.googlesource.com/c/platform/build/+/1859994

Change-Id: Ia0cb778a73550d61ea1f1580f546d73856e22d04
 2021-12-15 21:35:42 +00:00
Gabriel Biren
23e4ccd2ba Merge "Add Wifi supplicant AIDL interface support." 2021-12-15 21:13:41 +00:00
Inseob Kim
1c4355d7b2 Merge changes I6f61a908,Iafd22881 am: 32961d0203 am: 7cc500615e am: eef47a47e4 
Original change: https://android-review.googlesource.com/c/platform/build/+/1922320

Change-Id: I7d0d46ced899af76fd3843a6eaa47e6de804eb96
 2021-12-15 08:12:52 +00:00
Inseob Kim
eef47a47e4 Merge changes I6f61a908,Iafd22881 am: 32961d0203 am: 7cc500615e 
Original change: https://android-review.googlesource.com/c/platform/build/+/1922320

Change-Id: I895253ff5eed373d9bcf14f0661cf9159519ac9c
 2021-12-15 07:48:19 +00:00
Inseob Kim
7cc500615e Merge changes I6f61a908,Iafd22881 am: 32961d0203 
Original change: https://android-review.googlesource.com/c/platform/build/+/1922320

Change-Id: I19494a973460498f4e08dd6e3da0ec5ee93726f9
 2021-12-15 07:33:00 +00:00
Inseob Kim
32961d0203 Merge changes I6f61a908,Iafd22881 
* changes:
  fsverity_metadata: Support PEM key
  Add fsverity_metadata_generator helper binary
 2021-12-15 06:03:31 +00:00
Inseob Kim
067492988a fsverity_metadata: Support PEM key 
When we have a PEM key, we don't need the process converting a DER key
to PEM format, but we just need to use the PEM key as-is.

Bug: 205987437
Test: build and manual test
Change-Id: I6f61a9088efc0f7193737d3c33b8cfde399b2b6f
 2021-12-15 09:41:39 +09:00
Inseob Kim
2d03493341 Add fsverity_metadata_generator helper binary 
Making this a host tool will help users generate their own fsverity
metadata easily.

Bug: 205987437
Test: m fsverity_metadata_generator and run it
Change-Id: Iafd228815a74d298d87ca1466c6909c0d24c5874
 2021-12-15 09:41:29 +09:00
Xin Li
5935736a08 [automerger skipped] Merge "Merge Android 12 QPR1" am: 46c84edacf -s ours am: f2cf79c417 -s ours am: f572c401ca -s ours 
am skip reason: Merged-In Ib836574268ae722da7a06d53d2014daa5877a991 with SHA-1 c95816ce4b is already in history

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

Change-Id: I8fe61ba2c1b060e843e88351e8a96d0c49e6ad19
 2021-12-14 21:50:58 +00:00
Xin Li
f572c401ca [automerger skipped] Merge "Merge Android 12 QPR1" am: 46c84edacf -s ours am: f2cf79c417 -s ours 
am skip reason: Merged-In Ib836574268ae722da7a06d53d2014daa5877a991 with SHA-1 c95816ce4b is already in history

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

Change-Id: I00ae111710ebf0256126b5f030e28de3e50a0149
 2021-12-14 21:24:03 +00:00
Xin Li
f2cf79c417 [automerger skipped] Merge "Merge Android 12 QPR1" am: 46c84edacf -s ours 
am skip reason: Merged-In Ib836574268ae722da7a06d53d2014daa5877a991 with SHA-1 c95816ce4b is already in history

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

Change-Id: I033c137837187679c92fd34c99c7bad15cbf9be7
 2021-12-14 21:00:14 +00:00
Xin Li
46c84edacf Merge "Merge Android 12 QPR1" 2021-12-14 20:26:44 +00:00
Xin Li
0a9962fd9e Merge Android 12 QPR1 
Bug: 210511427
Merged-In: Ib836574268ae722da7a06d53d2014daa5877a991
Change-Id: Ic04e8e0274868bc7ccf3ac454ed0217beff382a0
 2021-12-14 08:38:55 -08:00
Yi-yo Chiang
7b42795949 Merge "Bump GSI PRODUCT_SHIPPING_API_LEVEL to 31" am: 90b0039a9d am: bd3a3bc919 am: eb921708da 
Original change: https://android-review.googlesource.com/c/platform/build/+/1913441

Change-Id: Ibff899fa9a190da527da6c9cef4ddc5dfdf1c4b2
 2021-12-14 12:32:56 +00:00
Yi-yo Chiang
eb921708da Merge "Bump GSI PRODUCT_SHIPPING_API_LEVEL to 31" am: 90b0039a9d am: bd3a3bc919 
Original change: https://android-review.googlesource.com/c/platform/build/+/1913441

Change-Id: Ie54ddd87020a272e6e3ec0494c4faeaa7c116840
 2021-12-14 12:11:16 +00:00
Yi-yo Chiang
bd3a3bc919 Merge "Bump GSI PRODUCT_SHIPPING_API_LEVEL to 31" am: 90b0039a9d 
Original change: https://android-review.googlesource.com/c/platform/build/+/1913441

Change-Id: Ic78b02164ab7d0f2fad87de4511496e2ee32025a
 2021-12-14 11:56:43 +00:00
Yi-yo Chiang
90b0039a9d Merge "Bump GSI PRODUCT_SHIPPING_API_LEVEL to 31" 2021-12-14 11:39:03 +00:00
Inseob Kim
7bc4dacabd Merge "Refactor sepolicy version related codes" am: e23891877c am: c95816ce4b am: 7a259e3752 
Original change: https://android-review.googlesource.com/c/platform/build/+/1916858

Change-Id: Id55341d883bf9bcf4aabf2ed44f6892ca9da8c27
 2021-12-13 04:45:51 +00:00
Inseob Kim
7a259e3752 Merge "Refactor sepolicy version related codes" am: e23891877c am: c95816ce4b 
Original change: https://android-review.googlesource.com/c/platform/build/+/1916858

Change-Id: I8929bbc5892ab99ceede3ce262fbd67072e9bbe9
 2021-12-13 04:30:19 +00:00
Inseob Kim
c95816ce4b Merge "Refactor sepolicy version related codes" am: e23891877c 
Original change: https://android-review.googlesource.com/c/platform/build/+/1916858

Change-Id: Ib836574268ae722da7a06d53d2014daa5877a991
 2021-12-13 04:13:32 +00:00
Inseob Kim
e23891877c Merge "Refactor sepolicy version related codes" 2021-12-13 03:57:36 +00:00
Treehugger Robot
52fea5cdc0 Merge "Revert^2 "Reuse license metadata files from Soong"" am: f13d0b2f22 am: 49da1ac76c am: d3ab9dfb51 
Original change: https://android-review.googlesource.com/c/platform/build/+/1918950

Change-Id: I9a1e565a1757de8a5964e101471a3effe0300ef2
 2021-12-11 04:32:39 +00:00
Treehugger Robot
d3ab9dfb51 Merge "Revert^2 "Reuse license metadata files from Soong"" am: f13d0b2f22 am: 49da1ac76c 
Original change: https://android-review.googlesource.com/c/platform/build/+/1918950

Change-Id: Icade616ffd3ca4301e69425fbfc642742fd53d67
 2021-12-11 04:04:21 +00:00
Treehugger Robot
49da1ac76c Merge "Revert^2 "Reuse license metadata files from Soong"" am: f13d0b2f22 
Original change: https://android-review.googlesource.com/c/platform/build/+/1918950

Change-Id: I5b572989961bf849cedd2da802b72361ef5fd778
 2021-12-11 03:48:24 +00:00
Treehugger Robot
f13d0b2f22 Merge "Revert^2 "Reuse license metadata files from Soong"" 2021-12-11 03:32:18 +00:00
Colin Cross
eac023a522 Merge "Revert "Reuse license metadata files from Soong"" am: 91a9483e87 am: 2e075808dd am: 4ab1019a66 
Original change: https://android-review.googlesource.com/c/platform/build/+/1918946

Change-Id: Ia321ccdbd7376dbd6f6515de192aaea4049d1743
 2021-12-10 23:54:50 +00:00
Colin Cross
4ab1019a66 Merge "Revert "Reuse license metadata files from Soong"" am: 91a9483e87 am: 2e075808dd 
Original change: https://android-review.googlesource.com/c/platform/build/+/1918946

Change-Id: Ifa1a9114379e9a0b47cfff75d7058dabce61ccab
 2021-12-10 23:39:20 +00:00
Colin Cross
2e075808dd Merge "Revert "Reuse license metadata files from Soong"" am: 91a9483e87 
Original change: https://android-review.googlesource.com/c/platform/build/+/1918946

Change-Id: I85bbf851be4f5d2d3884f2c4652e32b0bcbd59b3
 2021-12-10 23:20:49 +00:00
Colin Cross
71d9919322 Revert^2 "Reuse license metadata files from Soong" 
81b167693f

Change-Id: Iff45cffb1f2b9d01cec70d96e34f46d35bb37842
 2021-12-10 23:05:02 +00:00
Colin Cross
91a9483e87 Merge "Revert "Reuse license metadata files from Soong"" 2021-12-10 23:04:45 +00:00
Colin Cross
81b167693f Revert "Reuse license metadata files from Soong" 
Revert "Escape Host*Variable contents"

Revert submission 1899703

Reason for revert: b/210158272
Reverted Changes:
I142c19284:Reuse license metadata files from Soong
Ife89b8f23:Add dependency license annotations
I8e7410837:Build license metadata files in Soong

Change-Id: Id9d66c01453aebe8a52eaa6628e9933a990d4c2f
 2021-12-10 23:03:08 +00:00
Cole Faust
16bc902d32 Merge "Strip ODM_MANIFEST_SKUS" am: 01e022369b am: 98a7011088 am: 03c397942c 
Original change: https://android-review.googlesource.com/c/platform/build/+/1917097

Change-Id: Idef267ecf33627ccd673a8d1205bd13c0b0ba6a3
 2021-12-10 22:42:37 +00:00
Colin Cross
870134db7c Merge "Reuse license metadata files from Soong" am: 6cf8ec77cc am: b48261121e am: 8d6a7102ac 
Original change: https://android-review.googlesource.com/c/platform/build/+/1900116

Change-Id: Ib5485d9092d2b3d4480dfcdb3a4bd2d1d15cc71e
 2021-12-10 22:42:17 +00:00
Cole Faust
03c397942c Merge "Strip ODM_MANIFEST_SKUS" am: 01e022369b am: 98a7011088 
Original change: https://android-review.googlesource.com/c/platform/build/+/1917097

Change-Id: I65234df27f423f1370f62f43d91401744afbced1
 2021-12-10 22:25:36 +00:00
Colin Cross
8d6a7102ac Merge "Reuse license metadata files from Soong" am: 6cf8ec77cc am: b48261121e 
Original change: https://android-review.googlesource.com/c/platform/build/+/1900116

Change-Id: I2425845206145cc4f3115017607299fb77354dfc
 2021-12-10 22:20:35 +00:00
Cole Faust
98a7011088 Merge "Strip ODM_MANIFEST_SKUS" am: 01e022369b 
Original change: https://android-review.googlesource.com/c/platform/build/+/1917097

Change-Id: I37ee8f0df0bcb212e0fc3add6b069e5857614747
 2021-12-10 22:05:31 +00:00
Colin Cross
b48261121e Merge "Reuse license metadata files from Soong" am: 6cf8ec77cc 
Original change: https://android-review.googlesource.com/c/platform/build/+/1900116

Change-Id: Id5db06a34777ff0a2bca39ffa0e083ca2a131a3d
 2021-12-10 22:04:39 +00:00
Cole Faust
01e022369b Merge "Strip ODM_MANIFEST_SKUS" 2021-12-10 22:02:22 +00:00
Colin Cross
6cf8ec77cc Merge "Reuse license metadata files from Soong" 2021-12-10 21:43:49 +00:00
Akilesh Kailash
3791ff3cf6 Merge "Enable userspace snapshots for OTA" am: 3f5f0b306d am: 7260b087ea am: 1b14617cdb 
Original change: https://android-review.googlesource.com/c/platform/build/+/1912666

Change-Id: I96e2ec314768bf9899bd3ea83e9bcbed0ccdc648
 2021-12-10 20:32:55 +00:00
Akilesh Kailash
1b14617cdb Merge "Enable userspace snapshots for OTA" am: 3f5f0b306d am: 7260b087ea 
Original change: https://android-review.googlesource.com/c/platform/build/+/1912666

Change-Id: I9fe57a883f46b38c1fb891777e8d2a06c33466dc
 2021-12-10 20:15:43 +00:00
Akilesh Kailash
7260b087ea Merge "Enable userspace snapshots for OTA" am: 3f5f0b306d 
Original change: https://android-review.googlesource.com/c/platform/build/+/1912666

Change-Id: I55d5d4da987da73432f31f68c135903f725fd6fd
 2021-12-10 19:58:12 +00:00
Akilesh Kailash
3f5f0b306d Merge "Enable userspace snapshots for OTA" 2021-12-10 19:44:48 +00:00
Nicolas Geoffray
d0c5e5d506 [automerger skipped] Merge "Use prebuilts of the ART Module by default in SC branches." into sc-v2-dev am: df8b9c17b0 -s ours 
am skip reason: Merged-In I50187408a01e0c6f5ecea12fe3a423e1c5d93612 with SHA-1 607138be38 is already in history

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

Change-Id: I37e0cfda30e9e2752dfadcb87cb78640f623b319
 2021-12-10 19:20:52 +00:00
Nicolas Geoffray
df8b9c17b0 Merge "Use prebuilts of the ART Module by default in SC branches." into sc-v2-dev 2021-12-10 18:59:39 +00:00
Inseob Kim
2f2b777d1b Merge "Add BoardPlatVendorPolicy to soong config" am: f09eddd531 am: 7c708e2d27 am: 4d9cf5c4e7 
Original change: https://android-review.googlesource.com/c/platform/build/+/1914612

Change-Id: I0644150683b13d8165704daead1380000906fb7c
 2021-12-10 13:03:08 +00:00
Inseob Kim
4d9cf5c4e7 Merge "Add BoardPlatVendorPolicy to soong config" am: f09eddd531 am: 7c708e2d27 
Original change: https://android-review.googlesource.com/c/platform/build/+/1914612

Change-Id: Ifab9c475dd11183a6465ca48d911f5b86ecaee74
 2021-12-10 12:50:56 +00:00
Inseob Kim
7c708e2d27 Merge "Add BoardPlatVendorPolicy to soong config" am: f09eddd531 
Original change: https://android-review.googlesource.com/c/platform/build/+/1914612

Change-Id: I15f4771b72598028a380d15ca8f1c3421b07890d
 2021-12-10 12:29:48 +00:00