StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
63,294 Commits 1 Branch 0 Tags
c92fc3ff9fcc551a73b04cfc3a9de7ace2759bcc
Commit Graph

63294 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
13056f254e [automerger skipped] Merge "Mark android_app_set modules PRESIGNED." am: 1e6cc9fc30 am: 64ab409f71 -s ours am: 1d219d59e3 -s ours 
am skip reason: Change-Id Ie83a05be0d71280644843eddffdbea6bcb429c74 with SHA-1 077891d190 is in history

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

Change-Id: Iee2c40e49f158411b4cd0aaf3bbf7f506ad5609a
 2020-06-27 01:37:01 +00:00
Treehugger Robot
1d219d59e3 [automerger skipped] Merge "Mark android_app_set modules PRESIGNED." am: 1e6cc9fc30 am: 64ab409f71 -s ours 
am skip reason: Change-Id Ie83a05be0d71280644843eddffdbea6bcb429c74 with SHA-1 077891d190 is in history

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

Change-Id: I69f2a76c2d4b7e7105db3bc47f22a7201eb8e432
 2020-06-27 01:24:45 +00:00
Treehugger Robot
64ab409f71 Merge "Mark android_app_set modules PRESIGNED." am: 1e6cc9fc30 
Original change: https://android-review.googlesource.com/c/platform/build/+/1351283

Change-Id: I4be6517c8d2d732aeed1e3ccd1e20a990f666a62
 2020-06-27 01:13:27 +00:00
Treehugger Robot
1e6cc9fc30 Merge "Mark android_app_set modules PRESIGNED." 2020-06-27 01:01:40 +00:00
Steve Muckle
bbdfbdad50 use first kernel when generating kernel configs file 
If multiple kernels are defined for a build, use the first one when
generating the kernel config file.

Bug: 159975506
Change-Id: Ia136264eb0d0b544bf0685bc22e600de187a9a9b
 2020-06-26 16:39:34 -07:00
Jaewoong Jung
ddae589b95 Mark android_app_set modules PRESIGNED. 
Test: m apkcerts-list
Fixes: 159921591
Merged-In: Ie83a05be0d71280644843eddffdbea6bcb429c74
Change-Id: Ie83a05be0d71280644843eddffdbea6bcb429c74
 2020-06-26 16:10:49 -07:00
Tianjie Xu
70e2db7e14 Merge "Rename the boot image for avb validation" am: b829269aa1 am: ffe526f246 am: 6b7c1632ba am: 01a6ebbd12 
Original change: https://android-review.googlesource.com/c/platform/build/+/1350723

Change-Id: I79e387bee6f1abf605ba82f7418b81d22f7b1ae6
 2020-06-26 18:28:53 +00:00
Tianjie Xu
01a6ebbd12 Merge "Rename the boot image for avb validation" am: b829269aa1 am: ffe526f246 am: 6b7c1632ba 
Original change: https://android-review.googlesource.com/c/platform/build/+/1350723

Change-Id: Ie757c59590176ff8ab756cc697f28955c74e391e
 2020-06-26 18:18:32 +00:00
Tianjie Xu
6b7c1632ba Merge "Rename the boot image for avb validation" am: b829269aa1 am: ffe526f246 
Original change: https://android-review.googlesource.com/c/platform/build/+/1350723

Change-Id: I2c796c976634810f6d18349cf098c51aa332dae8
 2020-06-26 18:04:09 +00:00
Luca Stefani
c158e421ec Remove empty new-space in dynamic_partition_list and super_$(group)_partition_list 
* As a side product .strip() calls in releasetools are redunant,
  but since these scripts are also used out of tree we can't
  remove them to guarantee compatibility

Test: m dist
Change-Id: I5c513a4654e293c3d4eab98c8759ea094015fab1
 2020-06-26 19:52:52 +02:00
Tianjie Xu
ffe526f246 Merge "Rename the boot image for avb validation" am: b829269aa1 
Original change: https://android-review.googlesource.com/c/platform/build/+/1350723

Change-Id: Ic2cfb34560e9a8b16487017ff10d6a2e0fb98cd9
 2020-06-26 17:52:46 +00:00
Tianjie Xu
b829269aa1 Merge "Rename the boot image for avb validation" 2020-06-26 17:35:54 +00:00
Automerger Merge Worker
6814b954ce Merge "Merge "Rename the boot image for avb validation" into rvc-dev am: d7dabee7fe am: fcc61eef7b" into rvc-d1-dev-plus-aosp am: 6802c41f0b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12005766

Change-Id: Ie99e42463305d947587d3d525d80a4be1541b5db
 2020-06-26 17:22:32 +00:00
SzuWei Lin
1b8f545f8e Merge "Rename the boot image for avb validation" into rvc-dev am: d7dabee7fe am: 9bac3d1c94 am: bbb2e03727 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12005766

Change-Id: I42360acfbb3ff62f831045f354f880f960a519ce
 2020-06-26 17:22:23 +00:00
SzuWei Lin
3efbb72cb8 Merge "Rename the boot image for avb validation" into rvc-dev am: d7dabee7fe am: 9bac3d1c94 am: 07534d8362 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12005766

Change-Id: I9749062c5033cc51147267bae219f8c4f4a51a59
 2020-06-26 17:21:34 +00:00
Automerger Merge Worker
6802c41f0b Merge "Merge "Rename the boot image for avb validation" into rvc-dev am: d7dabee7fe am: fcc61eef7b" into rvc-d1-dev-plus-aosp 2020-06-26 17:08:37 +00:00
SzuWei Lin
07534d8362 Merge "Rename the boot image for avb validation" into rvc-dev am: d7dabee7fe am: 9bac3d1c94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12005766

Change-Id: I8fc99715a42a04e3c232be43cd598bf440daafda
 2020-06-26 17:08:36 +00:00
SzuWei Lin
0a79a5f700 Merge "Rename the boot image for avb validation" into rvc-dev am: d7dabee7fe am: fcc61eef7b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12005766

Change-Id: I6897edc721dc3dc7b211a2e3a41c6f197ebd74f8
 2020-06-26 17:08:33 +00:00
SzuWei Lin
bbb2e03727 Merge "Rename the boot image for avb validation" into rvc-dev am: d7dabee7fe am: 9bac3d1c94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12005766

Change-Id: I64bafe12254987e8c8f943c95d936d15a8236974
 2020-06-26 17:08:28 +00:00
SzuWei Lin
fcc61eef7b Merge "Rename the boot image for avb validation" into rvc-dev am: d7dabee7fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12005766

Change-Id: Ic445700b7130012685f45da16433ce3e8c992feb
 2020-06-26 16:54:52 +00:00
SzuWei Lin
9bac3d1c94 Merge "Rename the boot image for avb validation" into rvc-dev am: d7dabee7fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12005766

Change-Id: I015e98609a6099671eed0bedafe01aab74eb12da
 2020-06-26 16:54:47 +00:00
SzuWei Lin
d7dabee7fe Merge "Rename the boot image for avb validation" into rvc-dev 2020-06-26 16:45:17 +00:00
Tianjie
8c2d9096e3 Rename the boot image for avb validation 
Starting from http://go/aog/1328118, we chained the 1st GKI
boot image into vbmeta. However, this fails avb validation;
because the avbtool constructs the image path based by using
"partition name + ext".

This cl works around the issue by renaming boot-5.4.img to
boot.img, so avbtool can find the image correctly.

Bug: 159656873
Test: run validate target file
Change-Id: I577226596e139e5b5f3e6ca3c28ced02431ca392
Merged-Id: I577226596e139e5b5f3e6ca3c28ced02431ca392
(cherry picked from commit 5ec1a7a66a)
 2020-06-26 16:44:14 +00:00
Inseob Kim
2b0b3d1491 Error if BOARD_VNDK_VERSION=PLATFORM_VNDK_VERSION 
"BOARD_VNDK_VERSION := current" should be used instead.

Bug: 159866756
Test: manual
Change-Id: I854ca9c0fa195ab4bbb468a1343ef4fa28ac9258
 2020-06-27 00:18:12 +09:00
Ulyana Trafimovich
9614b17e04 Merge "Move construct_context.sh from Make to Soong." am: 43774f74c3 am: 8969520e35 am: 71301aaa74 am: 5d436e20d5 
Original change: https://android-review.googlesource.com/c/platform/build/+/1348850

Change-Id: I70161fbd2f032c82569e5265767cffdb75efca34
 2020-06-26 09:46:05 +00:00
Ulyana Trafimovich
5d436e20d5 Merge "Move construct_context.sh from Make to Soong." am: 43774f74c3 am: 8969520e35 am: 71301aaa74 
Original change: https://android-review.googlesource.com/c/platform/build/+/1348850

Change-Id: I1546b34aa9cb844f30f633fea59b9316ba6403a4
 2020-06-26 09:33:57 +00:00
Ulyana Trafimovich
71301aaa74 Merge "Move construct_context.sh from Make to Soong." am: 43774f74c3 am: 8969520e35 
Original change: https://android-review.googlesource.com/c/platform/build/+/1348850

Change-Id: I304e88bf15874b0b4e6d02b44d50b044372d5684
 2020-06-26 09:21:02 +00:00
Ulyana Trafimovich
8969520e35 Merge "Move construct_context.sh from Make to Soong." am: 43774f74c3 
Original change: https://android-review.googlesource.com/c/platform/build/+/1348850

Change-Id: Icaeba52a9e55841bcbab2a0831121142363ebd5c
 2020-06-26 09:00:15 +00:00
Ulyana Trafimovich
43774f74c3 Merge "Move construct_context.sh from Make to Soong." 2020-06-26 08:46:58 +00:00
Tianjie
5ec1a7a66a Rename the boot image for avb validation 
Starting from http://go/aog/1328118, we chained the 1st GKI
boot image into vbmeta. However, this fails avb validation;
because the avbtool constructs the image path based by using
"partition name + ext".

This cl works around the issue by renaming boot-5.4.img to
boot.img, so avbtool can find the image correctly.

Bug: 159656873
Test: run validate target file
Change-Id: I577226596e139e5b5f3e6ca3c28ced02431ca392
 2020-06-25 23:09:48 -07:00
Jaewoong Jung
7fbdb1f41d Mark android_app_set modules PRESIGNED. am: 077891d190 am: a9aa13e1f6 am: 68ac06e984 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12000545

Change-Id: I3153b13a327d7fd9dc964190b88597157f7f6c8a
 2020-06-26 04:28:07 +00:00
Jaewoong Jung
0dd495e109 Mark android_app_set modules PRESIGNED. am: 077891d190 am: 851b30ec32 am: 9e5043c596 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12000545

Change-Id: I6635aa7b74071bf3994731a00588c084af8d10f7
 2020-06-26 04:27:39 +00:00
Jaewoong Jung
b3466a2910 Mark android_app_set modules PRESIGNED. am: 077891d190 am: 851b30ec32 am: 74395cf29d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12000545

Change-Id: I95f5fbaf52c282dcd3cc716edb5e3787cd3b47b4
 2020-06-26 04:27:28 +00:00
Jaewoong Jung
68ac06e984 Mark android_app_set modules PRESIGNED. am: 077891d190 am: a9aa13e1f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12000545

Change-Id: I0a3734232bb68978cf3c131f4b2e798317a9f523
 2020-06-26 04:05:31 +00:00
Jaewoong Jung
74395cf29d Mark android_app_set modules PRESIGNED. am: 077891d190 am: 851b30ec32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12000545

Change-Id: I1968e4cc1d8763eb01971c283164594fad4717e8
 2020-06-26 04:04:11 +00:00
Jaewoong Jung
9e5043c596 Mark android_app_set modules PRESIGNED. am: 077891d190 am: 851b30ec32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12000545

Change-Id: Ic5241218646ef77aa3bac97d8ccd655c663f0e92
 2020-06-26 04:03:59 +00:00
Jaewoong Jung
a9aa13e1f6 Mark android_app_set modules PRESIGNED. am: 077891d190 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12000545

Change-Id: I43a3e29e7914130d860e11f338e220ad611443cc
 2020-06-26 03:49:27 +00:00
Jaewoong Jung
851b30ec32 Mark android_app_set modules PRESIGNED. am: 077891d190 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12000545

Change-Id: I0d6deda10dde3697ffb61792cd17c6e16d7ed8e3
 2020-06-26 03:49:22 +00:00
Jiyong Park
62117c857d build.prop for ODM partition is under ./etc subdir 
build.prop for the ODM partition should be placed under ./etc directory
to support GSI. For detailed reasons, see
I0733c277baa67c549bb45599abb70aba13fbdbcf

The path was changed to /odm/build.prop during the recent refactoring
around build.prop filems and this change fixes the mistake.

Bug: 132128501

Test: check if odm/etc/build.prop is created
Change-Id: Icc2c564250aa08786f32294a839cc81e86b7d368
 2020-06-26 09:59:42 +09:00
Jaewoong Jung
077891d190 Mark android_app_set modules PRESIGNED. 
Test: m apkcerts-list
Fixes: 159921591
Change-Id: Ie83a05be0d71280644843eddffdbea6bcb429c74
 2020-06-25 16:06:21 -07:00
Treehugger Robot
fd9d04ce28 Merge "depmod: pair in a modules.load.charger on BOARD_VENDOR_CHARGER_KERNEL_MODULES_LOAD" am: bfe947b5ce am: f9bd377168 am: 07031bc150 am: a4315d9cfa 
Original change: https://android-review.googlesource.com/c/platform/build/+/1348976

Change-Id: I0df9c11128a38a2b9c5d398fc92121cb362ebbe7
 2020-06-25 20:27:27 +00:00
Treehugger Robot
a4315d9cfa Merge "depmod: pair in a modules.load.charger on BOARD_VENDOR_CHARGER_KERNEL_MODULES_LOAD" am: bfe947b5ce am: f9bd377168 am: 07031bc150 
Original change: https://android-review.googlesource.com/c/platform/build/+/1348976

Change-Id: I320319e35f34ef16172e4d156ed35438270bcfb9
 2020-06-25 19:58:23 +00:00
Treehugger Robot
07031bc150 Merge "depmod: pair in a modules.load.charger on BOARD_VENDOR_CHARGER_KERNEL_MODULES_LOAD" am: bfe947b5ce am: f9bd377168 
Original change: https://android-review.googlesource.com/c/platform/build/+/1348976

Change-Id: I9a2204315556706c3728c43eb30ce98e7a5fa4ea
 2020-06-25 19:43:54 +00:00
Treehugger Robot
f9bd377168 Merge "depmod: pair in a modules.load.charger on BOARD_VENDOR_CHARGER_KERNEL_MODULES_LOAD" am: bfe947b5ce 
Original change: https://android-review.googlesource.com/c/platform/build/+/1348976

Change-Id: I7b0930b126a3a1eeeef28566a442e7be9b04a44d
 2020-06-25 19:31:14 +00:00
Treehugger Robot
bfe947b5ce Merge "depmod: pair in a modules.load.charger on BOARD_VENDOR_CHARGER_KERNEL_MODULES_LOAD" 2020-06-25 19:23:39 +00:00
Mark Salyzyn
46a9c028b8 depmod: pair in a modules.load.charger on BOARD_VENDOR_CHARGER_KERNEL_MODULES_LOAD 
If the BoardConfig defined BOARD_VENDOR_KERNEL_MODULES_LOAD and
BOARD_VENDOR_CHARGER_KERNEL_MODULES_LOAD, generate both a
modules.load and modules.load.charger respectively on
/vendor/lib/modules.

Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 159424228
Bug: 151950334
Test: build, confirm, change to charger mode, confirm set of modules loads
Change-Id: I55677ed74d80ff3909fe8cbe26e6766f9b5283d5
 2020-06-25 08:57:36 -07:00
Ulya Trafimovich
5a7defdab1 Move construct_context.sh from Make to Soong. 
This script belongs with other manifest-related scripts, and the future
plan is to rewrite it in Python and share common functionality with
other scripts.

Test: lunch aosp_cf_x86_phone-userdebug && m
Bug: 132357300
Change-Id: I4b90129e5023ca1a2c818fc160c34b0b7da943ef
 2020-06-25 14:48:08 +01:00
Tianjie Xu
cdbddaed88 Merge "Add lz4 to otatools" into rvc-dev am: c35ea185b0 am: d1f702cd63 am: 54d7e17a5a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11992672

Change-Id: I21e16b8951486a2277cbc1cb054ff5c7a97ac964
 2020-06-25 03:10:43 +00:00
Tianjie Xu
eed4582023 Merge "Add lz4 to otatools" into rvc-dev am: c35ea185b0 am: d38eafeb9e am: 0c0a959fb6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11992672

Change-Id: I8280dab3f5cc56ef149f4334427d932900015812
 2020-06-25 03:10:30 +00:00
Tianjie Xu
b9357ae5bf Merge "Add lz4 to otatools" into rvc-dev am: c35ea185b0 am: d38eafeb9e am: ea764307de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11992672

Change-Id: I3d6991fdd1da61c71ea4da302b15cd25260e9181
 2020-06-25 03:10:14 +00:00