Commit Graph

71478 Commits

Author SHA1 Message Date
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
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
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
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
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
af7f572207 Merge "Replace GENERATE_BAZEL_FILES=1 with "m bp2build"." am: f673d10736
Original change: https://android-review.googlesource.com/c/platform/build/+/1818098

Change-Id: I06c95a0c54494a2534b4c2cf08f722f5769dc4dc
2021-09-07 09:43:42 +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
d351f7c848 Merge "Handle warning lines from RBE" am: 799e26e641
Original change: https://android-review.googlesource.com/c/platform/build/+/1818732

Change-Id: Ib55743ad069d73d809a1e081412631562d64fea2
2021-09-04 00:03:15 +00: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
3811c64978 Merge "Fix: print namespace variable names, too." am: b94feb7cb6
Original change: https://android-review.googlesource.com/c/platform/build/+/1810518

Change-Id: Id26da4e26967e4b04ff2933b7f0d5a9dededdabd
2021-09-01 20:48:53 +00: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
bd2e36f29e [automerger skipped] Merge "Add new make variables for extension SDK version" am: 0d201ba426 -s ours
am skip reason: Merged-In Ib078a922e9bd9bc6ae82ab74feaeb743703a64b8 with SHA-1 9b8082c2d4 is already in history

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

Change-Id: I8b3fc990fe58648e50b5f20ae67cac18841c86c0
2021-09-01 09:19:54 +00:00
Anton Hansson
0d201ba426 Merge "Add new make variables for extension SDK version" 2021-09-01 09:00:15 +00:00
Anton Hansson
f330c7253c Merge "Add new make variables for extension SDK version" into stage-aosp-master 2021-09-01 08:21:32 +00:00
Treehugger Robot
6545f98361 Merge "Allow user to manually override enable_vabc_xor" am: bdf9be4708
Original change: https://android-review.googlesource.com/c/platform/build/+/1811777

Change-Id: I49ace945e8cf0d0111076a0153669eaf5d765a60
2021-08-31 21:39:54 +00:00
Treehugger Robot
bdf9be4708 Merge "Allow user to manually override enable_vabc_xor" 2021-08-31 21:23:40 +00:00
Treehugger Robot
c3b087d7f3 Merge "If filter/filter_out pattern is a list, remove empty elements from it." am: fe93495fb3
Original change: https://android-review.googlesource.com/c/platform/build/+/1810525

Change-Id: Ic2dc2ced2c48fa763eb8948de80c0569e609e3c5
2021-08-31 19:04:14 +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
0f50d879ef Merge "Check for vintf compatiblity early in generation process" am: 9fcdad62c9
Original change: https://android-review.googlesource.com/c/platform/build/+/1811778

Change-Id: I0905c6f72106f6dd491d69fcb5f1fea528f3369f
2021-08-31 18:36:42 +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
Anton Hansson
9b8082c2d4 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
Change-Id: Ib078a922e9bd9bc6ae82ab74feaeb743703a64b8
Merged-In: Ib078a922e9bd9bc6ae82ab74feaeb743703a64b8
(cherry picked from commit ee524aa4f7bae2cc4d32eec3689aecf3e766dec4)
2021-08-31 17:41:56 +00:00
David Anderson
36edc7ebb0 Merge "Fix generate-userimage-prop-dictionary getting called unnecessarily." am: d4bea32530
Original change: https://android-review.googlesource.com/c/platform/build/+/1811518

Change-Id: Ica0a92f398c4361cdb231b4d5d10e46d2265de47
2021-08-30 23:28:21 +00: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
cefd2a4a97 Merge "Add missing custom kernel module targets" am: d5b993bac7
Original change: https://android-review.googlesource.com/c/platform/build/+/1809997

Change-Id: Iddab1746a6116a0af17c6baa5c064fd7f0d63296
2021-08-27 19:50:01 +00:00
Saravana Kannan
d64f3cd203 Merge "Strip recovery kernel modules by default" am: d6dc4a1d3b
Original change: https://android-review.googlesource.com/c/platform/build/+/1803964

Change-Id: I12a5c72343ab1d9d0001135fc50e1fbfe234c17b
2021-08-27 19:49:54 +00: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
05d007ae20 Merge "Propagate USE_HOST_MUSL to Soong" am: ee20ae1a8d
Original change: https://android-review.googlesource.com/c/platform/build/+/1796674

Change-Id: Ie9c9e6ed81a70d699537131a5cd9d77c3f8eca7b
2021-08-26 05:26:46 +00: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
a44660f3a6 Merge "API coverage Copy generated API list during building cc_library to cc_apis/" am: 8f863178da
Original change: https://android-review.googlesource.com/c/platform/build/+/1798348

Change-Id: I3cafb348553174a01cb9fc796d7138d30f5943a9
2021-08-25 21:58:02 +00: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