Commit Graph

27520 Commits

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
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
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
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
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
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
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
Treehugger Robot
eda226dcf2 Merge "Fix: print namespace variable names, too." am: b94feb7cb6 am: 3811c64978
Original change: https://android-review.googlesource.com/c/platform/build/+/1810518

Change-Id: Ibf832406d0c802617855402a1aafa68dd1803384
2021-09-01 21:03:05 +00: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
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
1697f49442 Merge "If filter/filter_out pattern is a list, remove empty elements from it." am: fe93495fb3 am: c3b087d7f3
Original change: https://android-review.googlesource.com/c/platform/build/+/1810525

Change-Id: Iff80720bc65475904f4ecff372de128f77a56f7b
2021-08-31 19:08:29 +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
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
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
Anton Hansson
18d6ad50c4 Merge "Add new make variables for extension SDK version" into sc-dev-plus-aosp 2021-08-31 10:15:34 +00:00
Yuntao Xu
19416d38ce Merge "Add the cts-platform-version check" into sc-dev-plus-aosp 2021-08-31 00:50:13 +00:00
David Anderson
b135f31026 Merge "Fix generate-userimage-prop-dictionary getting called unnecessarily." am: d4bea32530 am: 36edc7ebb0
Original change: https://android-review.googlesource.com/c/platform/build/+/1811518

Change-Id: Idcb740de8ecc1e22261aeefdc6317ada12056549
2021-08-30 23:39:53 +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
Yuntao Xu
56b1cc0f7f Add the cts-platform-version check
Added the cts-platform-version check when the cts directory exists.

Bug: 194402596
Test: manually modified the ifeq condition to check error message
Test: TreeHugger
Change-Id: I613ac5b5014dbf4e6202e1dbd1b6a92359817cf2
2021-08-27 21:37:30 -07: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
adaf433826 Merge "Add missing custom kernel module targets" am: d5b993bac7 am: cefd2a4a97
Original change: https://android-review.googlesource.com/c/platform/build/+/1809997

Change-Id: I83f5cac111f330079eb69239c0dd7e070ddc5cf8
2021-08-27 20:05:33 +00:00
Saravana Kannan
4a42eda105 Merge "Strip recovery kernel modules by default" am: d6dc4a1d3b am: d64f3cd203
Original change: https://android-review.googlesource.com/c/platform/build/+/1803964

Change-Id: Ibb7c63e377caa41c001778009bf6d489999526e5
2021-08-27 20:05:28 +00: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
Anton Hansson
2ea7e6ecad 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
(cherry picked from commit ee524aa4f7bae2cc4d32eec3689aecf3e766dec4)
2021-08-27 17:42:15 +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
fc8cca1e6c Merge "Propagate USE_HOST_MUSL to Soong" am: ee20ae1a8d am: 05d007ae20
Original change: https://android-review.googlesource.com/c/platform/build/+/1796674

Change-Id: I0eeaabf928b73e29a0bdc6a5dd8dcb6f6ba15776
2021-08-26 05:40:02 +00: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
Presubmit Automerger Backend
7c0923f9ec [automerge] Revert "Update Security String to 2021-10-06" 2p: 1f04c4d3e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15678276

Bug: 193547118
Change-Id: Ie50456b3fc217af0b87677b5074c6225a407e808
2021-08-26 01:04:25 +00:00
Paul Scovanner
1f04c4d3e7 Revert "Update Security String to 2021-10-06"
This reverts commit 61275cd338.

Reason for revert: SPL bump no longer necessary due to ATT FRC respin

Bug: 193547118
Change-Id: I1df0e12d50471b518653ff865637193bd7ed9101
2021-08-26 01:04:17 +00:00
Paul Scovanner
ae3f83ed65 Merge changes from topic "presubmit-am-38a835692f314290aa45b4deba2bb3ab" into sc-dev-plus-aosp
* changes:
  [automerge] Update Security String to 2021-10-06 2p: 61275cd338
  Update Security String to 2021-10-06
2021-08-25 23:49:26 +00:00