tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
75901 commits 1 branch 0 tags 119 MiB
Commit graph

75901 commits

This branch
This branch
All branches
Author SHA1 Message Date
Treehugger Robot
0e9776beab Merge "Add snapuserd/e2fsprogs/f2fs-tools to init_boot partition" am: f99d7e96e3 am: e104a7024b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2018336

Change-Id: I52877d98cac97f0216897b1f1ebfbbe4035b98cb
 2022-03-10 11:59:23 +00:00
Treehugger Robot
e104a7024b Merge "Add snapuserd/e2fsprogs/f2fs-tools to init_boot partition" am: f99d7e96e3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2018336

Change-Id: I2c7ecfd39660d5ca3d46cece899b0448cd5bb66d
 2022-03-10 11:36:04 +00:00
Treehugger Robot
f99d7e96e3 Merge "Add snapuserd/e2fsprogs/f2fs-tools to init_boot partition" 2022-03-10 11:03:16 +00:00
Treehugger Robot
b3ab555a0c Merge "Handle symlink license metadata." am: 7506930ca5 am: af293990b4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2019496

Change-Id: Idba75e7f23c4eb9d514a3da9a8607da83b9fb852
 2022-03-10 04:18:19 +00:00
Treehugger Robot
af293990b4 Merge "Handle symlink license metadata." am: 7506930ca5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2019496

Change-Id: I589357f1accbbf592535f42a6b4420f98a107678
 2022-03-10 03:50:06 +00:00
Treehugger Robot
7506930ca5 Merge "Handle symlink license metadata." 2022-03-10 03:27:38 +00:00
Treehugger Robot
0979185024 Merge "validate_target_files: support gki_arm64" am: e910accc38 am: d8bdea34e9 
Original change: https://android-review.googlesource.com/c/platform/build/+/2017679

Change-Id: I8a4b280a64b931f6532cd3a369c7b17bb93b5804
 2022-03-10 01:39:51 +00:00
Treehugger Robot
d8bdea34e9 Merge "validate_target_files: support gki_arm64" am: e910accc38 
Original change: https://android-review.googlesource.com/c/platform/build/+/2017679

Change-Id: I5990d1dde9fc5ddd2b1c006fbd9aca2f607e8e1f
 2022-03-10 01:15:01 +00:00
Treehugger Robot
e910accc38 Merge "validate_target_files: support gki_arm64" 2022-03-10 00:57:10 +00:00
Kelvin Zhang
e30ed7c8da Add snapuserd/e2fsprogs/f2fs-tools to init_boot partition 
Anything remotely related to first stage init should be added to
init_boot

Test: th
Bug: 219841787

Change-Id: I60ada5ff426b04f3e4f842ad7a714615fcc7cb77
 2022-03-09 15:12:43 -08:00
Bob Badour
289f6e10be Handle symlink license metadata. 
Add target to force-build all license metadata.

Bug: 68860345
Bug: 151177513
Bug: 151953481
Bug: 213388645
Bug: 210912771

Test: m alllicensemetadata reportmissinglicenses
Change-Id: Iab3a41a232438e857d23674e0e1230d4d0336466
 2022-03-09 13:38:37 -08:00
Treehugger Robot
ea4fc4317f Merge "Fix Markdown formatting." am: f2b4e873ec am: 2be08d1f55 
Original change: https://android-review.googlesource.com/c/platform/build/+/2018755

Change-Id: I07dfad00ee7de9a2112e963d2d49e4c33e234741
 2022-03-09 19:30:31 +00:00
Treehugger Robot
2be08d1f55 Merge "Fix Markdown formatting." am: f2b4e873ec 
Original change: https://android-review.googlesource.com/c/platform/build/+/2018755

Change-Id: If84743a6f362fb0bb7bf8aef8c110129aba3bb56
 2022-03-09 18:55:15 +00:00
Treehugger Robot
f2b4e873ec Merge "Fix Markdown formatting." 2022-03-09 18:31:50 +00:00
Andrew Walbran
9b255832cd Fix Markdown formatting. 
Change-Id: Id3bacc2cd5cad775199f9793f5da2607ea3e76c3
 2022-03-09 14:51:51 +00:00
Bowgo Tsai
341fe02903 validate_target_files: support gki_arm64 
gki_arm64 is a special target to build multiple GKI boot-*.img
files. It has neither system.img nor vbmeta.img. Skips checking
system.img and vbmeta.img in this case.

Bug: 223078405
Test: validate_target_files signed-gki_arm64-target_files-8277156.zip
Change-Id: I9d3c102c11787cf70c1e1fc8e6a552f8fd19ff72
 2022-03-09 16:35:19 +08:00
David Anderson
0a132b5e2f Merge "build_image: Remove mkerofsimage.sh." am: 060505fb4a am: c836e2e090 
Original change: https://android-review.googlesource.com/c/platform/build/+/2008730

Change-Id: Ic225d0a3602e36448375ab1e0af75d7a35ece4f4
 2022-03-09 05:04:49 +00:00
David Anderson
c836e2e090 Merge "build_image: Remove mkerofsimage.sh." am: 060505fb4a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2008730

Change-Id: Ia1cfe5a70b4a968a00f0049bb1ef5e74d88b0afe
 2022-03-09 04:28:41 +00:00
David Anderson
060505fb4a Merge "build_image: Remove mkerofsimage.sh." 2022-03-09 04:04:05 +00:00
Treehugger Robot
9d1a765321 Merge "Fix small typo in ota script options" am: 0cc4ae84ea am: 3874e5dae6 
Original change: https://android-review.googlesource.com/c/platform/build/+/2015628

Change-Id: Ie4a92799ef9371c0de8e68450a99201ae99b55fa
 2022-03-09 03:53:36 +00:00
Treehugger Robot
3874e5dae6 Merge "Fix small typo in ota script options" am: 0cc4ae84ea 
Original change: https://android-review.googlesource.com/c/platform/build/+/2015628

Change-Id: I46e0be664736c41daafdeff4cbbcb4e1b282410c
 2022-03-09 03:26:22 +00:00
Treehugger Robot
0cc4ae84ea Merge "Fix small typo in ota script options" 2022-03-09 03:06:26 +00:00
Kelvin Zhang
4c7d62c1d7 Merge "Simplify codes when _LoadOemDicts" am: ff35cbd110 am: f31a78141f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2015235

Change-Id: Ibf825099116538ae46d8d706b8f10a9cf6902906
 2022-03-09 00:03:36 +00:00
Kelvin Zhang
f31a78141f Merge "Simplify codes when _LoadOemDicts" am: ff35cbd110 
Original change: https://android-review.googlesource.com/c/platform/build/+/2015235

Change-Id: Ib5914ee1fe6edc7710d998d196b8113bcc8ca65c
 2022-03-08 23:38:18 +00:00
Daniel Norman
fd2e681400 Merge "Fix META/care_map.pb generation." am: 986582f262 am: 4bcec72be1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2008564

Change-Id: I90bcdab78736b647ee3725896cf60c769b67b450
 2022-03-08 23:27:56 +00:00
Kelvin Zhang
ff35cbd110 Merge "Simplify codes when _LoadOemDicts" 2022-03-08 23:16:32 +00:00
Kelvin Zhang
318a464a71 Fix small typo in ota script options 
"enable_zucchin" was used instead of "enable_zucchini"

Test: th
Change-Id: Iaccb07bc6913a28c021fe84d3faeb59504ea1fbb
 2022-03-08 15:13:01 -08:00
Daniel Norman
4bcec72be1 Merge "Fix META/care_map.pb generation." am: 986582f262 
Original change: https://android-review.googlesource.com/c/platform/build/+/2008564

Change-Id: Iaeb4e04ee57543a81a338d57624466ca0c5517e4
 2022-03-08 23:02:29 +00:00
Daniel Norman
986582f262 Merge "Fix META/care_map.pb generation." 2022-03-08 22:42:54 +00:00
Treehugger Robot
ff1eb87176 Merge "Remove duplicate slashes from find_and_copy results" am: 057667a90f am: 4ea401ac58 
Original change: https://android-review.googlesource.com/c/platform/build/+/2011795

Change-Id: I9feb6ebcf98b006d7356bbacc3f353f215c51975
 2022-03-08 21:13:26 +00:00
Treehugger Robot
4ea401ac58 Merge "Remove duplicate slashes from find_and_copy results" am: 057667a90f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2011795

Change-Id: Ia9047488f88a379c86178be447c126cecd46b8c6
 2022-03-08 20:47:27 +00:00
Treehugger Robot
057667a90f Merge "Remove duplicate slashes from find_and_copy results" 2022-03-08 20:25:40 +00:00
Daniel Norman
799a18c82e Fix META/care_map.pb generation. 
In https://r.android.com/1991151 we removed an extra call to
AddCareMapForAbOta() from generate_care_map(), since
AddCareMapForAbOta() is already called by add_img_to_target_files.

However, when add_img_to_target_files generated care_map.pb it
didn't have the proper partition *_image_size values set for
images copied directly from the input target files packages.
This was because the generate_care_map() function, which sets
those *_image_size values, was executed after add_img_to_target_files.

At best this meant that care_map.pb was missing some information.
At worst, care_map.pb is missing entirely (when all images are
copied instead of regenerated).

This change:
- Renames generate_care_map() to set_copied_image_size_props()
  and simplifies the logic a bit.
- Calls set_copied_image_size_props() before calling
  add_img_to_target_files. Now, add_img_to_target_files will
  have all necessary *_image_size values to perform the
  META/care_map.pb generation step.

Bug: 187432243
Bug: 221858722
Bug: 223198503
Test: Use to create a merged build that does not regenerate any images.
      Observe that META/care_map.pb is now generated as expected.
Change-Id: I1b3c8636be8cbe203222e60b1272a5e11f68589b
 2022-03-08 19:02:51 +00:00
Xin Li
49d1af3469 [automerger skipped] Merge "Merge Android 12L" am: 7d4b3d25e7 -s ours am: c024e0963c -s ours 
am skip reason: Merged-In I367438214a7649cade2396b48ed3efb14b564075 with SHA-1 a05fb4002b is already in history

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

Change-Id: I705f0e7ff1fa9d6ea3ae3a513678e2b611078331
 2022-03-08 11:07:23 +00:00
Xin Li
63db12dd96 [automerger skipped] Merge Android 12L am: 62a34ff6af -s ours am: f08db68a16 -s ours 
am skip reason: Merged-In I367438214a7649cade2396b48ed3efb14b564075 with SHA-1 a05fb4002b is already in history

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

Change-Id: If357eb368a4370f695c7d71d2f9c44aaeba64b15
 2022-03-08 11:04:10 +00:00
jiajia tang
c7c8697a62 Simplify codes when _LoadOemDicts 
Use function LoadDictionaryFromFile(), instead of
LoadDictionaryFromLines(). Makes codes conciser.

Signed-off-by: jiajia tang <tangjiajia@xiaomi.com>
Change-Id: I15d6d4281a03be8a2f6f855054b1e4c1c3010fcd
 2022-03-08 18:27:24 +08:00
Xin Li
c024e0963c [automerger skipped] Merge "Merge Android 12L" am: 7d4b3d25e7 -s ours 
am skip reason: Merged-In I367438214a7649cade2396b48ed3efb14b564075 with SHA-1 a05fb4002b is already in history

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

Change-Id: Ia11056b6fd137b8b23c790e861cef9fb51868c90
 2022-03-08 10:22:35 +00:00
Xin Li
f08db68a16 [automerger skipped] Merge Android 12L am: 62a34ff6af -s ours 
am skip reason: Merged-In I367438214a7649cade2396b48ed3efb14b564075 with SHA-1 a05fb4002b is already in history

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

Change-Id: I82d3a3811146814bbe2c8c66683deccadc0e5eea
 2022-03-08 10:19:19 +00:00
Treehugger Robot
a4f041052d Merge "Accept CLANG_COVERAGE_CONTINUOUS_MODE build variable" am: 026abf7bad am: f2d2483caa 
Original change: https://android-review.googlesource.com/c/platform/build/+/2007976

Change-Id: I826ee9af75d7ab43dcabb90a7b8559aca4cc554a
 2022-03-08 07:31:49 +00:00
Treehugger Robot
f2d2483caa Merge "Accept CLANG_COVERAGE_CONTINUOUS_MODE build variable" am: 026abf7bad 
Original change: https://android-review.googlesource.com/c/platform/build/+/2007976

Change-Id: I92cc9137798da4fd5bc6f3a0bbde2e943e2b1d73
 2022-03-08 06:57:49 +00:00
Xin Li
7d4b3d25e7 Merge "Merge Android 12L" 2022-03-08 06:53:53 +00:00
Treehugger Robot
026abf7bad Merge "Accept CLANG_COVERAGE_CONTINUOUS_MODE build variable" 2022-03-08 06:37:02 +00:00
Alexander Smundak
c0cdc652c3 Merge changes Iacd23cec,I6b9b3bd4 am: 842733cb67 am: b560c0cbf0 
Original change: https://android-review.googlesource.com/c/platform/build/+/2006783

Change-Id: Id0342fcb1d97c826ac2abef4ce76176d4d726c30
 2022-03-08 01:56:01 +00:00
Alexander Smundak
b560c0cbf0 Merge changes Iacd23cec,I6b9b3bd4 am: 842733cb67 
Original change: https://android-review.googlesource.com/c/platform/build/+/2006783

Change-Id: I1fdaf6335913ed8255ef891bb517b2542efe29d0
 2022-03-08 01:33:03 +00:00
Alexander Smundak
842733cb67 Merge changes Iacd23cec,I6b9b3bd4 
* changes:
  Add an option to use Starlark-based configuration by default.
  Clean up product definitions reading.
 2022-03-08 01:07:14 +00:00
Xin Li
62a34ff6af Merge Android 12L 
Bug: 222710654
Merged-In: I367438214a7649cade2396b48ed3efb14b564075
Change-Id: I78e650920f9cf47c1eaaa259103f8f95d3368f4c
 2022-03-08 00:13:48 +00:00
Sasha Smundak
b87b773042 Add an option to use Starlark-based configuration by default. 
In order to use Starlark-based product and board configuration for
a product, add its name to the STARLARK_OPT_IN_PRODUCTS list in
the AndroidProducts.mk file where this product is defined.

Fixes: 220379303
Test: Temporarily added STARLARK_OPT_IN_PRODUCTS to build/make/target/product/AndroidProducts.mk
Change-Id: Iacd23cec00a7a1958701873bce0fc9d5f79b1f17
 2022-03-07 11:26:59 -08:00
Sasha Smundak
d40c94633b Clean up product definitions reading. 
Bug: 220379303
Test: treehugger
Change-Id: I6b9b3bd486a1680ace8278eb5160e09885543f4b
 2022-03-07 11:25:58 -08:00
Cole Faust
c6de8d531c Remove duplicate slashes from find_and_copy results 
The make version, find-copy-subdir-files, has very
similiar functionality: it adds `| sed "s://:/:g"`
to its results.

Fixes: 223221122
Test: Manually
Change-Id: Iaac96f760d46304aed27a7d31bb4e8bd930c2c55
 2022-03-07 11:14:56 -08:00
Dario Freni
63328a59db Merge "Build modules from source by default." am: ec63efddf9 am: a05fb4002b 
Original change: https://android-review.googlesource.com/c/platform/build/+/1998880

Change-Id: I23f70bd3c0531f3dc5b8abcd08b3fabc9420d7dd
 2022-03-07 17:48:38 +00:00