StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
71,577 Commits 1 Branch 0 Tags
1d7923e7d83f95f75618a4b96d17ca1ac479c35d
Commit Graph

71577 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sasha Smundak
1d7923e7d8 Move the stable code from version_defaults.mk to version_util.mk. 
With version_defaults.mk containing only simple assignments, it can be
automatically converted to Starlark.
This is a cherrypick of ag/15768054

Bug: 198995713
Test: treehugger
Change-Id: I4798fb69c639e6d52d275a5b793fa0c8ba876202
Merged-In: I4798fb69c639e6d52d275a5b793fa0c8ba876202
 2021-09-14 08:53:10 -07:00
Daniel Norman
38345348a8 Merge "Rebuild vendor images in sign_target_files_apks with vendor otatools." am: 97e0c2831d am: 76e3a8419c 
Original change: https://android-review.googlesource.com/c/platform/build/+/1782407

Change-Id: I36c911298fbc1fa8e38accb3b0ee2d86b4fefda4
 2021-09-13 20:48:45 +00:00
Daniel Norman
76e3a8419c Merge "Rebuild vendor images in sign_target_files_apks with vendor otatools." am: 97e0c2831d 
Original change: https://android-review.googlesource.com/c/platform/build/+/1782407

Change-Id: I43f9b2dca35442b8afef80fa84e36db811364453
 2021-09-13 20:33:30 +00:00
Daniel Norman
97e0c2831d Merge "Rebuild vendor images in sign_target_files_apks with vendor otatools." 2021-09-13 20:12:11 +00:00
Yifan Hong
6edb95a4bd Merge "Avoid repeated building of erofs image" am: 1ab1c2ff96 am: b74a004520 
Original change: https://android-review.googlesource.com/c/platform/build/+/1821096

Change-Id: I90198047d639debe9332828c2fc098f291e9e45d
 2021-09-11 00:33:44 +00:00
Yifan Hong
b74a004520 Merge "Avoid repeated building of erofs image" am: 1ab1c2ff96 
Original change: https://android-review.googlesource.com/c/platform/build/+/1821096

Change-Id: Ibe47f2192262300122e8d6b767a2879af3d317ed
 2021-09-11 00:19:15 +00:00
Yifan Hong
1ab1c2ff96 Merge "Avoid repeated building of erofs image" 2021-09-11 00:05:45 +00:00
Bob Badour
0adcb0c7f6 Merge "Re-call BUILD_NOTICE_FILE for modules that add deps" am: 08472a6b4b am: 98fd5d25d7 
Original change: https://android-review.googlesource.com/c/platform/build/+/1817318

Change-Id: I058553fbd3ccb184b562c0fca9d512a4e666bcd6
 2021-09-10 17:38:40 +00:00
Bob Badour
98fd5d25d7 Merge "Re-call BUILD_NOTICE_FILE for modules that add deps" am: 08472a6b4b 
Original change: https://android-review.googlesource.com/c/platform/build/+/1817318

Change-Id: I0b3e806c6ef03de8e8fa5ae4120d3194f9f8b1f9
 2021-09-10 17:22:16 +00:00
Bob Badour
08472a6b4b Merge "Re-call BUILD_NOTICE_FILE for modules that add deps" 2021-09-10 16:59:06 +00:00
Yi Kong
bc7eeebaa3 Merge "Fix arguments passed to llvm-readobj" am: c48a9fb19c am: 5353d0f3b9 
Original change: https://android-review.googlesource.com/c/platform/build/+/1823794

Change-Id: If8aaa49e5dc408bab83f2f2470a9df0e81dc2981
 2021-09-10 15:58:09 +00:00
Yi Kong
5353d0f3b9 Merge "Fix arguments passed to llvm-readobj" am: c48a9fb19c 
Original change: https://android-review.googlesource.com/c/platform/build/+/1823794

Change-Id: I93dcd361b4139b02679d077a70b078bc08713e8a
 2021-09-10 15:28:13 +00:00
Yi Kong
c48a9fb19c Merge "Fix arguments passed to llvm-readobj" 2021-09-10 15:15:08 +00:00
Yi Kong
8b50dea627 Fix arguments passed to llvm-readobj 
Upstream llvm-readobj no longer accepts single dash prefix for long
options. Changed to double dash.

Also let the script to raise exception if rc is non-zero, to avoid
getting confusing error later in the program.

Test: build
Bug: 197230471
Change-Id: I364f51322904431d430549f79af58f455f47e028
 2021-09-10 21:17:45 +08:00
Tianjie Xu
43af41b52b Merge "Add option to override minor version" am: 48662b25fc am: 8e6eae32d6 
Original change: https://android-review.googlesource.com/c/platform/build/+/1822181

Change-Id: I438282f44c15eca2388350b2f74bff72a32b7647
 2021-09-10 06:28:43 +00:00
Tianjie Xu
8e6eae32d6 Merge "Add option to override minor version" am: 48662b25fc 
Original change: https://android-review.googlesource.com/c/platform/build/+/1822181

Change-Id: Ifc46f3fba3277d525845d6bab3c4e13cc8f313c2
 2021-09-10 06:00:42 +00:00
Tianjie Xu
48662b25fc Merge "Add option to override minor version" 2021-09-10 05:48:01 +00:00
Bill Yi
dea52084e2 [automerger skipped] Merge "Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE" am: 7039269418 -s ours am: ddb639b84d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia011999ddf66a8edc77e187c43f020989094d2c4
 2021-09-09 22:11:55 +00:00
Bill Yi
ddb639b84d [automerger skipped] Merge "Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE" am: 7039269418 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie40b131dde917f11289f347d4eaaefd715418403
 2021-09-09 21:39:33 +00:00
Bill Yi
7039269418 Merge "Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE" 2021-09-09 21:27:25 +00:00
Bob Badour
58c4535b7e Re-call BUILD_NOTICE_FILE for modules that add deps 
The normal pattern is:

1. Set a bunch of variables like LOCAL_MODULE
2. Include a makefile specific to the module type
3. The included file in turn includes base_rules.mk
4. At the end of base_rules.mk, it include notice_files.mk
5. The included file declares a build rule and finishes.

The below files included for some module types add additional
dependencies after returning from base_rules.mk, which are not
reflected in the notice files.

Including notice_files.mk a 2nd time adds these dependencies.

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Test: m systemlicense

Change-Id: I030399ffb13a2cfb58cf583ae5a2e418f5dbc534
 2021-09-09 20:09:13 +00:00
Tianjie
e7ab38d964 Add option to override minor version 
Pass the minor version override to delta_generator. So we can test
features in tradefed before releasing it to droidfoods.

Bug: 197361113
Test: TH
Change-Id: Ie8846935dfa13784f0745513be13811908f44ac3
 2021-09-09 12:16:19 -07:00
Daniel Norman
a1094e9f0c Rebuild vendor images in sign_target_files_apks with vendor otatools. 
This is needed until image compilation tooling is backwards compatible.

Bug: 188491126
Bug: 192253131
Bug: 192422274
Test: Sign a GRF R+S merged target_files package using:
      sign_target_files_apks \
        --vendor_otatools=<otatools.zip from R> \
	--vendor_partitions=vendor,odm,vbmeta \
	merged-target_files.zip \
	signed-target_files.zip
Change-Id: Iec208f544b56f8ed577344d8d6ca904773d8baab
 2021-09-09 17:32:22 +00:00
Huang Jianan
ffa1d57819 Avoid repeated building of erofs image 
The image size of erofs is only affected by the content of the input
file, so it doesn't care about the input image_size. In addition, the
build time of erofs image is longer than ext4 due to compression. Only
execute mkfs once to reduce unnecessary time consumption.

Bug: 199248596
Test: erofs image build faster than before
Signed-off-by: Huang Jianan <huangjianan@oppo.com>
Change-Id: I23a4e640d5066485de3fea0f808998045e716d1f
 2021-09-09 14:18:59 +08:00
Sarah Chin
720d0286ea [automerger skipped] Merge "Add Radio AIDL to VNDK" am: 355f345956 -s ours am: a10ffc2c5f -s ours 
am skip reason: Merged-In I95d089fb23c4a3baa7f7a6c1435099f34a1af5a3 with SHA-1 c68e0808ae is already in history

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

Change-Id: I977329b29a76e7f77c061fff591c28c3c06b1ab0
 2021-09-09 05:53:11 +00:00
Sarah Chin
a10ffc2c5f [automerger skipped] Merge "Add Radio AIDL to VNDK" am: 355f345956 -s ours 
am skip reason: Merged-In I95d089fb23c4a3baa7f7a6c1435099f34a1af5a3 with SHA-1 c68e0808ae is already in history

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

Change-Id: Id16d4bba9c85f8d60250a3464af00e0cdc69b373
 2021-09-09 05:34:09 +00:00
Sarah Chin
355f345956 Merge "Add Radio AIDL to VNDK" 2021-09-09 05:21:43 +00:00
Sarah Chin
a4b4d7a8a7 Merge "Add Radio AIDL to VNDK" into stage-aosp-master am: d0a58e8d6e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15749448

Change-Id: Id31822c3fb98504d653969e6670c82e8b943a4b3
 2021-09-09 04:40:51 +00:00
Sarah Chin
d0a58e8d6e Merge "Add Radio AIDL to VNDK" into stage-aosp-master 2021-09-09 04:25:24 +00:00
Bill Yi
82731b2c2b Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE 
Merged-In: Ia11cb981f28bec05ba4019a3a05126be5059697e
Merged-In: I80d428b99bd42a98ae1ae4a837447da19478c01e
Merged-In: I80d428b99bd42a98ae1ae4a837447da19478c01e
Change-Id: Ic7a5c91900588666ef3c6ed152ae2d80ca13772d
 2021-09-08 18:01:21 -07:00
David Anderson
5b5b019864 Merge "Don't sparse right-sized ext4 and erofs images." am: c01c341b6a am: 7700de1d52 
Original change: https://android-review.googlesource.com/c/platform/build/+/1811336

Change-Id: I0f156a7db11d9a9fbd4c0758e8119f2cbbf3bee0
 2021-09-08 22:53:44 +00:00
David Anderson
7700de1d52 Merge "Don't sparse right-sized ext4 and erofs images." am: c01c341b6a 
Original change: https://android-review.googlesource.com/c/platform/build/+/1811336

Change-Id: Ia11cb981f28bec05ba4019a3a05126be5059697e
 2021-09-08 22:40:41 +00:00
David Anderson
c01c341b6a Merge "Don't sparse right-sized ext4 and erofs images." 2021-09-08 22:25:37 +00:00
Sarah Chin
c68e0808ae Add Radio AIDL to VNDK 
Test: build
Bug: 198331182
Change-Id: I95d089fb23c4a3baa7f7a6c1435099f34a1af5a3
Merged-In: I95d089fb23c4a3baa7f7a6c1435099f34a1af5a3
 2021-09-08 19:09:08 +00:00
Sarah Chin
59f77a7249 Add Radio AIDL to VNDK 
Test: build
Bug: 198331182
Change-Id: I95d089fb23c4a3baa7f7a6c1435099f34a1af5a3
Merged-In: I95d089fb23c4a3baa7f7a6c1435099f34a1af5a3
 2021-09-08 17:31:22 +00:00
Treehugger Robot
5e22baa738 Merge "Allow overriding SOONG_CONFIG_art_module_source_build to false." am: 2126602216 am: efd51012ed 
Original change: https://android-review.googlesource.com/c/platform/build/+/1801147

Change-Id: Iadb032525bf451d6c7061f67ffbe83a1f7956d5a
 2021-09-08 15:40:24 +00:00
Treehugger Robot
efd51012ed Merge "Allow overriding SOONG_CONFIG_art_module_source_build to false." am: 2126602216 
Original change: https://android-review.googlesource.com/c/platform/build/+/1801147

Change-Id: I4222cf04cc76c1e3e8549e3a384218d3f4cb22b7
 2021-09-08 15:26:01 +00:00
Treehugger Robot
2126602216 Merge "Allow overriding SOONG_CONFIG_art_module_source_build to false." 2021-09-08 15:04:57 +00:00
Lukács T. Berki
9455e74682 Merge "Remove soong_docs from droidcore." am: f999a9d145 am: 0dae6f9daa 
Original change: https://android-review.googlesource.com/c/platform/build/+/1818099

Change-Id: Ic374edf7033c3eb784fd477788c69a22c37d8d5e
 2021-09-08 13:53:12 +00:00
Lukács T. Berki
0dae6f9daa Merge "Remove soong_docs from droidcore." am: f999a9d145 
Original change: https://android-review.googlesource.com/c/platform/build/+/1818099

Change-Id: I28685ea07309b5ffebb44bc62149bef8b4dd3d20
 2021-09-08 13:39:20 +00:00
Lukács T. Berki
f999a9d145 Merge "Remove soong_docs from droidcore." 2021-09-08 13:16:50 +00:00
Treehugger Robot
3622de339a Merge "Disable the delete_all_keys feature for GSI" am: 2215f2cbae am: 441a92cc5c 
Original change: https://android-review.googlesource.com/c/platform/build/+/1821093

Change-Id: Iff38ddfc94e709ed318c6a016d8eba04ca10e1d4
 2021-09-08 08:26:32 +00:00
Treehugger Robot
441a92cc5c Merge "Disable the delete_all_keys feature for GSI" am: 2215f2cbae 
Original change: https://android-review.googlesource.com/c/platform/build/+/1821093

Change-Id: I091f21c0b238e772e53fca06fa41dc6d74c42e9a
 2021-09-08 08:13:43 +00:00
Treehugger Robot
2215f2cbae Merge "Disable the delete_all_keys feature for GSI" 2021-09-08 08:01:23 +00:00
Lukacs T. Berki
043f3a1897 Remove soong_docs from droidcore. 
soong_docs will be run directly from soong_ui so it won't have a
corresponding Make target.

Test: Presubmits.
Change-Id: Id7abccdf2ea3830edf6043c10b617bddf4f9c86d
 2021-09-08 08:24:33 +02:00
Howard Chen
994e4a54f4 Disable the delete_all_keys feature for GSI 
Bug: 197914756
Test: run GSI with DSU on a Pixel device

Change-Id: I78ee95f99764bee71bf3bcccb992ee35fa80603b
 2021-09-08 13:18:10 +08:00
Linzhao Ye
d268d9c545 Merge "Add Wifi HostApd AIDL interface support." am: cfa99e3596 am: ca4211dd02 
Original change: https://android-review.googlesource.com/c/platform/build/+/1794735

Change-Id: I709354b69af62931cb202cacdf8ff2983280e4e2
 2021-09-07 17:53:54 +00:00
Linzhao Ye
ca4211dd02 Merge "Add Wifi HostApd AIDL interface support." am: cfa99e3596 
Original change: https://android-review.googlesource.com/c/platform/build/+/1794735

Change-Id: Ie39b75d484698a4e402129204f18cf928c933924
 2021-09-07 17:35:53 +00:00
Linzhao Ye
cfa99e3596 Merge "Add Wifi HostApd AIDL interface support." 2021-09-07 17:15:33 +00:00
Treehugger Robot
d6d5fbd463 Merge "Replace GENERATE_BAZEL_FILES=1 with "m bp2build"." am: f673d10736 am: af7f572207 
Original change: https://android-review.googlesource.com/c/platform/build/+/1818098

Change-Id: I8571df2a07f3050ff7562c08c5cd8fd37d4090f4
 2021-09-07 09:58:34 +00:00