Commit Graph

68731 Commits

Author SHA1 Message Date
Fabien Sanglard
df73d1b473 Zipalign: Avoid unnecessary padding
Problem: Aligned entry always get padded to the next aligned slot.
Solution: Fix alignment test.

Bug: 199932309
Test: align_test.cpp
Change-Id: I1e61c67dcf45454dd782d0fcc6903f7e71954083
2021-09-14 15:20:42 -07:00
Fabien Sanglard
1011d45f5b Zipalign: Remove unused variables
Remove unused variable resulting in compilation warnings.
Remove unused temporary variable.

Bug: NA
Test: zipalign_tests
Change-Id: Ic2236b5878074f0c2537ab0b9f94dfd9c42225d8
2021-09-13 16:52:22 -07: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
1ab1c2ff96 Merge "Avoid repeated building of erofs image" 2021-09-11 00:05:45 +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
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
48662b25fc Merge "Add option to override minor version" 2021-09-10 05:48:01 +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
355f345956 Merge "Add Radio AIDL to VNDK" 2021-09-09 05:21:43 +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
c01c341b6a Merge "Don't sparse right-sized ext4 and erofs images." 2021-09-08 22:25:37 +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
2126602216 Merge "Allow overriding SOONG_CONFIG_art_module_source_build to false." 2021-09-08 15:04:57 +00:00
Lukács T. Berki
f999a9d145 Merge "Remove soong_docs from droidcore." 2021-09-08 13:16:50 +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
cfa99e3596 Merge "Add Wifi HostApd AIDL interface support." 2021-09-07 17:15:33 +00:00
Treehugger Robot
f673d10736 Merge "Replace GENERATE_BAZEL_FILES=1 with "m bp2build"." 2021-09-07 09:16:05 +00:00
Lukacs T. Berki
3fef660fae Replace GENERATE_BAZEL_FILES=1 with "m bp2build".
This should have been submitted in the pertinent topic, but I messed by
git repositories up.

Test: Presubmits.
Change-Id: I7f3e9648c1961169ff40c8e2ddaf3d893498f625
2021-09-07 08:20:33 +02:00
Martin Stjernholm
607138be38 Allow overriding SOONG_CONFIG_art_module_source_build to false.
Useful for local testing etc.

Cherry-picked from http://ag/15754315.

Test: env SOONG_CONFIG_art_module_source_build=false \
          MODULE_BUILD_FROM_SOURCE=true \
        build/soong/soong_ui.bash \
          --dumpvar-mode SOONG_CONFIG_art_module_source_build
  return false
Bug: 172480615
Change-Id: I50187408a01e0c6f5ecea12fe3a423e1c5d93612
Merged-In: I50187408a01e0c6f5ecea12fe3a423e1c5d93612
2021-09-06 15:46:20 +01:00
Chih-hung Hsieh
799e26e641 Merge "Handle warning lines from RBE" 2021-09-03 23:44:38 +00:00
Chih-Hung Hsieh
77e3146600 Handle warning lines from RBE
* Recognize USE_RBE special environment variable.
  * Remove RBE special file path prefix /b/f/w/
    and any leading characters.
  * Only do this for android now, maybe for chrome later.
* When finding android_root, do not use
  /b/f/w/ and /tmp/ file paths.
* Recognize BUILD_ID and add it into .html output.
* Style improvement with continue statements.

Test: warn.py --url=http://cs/android --separator='?l=' build.log > warnings.html
Test: warn.py --gencsv build.log > warnings.csv
Bug: 198657613
Change-Id: I57746f026d5d8b71e792127b8d6ba15f6b28103c
2021-09-03 14:23:55 -07:00
Treehugger Robot
b94feb7cb6 Merge "Fix: print namespace variable names, too." 2021-09-01 20:34:51 +00:00
David Anderson
9e95a02a87 Don't sparse right-sized ext4 and erofs images.
When we introduced Dynamic Partitions, we stopped giving readonly
partitions fixed sizes. In addition we introduced deduplication for
ext4. These two factors greatly reduce the impact of sparse images,
since there aren't many fill blocks to optimize.

This patch disables sparsing for images that are rightsized and do not
explicitly specify extra reserved space. This makes the images a little
easier to work with from an engineering perspective. They no longer have
to be unsparsed to interact with any tooling. It also eases a potential
source of bugs, as b/184225422 is not reproducible with sparsing off.

On Pixel, the difference between the sparsed partitions and unsparsed is
12M (out of roughly 4G).

Bug: 198001223
Test: make, treehugger, make target-files-package
      dynamic partitions are no longer sparse images
Change-Id: I74459f8abe74a15a24ba5a40cf701e6af2db8179
2021-09-01 13:12:39 -07:00
Anton Hansson
0d201ba426 Merge "Add new make variables for extension SDK version" 2021-09-01 09:00:15 +00:00
Treehugger Robot
bdf9be4708 Merge "Allow user to manually override enable_vabc_xor" 2021-08-31 21:23:40 +00:00
Kelvin Zhang
1250bcab0a Allow user to manually override enable_vabc_xor
--enable_vabc_xor=false to disable, --enable_vabc_xor=true or
--enable_vabc_xor to enable

Also the flag is now enabled by default. But update_engine will
still ignore XOR ops, as update_engine support for XOR is WIP.

Test: th
Change-Id: I038b0dda5cc9efcc1620e72c858626b56ffb1611
2021-08-31 18:52:47 +00:00
Treehugger Robot
fe93495fb3 Merge "If filter/filter_out pattern is a list, remove empty elements from it." 2021-08-31 18:41:59 +00:00
Kelvin Zhang
9fcdad62c9 Merge "Check for vintf compatiblity early in generation process" 2021-08-31 18:22:58 +00:00
Kelvin Zhang
414ca429cf Check for vintf compatiblity early in generation process
Currently CheckVintfIfTrebleEnabled is called after generating payload.
Users have to wait for ~1 hour before vintf is checked. Do the check
early and fail early.

Test: th
Change-Id: I2e4a8c7eaa62c94c92973c127b1d825a26e63b35
2021-08-31 11:22:34 -07:00
David Anderson
d4bea32530 Merge "Fix generate-userimage-prop-dictionary getting called unnecessarily." 2021-08-30 23:17:16 +00:00
David Anderson
17063cfcb0 Fix generate-userimage-prop-dictionary getting called unnecessarily.
odm, odm_dlkm, vendor_dlkm call generate-userimage-prop-dictionary. This
appears to be inadvertent as it pulls in props from all the other
partitions. Instead, call generate-image-prop-dictionary which is
specific to one partition.

Bug: 198001223
Test: builds, treehugger green
Change-Id: Ib177c740068f1c087d517b363649551092038760
2021-08-27 16:50:30 -07:00
Treehugger Robot
d5b993bac7 Merge "Add missing custom kernel module targets" 2021-08-27 19:37:36 +00:00
Saravana Kannan
d6dc4a1d3b Merge "Strip recovery kernel modules by default" 2021-08-27 19:30:15 +00:00
Anton Hansson
2df8730d95 Add new make variables for extension SDK version
- PLATFORM_SDK_EXTENSION_VERSION is the sdk extension version of the
  tree
- PLATFORM_BASE_SDK_EXTENSION_VERSION is the sdk extension version that
  PLATFORM_SDK_VERSION ships with.

Also propagate PLATFORM_SDK_EXTENSION_VERSION to soong to that it can be
used in genrules.

Bug: 195281582
Test: via development/ CL in this topic
Merged-In: Ib078a922e9bd9bc6ae82ab74feaeb743703a64b8
Change-Id: Ib078a922e9bd9bc6ae82ab74feaeb743703a64b8
2021-08-27 17:42:33 +01:00
Sasha Smundak
2297d9a395 Fix: print namespace variable names, too.
Bug: 193540681
Test: internal
Change-Id: I1827411e7c6e693666e40fcbcad34ff7bc82ef20
2021-08-26 13:44:54 -07:00
Sasha Smundak
f00e35ecae If filter/filter_out pattern is a list, remove empty elements from it.
Also, fix __mk2regex bug: the returned pattern should end with $.
Bug: 193540681
Test: internal
Change-Id: Ia56856826c6b05ccf857ae5ab7a70609bf4f1e1d

Change-Id: Ie2a9bf62ee48824ce7cd5fe9e9ec2f55311473e3
2021-08-26 13:43:03 -07:00
Mark-PK Tsai
3ec61b4730 Add missing custom kernel module targets
Custom kernel module targets are not in the build dependency rule
which cause the copy command of $(my_copy_pairs) fail.
Add it back to $(my_image_copy_files) and remove the prefixed
$(my_staging_dir) from dest of kernel module copy pair.
Then the makefile can handle it well.

Bug: 195888474
Change-Id: Id8cb4c4991905e8bc53ddb5e60e87a36fe43e803
Signed-off-by: Mark-PK Tsai <mark-pk.tsai@mediatek.com>
2021-08-26 15:41:01 +08:00
Colin Cross
ee20ae1a8d Merge "Propagate USE_HOST_MUSL to Soong" 2021-08-26 05:12:15 +00:00
Colin Cross
178de6308c Propagate USE_HOST_MUSL to Soong
Support enabling musl in Make builds with USE_HOST_MUSL=true.  Only
modules defined in Soong will use musl, but that's almost all host
modules.

Bug: 195988762
Test: m USE_HOST_MUSL=true adb
Change-Id: Ia88f6e20b302d86f2241877b017aebe218d968cf
2021-08-25 15:07:17 -07:00
Sophie Zheng
8f863178da Merge "API coverage Copy generated API list during building cc_library to cc_apis/" 2021-08-25 21:42:44 +00:00
Alexander Smundak
f80b8930f0 Merge "Add product-copy-files-by-pattern" 2021-08-24 20:49:27 +00:00
Sasha Smundak
d189ab71f3 Add product-copy-files-by-pattern
Several configuration makefiles in the internal
source tree use this pattern

Bug: 190051051
Test: treehugger
Change-Id: Ifab4a7022b9c337966f46e098147fbb5817d9343
2021-08-24 20:49:01 +00:00
Alexander Smundak
ed266e5fb8 Merge "Fix add_soong_config_namespace/add_soong_config_var macros" 2021-08-24 16:03:51 +00:00