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
211f615ed9
Merge "Add option to override minor version" am: 48662b25fc
am: 8e6eae32d6
am: 43af41b52b
am: 8d71f153f8
am: 8445fe9e33
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1822181
Change-Id: I85667f9c94da47f80555d818f22fb9c64f5f2075
2021-09-10 07:15:08 +00:00
Yi-Yo Chiang
876a3c8934
Roll-forward the VNDK snapshot list of GSI
...
The latest stable SDK version is 31, so add 31 to the list of VNDK
snapshots.
Bug: 196806844
Bug: 198554350
Test: Presubmit
Change-Id: Ia9aab527d9c1fe1d1eb6c72ebc184a3fccad6a22
Merged-In: Ia9aab527d9c1fe1d1eb6c72ebc184a3fccad6a22
2021-09-10 07:14:40 +00:00
Tianjie Xu
8445fe9e33
Merge "Add option to override minor version" am: 48662b25fc
am: 8e6eae32d6
am: 43af41b52b
am: 8d71f153f8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1822181
Change-Id: I9ec04285dfe8c6c0e5508415273553f8e5e0b503
2021-09-10 07:02:04 +00:00
Tianjie Xu
8d71f153f8
Merge "Add option to override minor version" am: 48662b25fc
am: 8e6eae32d6
am: 43af41b52b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1822181
Change-Id: I33b4b53dc66b788a5ece17bedfcc3c547c57799b
2021-09-10 06:43:31 +00: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
55d6cebbc4
[automerger skipped] Merge "Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE" am: 7039269418
-s ours am: ddb639b84d
-s ours am: dea52084e2
-s ours am: c0195c8777
-s ours am: 3de44d941c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/build/+/1822787
Change-Id: Ic2960e2fe48cb67ea2e6633c6553f82765cf7cdd
2021-09-09 23:18:43 +00:00
Bill Yi
3de44d941c
[automerger skipped] Merge "Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE" am: 7039269418
-s ours am: ddb639b84d
-s ours am: dea52084e2
-s ours am: c0195c8777
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/build/+/1822787
Change-Id: I712d9bce2eb3eee8dc284cf3ce881814b56e1075
2021-09-09 22:48:39 +00:00
Bill Yi
c0195c8777
[automerger skipped] Merge "Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE" am: 7039269418
-s ours am: ddb639b84d
-s ours am: dea52084e2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/build/+/1822787
Change-Id: Ide3388b476d292b1a205186b44d30895940307af
2021-09-09 22:29:34 +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
Bowgo Tsai
4bb4d1fb91
Skip building boot-(test-harness|debug).img if not needed
...
boot-(test-harness|debug).img is not needed for devices with
a /vendor_boot partition. They can use vendor_boot-(test-harness|debug).img
instead.
Bug: 196001476
Test: make then checks $OUT/*.img
Change-Id: If76df0329c96f718ebf0a0ac138cde3ae859a6c6
2021-09-09 19:04:55 +08:00
Sarah Chin
ae4b5be45f
[automerger skipped] Merge "Add Radio AIDL to VNDK" am: 355f345956
-s ours am: a10ffc2c5f
-s ours am: 720d0286ea
-s ours am: 2b1a51679b
-s ours am: 5214f53516
-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: Ieebd13c54a1cbb6ceaad955e374d1de4dac224dd
2021-09-09 06:43:13 +00:00
Sarah Chin
5214f53516
[automerger skipped] Merge "Add Radio AIDL to VNDK" am: 355f345956
-s ours am: a10ffc2c5f
-s ours am: 720d0286ea
-s ours am: 2b1a51679b
-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: Id852d176361eef3a9a4c193473a11239c9cbde53
2021-09-09 06:23:06 +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
2b1a51679b
[automerger skipped] Merge "Add Radio AIDL to VNDK" am: 355f345956
-s ours am: a10ffc2c5f
-s ours am: 720d0286ea
-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: I16d4c4d805e01298059c08bb91dd3e8f98fd9bb4
2021-09-09 06:09:55 +00: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
f875e883d5
[automerger skipped] Merge "Add Radio AIDL to VNDK" into stage-aosp-master am: d0a58e8d6e
am: a4b4d7a8a7
am: 1035a2b4b6
am: 35b1321f3e
-s ours
...
am skip reason: Merged-In I95d089fb23c4a3baa7f7a6c1435099f34a1af5a3 with SHA-1 37f0cebe6d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15749448
Change-Id: Id3d5b76aa731d9777fe4ae6ffe1377512957f031
2021-09-09 05:33:43 +00:00
Sarah Chin
355f345956
Merge "Add Radio AIDL to VNDK"
2021-09-09 05:21:43 +00:00
Sarah Chin
35b1321f3e
Merge "Add Radio AIDL to VNDK" into stage-aosp-master am: d0a58e8d6e
am: a4b4d7a8a7
am: 1035a2b4b6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15749448
Change-Id: Id700a8782751b50dc2692b645468f073b204b009
2021-09-09 05:10:08 +00:00
Sarah Chin
1035a2b4b6
Merge "Add Radio AIDL to VNDK" into stage-aosp-master am: d0a58e8d6e
am: a4b4d7a8a7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15749448
Change-Id: I23ba469b5072498d4f70016857ea992e18eac9a8
2021-09-09 04:54:27 +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
a7147ae6e2
Merge "Don't sparse right-sized ext4 and erofs images." am: c01c341b6a
am: 7700de1d52
am: 5b5b019864
am: 01cda14d57
am: d5c973513c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1811336
Change-Id: Idc94c0148377d22bb575fb7a916275d021701b24
2021-09-08 23:43:24 +00:00
David Anderson
d5c973513c
Merge "Don't sparse right-sized ext4 and erofs images." am: c01c341b6a
am: 7700de1d52
am: 5b5b019864
am: 01cda14d57
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1811336
Change-Id: I6a5f9afc5daf73d779da42451aae58e21c8c974a
2021-09-08 23:27:55 +00:00
David Anderson
01cda14d57
Merge "Don't sparse right-sized ext4 and erofs images." am: c01c341b6a
am: 7700de1d52
am: 5b5b019864
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1811336
Change-Id: I91e0171d16b3c457ac700f27c4e4929952a5a2b7
2021-09-08 23:13:34 +00: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
Yuntao Xu
2bbe1fe2d4
Add android-cts-verifier.zip
...
Adding android-cts-verifier.zip to $(HOST_OUT)/cts-verifier at
build/make/core/tasks/cts.mk.
Bug: 190635892
Test: m cts
Test: TreeHugger
Change-Id: I63b2da75391221119025b597257c26906718cf77
2021-09-08 10:53:08 -07: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
3581a983f0
[automerger skipped] Merge "Allow overriding SOONG_CONFIG_art_module_source_build to false." am: 2126602216
am: efd51012ed
am: 5e22baa738
am: d358eb7483
am: 1813344997
-s ours
...
am skip reason: Merged-In I50187408a01e0c6f5ecea12fe3a423e1c5d93612 with SHA-1 e2ee9bc7fa
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/1801147
Change-Id: I4e4eb5b4936e72006b0f6cec9880d65efd5ef7aa
2021-09-08 16:23:27 +00:00
Treehugger Robot
1813344997
Merge "Allow overriding SOONG_CONFIG_art_module_source_build to false." am: 2126602216
am: efd51012ed
am: 5e22baa738
am: d358eb7483
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1801147
Change-Id: I337404dc41480efe2cb026f4435189f87d1777f1
2021-09-08 16:10:34 +00:00
Treehugger Robot
d358eb7483
Merge "Allow overriding SOONG_CONFIG_art_module_source_build to false." am: 2126602216
am: efd51012ed
am: 5e22baa738
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1801147
Change-Id: Ic80f490adb67a58ddb67c4e69d8415f50741f946
2021-09-08 15:58:32 +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
6ea8dd74ad
Merge "Remove soong_docs from droidcore." am: f999a9d145
am: 0dae6f9daa
am: 9455e74682
am: 677bddffc8
am: ba7b3f746b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1818099
Change-Id: Iac7d10fcdd4324cc9ef43c8b48c5c8dbb04320a8
2021-09-08 14:35:03 +00:00
Lukács T. Berki
ba7b3f746b
Merge "Remove soong_docs from droidcore." am: f999a9d145
am: 0dae6f9daa
am: 9455e74682
am: 677bddffc8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1818099
Change-Id: I1f40be8cfd7ba4f5155708d68a1fb7fe7e4d6f93
2021-09-08 14:22:06 +00:00
Lukács T. Berki
677bddffc8
Merge "Remove soong_docs from droidcore." am: f999a9d145
am: 0dae6f9daa
am: 9455e74682
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1818099
Change-Id: I6e88c480dd9de61540b6d190bb8ac4bba9a96112
2021-09-08 14:08:32 +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