StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
73,666 Commits 1 Branch 0 Tags
2ba4030ac0437fa1b10c17869fb8d337650c518d
Commit Graph

73666 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
2ba4030ac0 Merge "Avoid packing ramdisk into GKI boot-*.img" am: bd5fd25265 am: a551c5d3d1 
Original change: https://android-review.googlesource.com/c/platform/build/+/1937120

Change-Id: I03570bb204f5d4f5a8c00a45c4867a859661f00a
 2022-01-07 03:06:08 +00:00
Treehugger Robot
a551c5d3d1 Merge "Avoid packing ramdisk into GKI boot-*.img" am: bd5fd25265 
Original change: https://android-review.googlesource.com/c/platform/build/+/1937120

Change-Id: I3d581b4d908ba8ab4760dc0ee415736f6406108a
 2022-01-07 02:51:51 +00:00
Treehugger Robot
bd5fd25265 Merge "Avoid packing ramdisk into GKI boot-*.img" 2022-01-07 02:35:06 +00:00
Bill Yi
098bfa13e2 [automerger skipped] Merge "Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 4867e1ad0e -s ours 
am skip reason: Merged-In Idef27f4e0cd2e7a44a74a7be00fcc897d0a54128 with SHA-1 a0e28118af is already in history

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

Change-Id: I71f542d511cf6397d84d40b1fb688c307cdd386e
 2022-01-07 02:01:48 +00:00
Bill Yi
4867e1ad0e Merge "Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master 2022-01-07 01:41:28 +00:00
Treehugger Robot
ca2783c384 Merge "Export test data dependencies in module-info" am: 802c86f831 am: 2a04f251b9 
Original change: https://android-review.googlesource.com/c/platform/build/+/1928387

Change-Id: I1b42b3e7acdaa94a6b6b1920159c481e6f814995
 2022-01-07 01:15:32 +00:00
Treehugger Robot
2a04f251b9 Merge "Export test data dependencies in module-info" am: 802c86f831 
Original change: https://android-review.googlesource.com/c/platform/build/+/1928387

Change-Id: I017a5d9c3cd227e0b1a4deaa8dface646bc0a887
 2022-01-07 00:54:01 +00:00
Treehugger Robot
802c86f831 Merge "Export test data dependencies in module-info" 2022-01-07 00:36:54 +00:00
Spandan Das
0d3e1277c6 Merge "Move manifest generation logic into static_java_library.mk" am: 13daf3d4a2 am: 362bf03c3b 
Original change: https://android-review.googlesource.com/c/platform/build/+/1835800

Change-Id: Ie3d1f00336f86542103bda4b33d9b9d03e9e3927
 2022-01-06 23:00:13 +00:00
Spandan Das
362bf03c3b Merge "Move manifest generation logic into static_java_library.mk" am: 13daf3d4a2 
Original change: https://android-review.googlesource.com/c/platform/build/+/1835800

Change-Id: Ic71cff4d144e66e4528da4afe9b799eabb4aa723
 2022-01-06 22:40:27 +00:00
Spandan Das
13daf3d4a2 Merge "Move manifest generation logic into static_java_library.mk" 2022-01-06 22:21:03 +00:00
Spandan Das
68684bea79 Move manifest generation logic into static_java_library.mk 
Previously a manifest file would be generated for static_java_library.mk
and package_internal.mk. For pacakge_internal.mk, this would cause
cryptic errors like b/188612215#2

With this CL, a manifest file would only be generated for java_library
with need_compile_res == true. The advantages are
1. No redundant generation for java_library with need_compile_res == false
(i.e. modules that do not require aapt2)
2. Force devs to provide manifest for android_app, and not silently
generating one for them

Bug: 188652897
Test: TH
Test: m nothing in tv-dev, car-dev

Change-Id: I69a23e373f1b4ac1569ae5b1d36067bfc0dadc05
 2022-01-06 18:47:57 +00:00
Treehugger Robot
49aceda26d Merge "Fix build error on empty root folder" am: e33e7e518c am: 7e2a59a139 
Original change: https://android-review.googlesource.com/c/platform/build/+/1934213

Change-Id: Iff59cf36aba9c8db81765df61e40724b762dedaf
 2022-01-06 14:38:40 +00:00
Treehugger Robot
7e2a59a139 Merge "Fix build error on empty root folder" am: e33e7e518c 
Original change: https://android-review.googlesource.com/c/platform/build/+/1934213

Change-Id: I0c5b687ae5b69a1394e649b486b9ed11cd1d3d45
 2022-01-06 14:17:48 +00:00
Treehugger Robot
e33e7e518c Merge "Fix build error on empty root folder" 2022-01-06 13:54:27 +00:00
Bowgo Tsai
88fc2bdd19 Avoid packing ramdisk into GKI boot-*.img 
If init_boot.img is present, the GKI boot-*.img should
not include the ramdisk because the ramdisk will be packed
into the init_boot.img instead.

The "has_ramdisk" flag incorrectly checks the condition of:
prebuilt_name != "boot.img" to see if it is a boot.img.
Because "has_ramdisk" was added before we packed multiple
GKI boot-*.img, e.g., boot-5.10.img, boot-5.10-lz4.img, etc.,
into the target files.

Fix this by checking the partition_name is "boot" or not.
Also moving the logic into a new function with comments for each
condition.

Bug: 203698939
Bug: 213028932
Test: sign_target_files_apks \
        --gki_signing_key=external/avb/test/data/testkey_rsa4096.pem \
        --gki_signing_algorithm=SHA256_RSA4096 \
        ./out/dist/*-target_files-eng.*.zip signed.zip, then
        unpack_bootimg to checks the signed boot-*.img has no ramdisk
Change-Id: I5354669feb54d547dbe797e51b1b1baa187cb7cf
 2022-01-06 17:50:04 +08:00
Jacky Liu
429e1f339b Merge "Add PRODUCT_EXTRA_OTA_KEYS to add extra ota keys in otacerts.zip" am: bff997fd1f am: 4f9eb6b9e4 
Original change: https://android-review.googlesource.com/c/platform/build/+/1934214

Change-Id: I1c164c7697ae10012f540677ce2423fe014e5e18
 2022-01-06 06:58:05 +00:00
Treehugger Robot
2a00929dec Merge "Fix the signing error on no-system-image targets" am: 790214a4c9 am: ba922579b1 
Original change: https://android-review.googlesource.com/c/platform/build/+/1936199

Change-Id: I74abbf8b433aa0db2cc7d9bfde0ba59386e8a0aa
 2022-01-06 06:57:55 +00:00
Jacky Liu
4f9eb6b9e4 Merge "Add PRODUCT_EXTRA_OTA_KEYS to add extra ota keys in otacerts.zip" am: bff997fd1f 
Original change: https://android-review.googlesource.com/c/platform/build/+/1934214

Change-Id: I46e405153c4a87a960d037312eb99c31103c8efc
 2022-01-06 06:43:51 +00:00
Treehugger Robot
ba922579b1 Merge "Fix the signing error on no-system-image targets" am: 790214a4c9 
Original change: https://android-review.googlesource.com/c/platform/build/+/1936199

Change-Id: Ibc68ce8875eb50e4e52526787a48ceece66f2f42
 2022-01-06 06:43:41 +00:00
Jacky Liu
bff997fd1f Merge "Add PRODUCT_EXTRA_OTA_KEYS to add extra ota keys in otacerts.zip" 2022-01-06 06:31:37 +00:00
Treehugger Robot
790214a4c9 Merge "Fix the signing error on no-system-image targets" 2022-01-06 06:27:17 +00:00
Bill Yi
f6125cb188 Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE 
Merged-In: Idef27f4e0cd2e7a44a74a7be00fcc897d0a54128
Change-Id: Ice7e337af7767a7c1a66a66c11fa37a8a69476df
 2022-01-05 21:10:46 -08:00
Treehugger Robot
a0e28118af Merge "Calls check-and-set-avb-args() when the system.img exists" am: 99bec02344 am: 7238491c1c 
Original change: https://android-review.googlesource.com/c/platform/build/+/1934176

Change-Id: Idef27f4e0cd2e7a44a74a7be00fcc897d0a54128
 2022-01-06 04:26:45 +00:00
Treehugger Robot
7238491c1c Merge "Calls check-and-set-avb-args() when the system.img exists" am: 99bec02344 
Original change: https://android-review.googlesource.com/c/platform/build/+/1934176

Change-Id: Iefb3ca4f4b5ccd562fc2502f480a53e29d6bec05
 2022-01-06 04:14:33 +00:00
Treehugger Robot
99bec02344 Merge "Calls check-and-set-avb-args() when the system.img exists" 2022-01-06 03:58:08 +00:00
Treehugger Robot
c7142be738 Merge "Show directories and files with most warnings." am: b2610d7ecd am: 756adcf38b 
Original change: https://android-review.googlesource.com/c/platform/build/+/1927679

Change-Id: I7bddd25d4bf41bb0a7b744dc03567af077d3e599
 2022-01-06 03:42:53 +00:00
Treehugger Robot
756adcf38b Merge "Show directories and files with most warnings." am: b2610d7ecd 
Original change: https://android-review.googlesource.com/c/platform/build/+/1927679

Change-Id: I9689ecd94e9258444c35f144a41cf832f077cb67
 2022-01-06 03:32:18 +00:00
Treehugger Robot
b2610d7ecd Merge "Show directories and files with most warnings." 2022-01-06 03:19:15 +00:00
Chih-Hung Hsieh
d4691ecfb6 Show directories and files with most warnings. 
* Now with 4 sections that can be shown/hidden independently.
* After the 'selected_projects' section, add two more sections:
  * 'top_directory_section' contains
    * a table of directories with at least 1% warnings.
    * a 'selected_directory_warnings' subsection to show all warnings
      in the clicked directory from the directory table
  * 'top_file_section' contains
    * a table of files with at least 100 or 1% warnings.
    * a 'selected_file_warnings' subsection to show all warnings
      in the clicked file from the file table
* Adjust button/section spaces and reduce button font size to 100%.
* Rename drawTable to genTables.

Test: warn.py --url=http://cs/android --separator='?l=' build.log > warnings.html
Test: warn.py --gencsv build.log > warnings.csv
Change-Id: I765b09a46adc111cfe781719ba7aa0f917aa6ffc
 2022-01-05 15:43:52 -08:00
Steven Moreland
45259cd69d Merge "Don't require current.txt order." am: 9ca3c34646 am: 8e9e313bf4 
Original change: https://android-review.googlesource.com/c/platform/build/+/1932881

Change-Id: I7151ea279399186b7bf166029258666a424bf60d
 2022-01-05 22:37:58 +00:00
Steven Moreland
8e9e313bf4 Merge "Don't require current.txt order." am: 9ca3c34646 
Original change: https://android-review.googlesource.com/c/platform/build/+/1932881

Change-Id: I8b0516bc88a7ff47beff54f3c9ca5127b1244da1
 2022-01-05 22:25:21 +00:00
Steven Moreland
9ca3c34646 Merge "Don't require current.txt order." 2022-01-05 22:09:27 +00:00
Wei Su
8623e17527 Merge "Write files in a temporary directory" am: 22ecce0658 am: 5d03df4516 
Original change: https://android-review.googlesource.com/c/platform/build/+/1920697

Change-Id: I2a0f9b311ff91e5d781c3472e297d3c2836d923c
 2022-01-05 20:29:21 +00:00
Wei Su
5d03df4516 Merge "Write files in a temporary directory" am: 22ecce0658 
Original change: https://android-review.googlesource.com/c/platform/build/+/1920697

Change-Id: I1e9dad365256cab96ac06c35f4d87c9cb54704d1
 2022-01-05 20:16:49 +00:00
Wei Su
22ecce0658 Merge "Write files in a temporary directory" 2022-01-05 20:03:07 +00:00
Treehugger Robot
053bce1c76 Merge "Convert generate-self-extracting-archive.py to python 3" am: 7ca77ea994 am: ecf39825f0 
Original change: https://android-review.googlesource.com/c/platform/build/+/1935067

Change-Id: Ia5ca762889bc952b446a4fb11f26b21a349f3695
 2022-01-05 19:32:31 +00:00
Treehugger Robot
ecf39825f0 Merge "Convert generate-self-extracting-archive.py to python 3" am: 7ca77ea994 
Original change: https://android-review.googlesource.com/c/platform/build/+/1935067

Change-Id: I0ecbc11985f863f5e07b5ddce60f0d2ec21bca9c
 2022-01-05 19:14:17 +00:00
Treehugger Robot
7ca77ea994 Merge "Convert generate-self-extracting-archive.py to python 3" 2022-01-05 18:58:58 +00:00
Devin Moore
92ff95e7a3 Merge "Add prebuilt init_boot.img to PREBUILT_IMAGES/" am: 1c33419ed0 am: ba7dcae84b 
Original change: https://android-review.googlesource.com/c/platform/build/+/1936571

Change-Id: I26964a077c8ed0e8a461e6b9de43297cc533f21a
 2022-01-05 17:40:07 +00:00
Devin Moore
ba7dcae84b Merge "Add prebuilt init_boot.img to PREBUILT_IMAGES/" am: 1c33419ed0 
Original change: https://android-review.googlesource.com/c/platform/build/+/1936571

Change-Id: I01cc13d6fa40602cc52ad06ee38edcdbd29bd788
 2022-01-05 17:34:45 +00:00
Treehugger Robot
259deaacd8 Merge "Remove GKI_SIGNING args from recovery & debug boot image build rules" am: 5203f2b1e0 am: af48f4be53 
Original change: https://android-review.googlesource.com/c/platform/build/+/1934208

Change-Id: I7e89eb2089c29eae549af1712ad60f8c619232b4
 2022-01-05 17:33:56 +00:00
Devin Moore
1c33419ed0 Merge "Add prebuilt init_boot.img to PREBUILT_IMAGES/" 2022-01-05 17:22:17 +00:00
Treehugger Robot
af48f4be53 Merge "Remove GKI_SIGNING args from recovery & debug boot image build rules" am: 5203f2b1e0 
Original change: https://android-review.googlesource.com/c/platform/build/+/1934208

Change-Id: I6864296552846e9fc85d807c62fb12b613b3fa15
 2022-01-05 17:16:07 +00:00
Treehugger Robot
5203f2b1e0 Merge "Remove GKI_SIGNING args from recovery & debug boot image build rules" 2022-01-05 17:00:26 +00:00
Jacky Liu
beb0b6927c Add PRODUCT_EXTRA_OTA_KEYS to add extra ota keys in otacerts.zip 
Equivalent to PRODUCT_EXTRA_RECOVERY_KEYS but for A/B OTA.

Bug: 211848136
Test: set PRODUCT_EXTRA_OTA_KEYS and check otacerts.zip
Change-Id: I81e27d12a22b405f6227b09c01ed684dfcede19e
 2022-01-05 17:54:40 +08:00
Yi-Yo Chiang
cd6de3d8bb Remove GKI_SIGNING args from recovery & debug boot image build rules 
These options are for certifying official GKI release, so they should
never be added to build command of recovery.img and boot-debug.img.

Also define gki_signing_signature_args in misc_info.txt iff.
BOARD_GKI_SIGNING_KEY_PATH is defined, so there's one less conditional.
We need to define it even if BOARD_GKI_SIGNING_SIGNATURE_ARGS is empty,
so that sign_target_files_apks.py can modify the option during image
signing.

Bug: 210367929
Test: Presubmit
Change-Id: I9546fcda796586d97af244955e15c1b8dc9f6d92
 2022-01-05 02:59:45 +00:00
yangbill
724565d885 Export test data dependencies in module-info 
Add the list of targets that are handled as data inputs and
required by tests at runtime.

Bug: 205726862
Test: m out/target/product/vsoc_x86_64/module-info.json
Change-Id: Id1468ebaf8f72cf37787f3cc514a29724c115db5
 2022-01-05 10:34:51 +08:00
Treehugger Robot
8949fd3676 Merge "Fix images-for-partitions() for 'init_boot'" am: 8beddf2e7e am: a2b19d4e51 
Original change: https://android-review.googlesource.com/c/platform/build/+/1934174

Change-Id: Ica4eb30dc21573c675db7e6585c5f0043bf32572
 2022-01-05 01:50:23 +00:00
Treehugger Robot
a2b19d4e51 Merge "Fix images-for-partitions() for 'init_boot'" am: 8beddf2e7e 
Original change: https://android-review.googlesource.com/c/platform/build/+/1934174

Change-Id: Ib09c4b73cdcc1b4da56161f37b7dd8bdf4f029d0
 2022-01-05 01:34:10 +00:00