Commit graph

89922 commits

Author SHA1 Message Date
Colin Cross
5f24ce6158 Merge "Revert "Reapply "Add support for product-specific build flags""" into main 2023-11-06 22:02:50 +00:00
Colin Cross
cc318d33e1 Merge "Revert "Reapply "release_config: build flags can be lists""" into main 2023-11-06 22:02:50 +00:00
Colin Cross
671bc15286 Revert "Reapply "Add support for product-specific build flags""
Revert submission 2815850-product-flags

Reason for revert: b/309477343

Reverted changes: /q/submissionid:2815850-product-flags

Bug: 302593603
Bug: 309477343
Change-Id: I6294609d4c60973fceba567e37a6bc3b89239e42
2023-11-06 21:39:40 +00:00
Colin Cross
93b43efd80 Revert "Reapply "release_config: build flags can be lists""
Revert submission 2815850-product-flags

Reason for revert: b/309477343

Reverted changes: /q/submissionid:2815850-product-flags

Bug: 302593603
Bug: 309477343
Change-Id: Ifda3b0cdfb3524595af693156c6dc162c391a55a
2023-11-06 21:38:26 +00:00
Treehugger Robot
1acc860f83 Merge "Export build flags to soong." into main 2023-11-06 21:07:21 +00:00
Kelvin Zhang
65c1162eb5 Generate incremental OTAs for 16K/4K boot option
Previously, the 16K/4K boot options OTAs are full OTAs, resulting in
file size of ~20MB each, and ~40M for both OTAs. To reduce the space
usage, use incremental OTAs instead.

Test: th
Bug: 302759296
Bug: 293313353
Change-Id: I61cc84c6c13f151dd6bc5ff37dd31daa5fb31abd
2023-11-06 12:37:49 -08:00
Treehugger Robot
54e9262f99 Merge "Add PRODUCT_VALIDATION_CHECKS" into main 2023-11-06 19:39:19 +00:00
Roshan Pius
81d167424a Revert "handheld_system: Replace NFC app with NFC apex"
Revert submission 24993894-cherrypicker-L80100000963393177:N49200001411943056

Reason for revert: Causing bootloop with signed builds

Reverted changes: /q/submissionid:24993894-cherrypicker-L80100000963393177:N49200001411943056

Bug: 309117462
Test: Compiles, device boots up
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:51dc3e7a205652c99c6d022f6fabb8b31b11d29b)
Merged-In: Ic35189ae47f3e2b4302d09cbb524f7c8e6ddc2d6
Change-Id: Ic35189ae47f3e2b4302d09cbb524f7c8e6ddc2d6
2023-11-06 19:37:43 +00:00
Cole Faust
7aa649a62c Add PRODUCT_VALIDATION_CHECKS
This is a new mechanism for asserting properties about your product
config. See the documentation in product_validation_checks.mk for
more information.

Test: Manually
Change-Id: I698dea899441f3773f839ea2ba1a2a6cfe59b57b
2023-11-06 10:42:01 -08:00
LaMont Jones
253bd067da Merge changes from topic "product-flags" into main
* changes:
  Reapply "release_config: build flags can be lists"
  Reapply "Add support for product-specific build flags"
2023-11-06 14:08:22 +00:00
Handa Wang
8f1f35461e Merge "add ot-cli-ftd in /system/bin/ for eng and userdebug builds" into main 2023-11-06 08:18:55 +00:00
Justin Yun
2071b4eac2 Merge "Set ro.product.vndk.version for VNDK v35" into main 2023-11-05 07:16:14 +00:00
Treehugger Robot
e3dca814e3 Merge "Retire emulator build files from build/make" into main 2023-11-03 18:11:26 +00:00
Roman Kiryanov
e662209bee Retire emulator build files from build/make
they were moved to device/generic/goldfish

Bug: 295259752
Test: presubmit
Change-Id: I996811e8703b43313fca3ac819e6ed333d37866b
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-11-03 10:07:03 -07:00
Colin Cross
b5ec156b32 Merge changes I2ca9e674,I7e0db3c0,I7e1b6268,I0fa6a46e,I04e8178a into main
* changes:
  Remove code related to unused LOCAL_* variables
  Delete unused variables from clear_vars.mk
  Remove obsolete ide.mk and related code
  Removed unused license code
  Remove obsolete uses of LOCAL_MODULE_TAGS
2023-11-03 15:27:34 +00:00
Handa Wang
cf72ecf193 add ot-cli-ftd in /system/bin/ for eng and userdebug builds
`ot-cli-ftd` is a CLI tool simulating a node in Thread network. See https://www.threadgroup.org/ about Thread networking technology.

It's currently in `/vendor/bin/` but we're moving it to `/system/bin/` because `ot-cli-ftd` will be used in various CI tests.

`ot-cli-ftd` is also useful for debugging purpose.

Bug: 309051262
Test: Verified on Cuttlefish.

Change-Id: I96bf2bd7575540dc86e969a80cd9bb5634c3a1ea
2023-11-03 06:49:51 +00:00
Colin Cross
00d65a01a5 Skip parts of notice_files.mk that don't apply to Soong modules
Move the parts of notice_files.mk that set variables that are only
used for Make modules inside the conditional on
LOCAL_SOONG_LICENSE_METADATA.

Bug: 309006256
Test: no change to out/build-aosp_cf_x86_64_phone.ninja
Change-Id: I5dc5a4ed223c6c2cb13460f59d0e7a03d4c9d097
2023-11-02 19:48:46 -07:00
Wei Li
581b781ac4 Merge "Include following files in the SBOM of layoutlib, which are disted in Soong." into main 2023-11-02 22:17:30 +00:00
Anas Sulaiman
39ccc6378e Merge "fix potential encoding issues in remote actions" into main 2023-11-02 18:02:55 +00:00
Colin Cross
710c3cb5fb Remove code related to unused LOCAL_* variables
LOCAL_JETIFIER_ENABLED, LOCAL_NO_PIC, LOCAL_PREBUILT_STRIP_COMMENTS,
LOCAL_RMTYPEDEFS, and *.vts sources are never used.  Remove them
and the code related to them.

Test: no change to out/build-aosp_cf_x86_64_phone.ninja
Change-Id: I2ca9e674602057cc163b8bc28b0c57a0b7cc4361
2023-11-02 10:45:33 -07:00
Colin Cross
fda3c6a36a Delete unused variables from clear_vars.mk
Kati analysis in AOSP spends around 6 seconds in clear_vars.mk.
Delete any variables in clear_vars.mk that are not referenced anywhere
else in build/make/core.

Test: no change to build-aosp_cf_x86_64_phone.ninja
Change-Id: I7e0db3c02d297de825acbfbd1a0f05724d1e846d
2023-11-02 10:33:25 -07:00
Colin Cross
1b7f072505 Remove obsolete ide.mk and related code
The code to generate an eclipse classpath is obsolete, remove it and
related code.

Test: no change to out/build-aosp_cf_x86_64_phone.ninja
Change-Id: I7e1b6268b98ecbb7be88db8945dd7b30acc695ba
2023-11-02 10:16:57 -07:00
Colin Cross
34fe77a493 Removed unused license code
Nothing ever reads ALL_DEPS.*.LICENSE, and its an ever-growing list
that is sorted every time, which is extremely expensive.

notice_target is never set after I4cddf9a381a1258bdc2b1b42be72c447df10d234,
remove all the related code.

Test: no change to out/build-aosp_cf_x86_64_phone.ninja
Change-Id: I0fa6a46e62ef8aa78873b43d3064b57b1c54de51
2023-11-02 10:10:36 -07:00
Colin Cross
aed37d79f2 Remove obsolete uses of LOCAL_MODULE_TAGS
Only LOCAL_MODULE_TAGS := tests is used is meaningful in the current
implementation.  "optional" and "samples" both exist in the tree, but
are meaningless.  "gnu", "user", "eng" and "debug" are  no longer used,
and are already forbidden by the unusual tags check.  The info from the
"module" target is now available in module-info.json.  Delete all the
irrelevant code.

Test: no change to out/build-aosp_cf_x86_64_phone.ninja
Change-Id: I04e8178a362e382a1a4bd997c1b4c3a480db7714
2023-11-02 10:10:06 -07:00
Greg Kaiser
9a5a526257 Fix example lunch target
We make this example valid for trunk stable.

Bug: 307738446
Test: lunch command
Change-Id: I25a142f1b87facebdcf2751f3f4cb68a0738945d
2023-11-02 16:59:23 +00:00
Peiyong Lin
492220c695 Merge "Make ANGLE part of Android OS system image." into main 2023-11-02 16:34:05 +00:00
LaMont Jones
eacc292ce8 Reapply "release_config: build flags can be lists"
Allow a build flag definition to indicate that its value should be the
concatentation of assignements, rather than the final assigned value. In
this case, the "default" value from the flag definition is always
present as the start of the list.

The initial use case for this is RELEASE_ACONFIG_VALUE_SETS, where we
need apply multiple definition files that should be processed to arrive
at the final value.

This reverts commit b05eaac092.

Bug: b/302593603, b/304814040
Test: manual

Change-Id: I7370c509ceb3952f7feb2351673d8f2ba86d704b
2023-11-02 15:56:10 +00:00
LaMont Jones
df398d19d4 Reapply "Add support for product-specific build flags"
1. release config maps now specify where the flag definitions are found.
2. PRODUCT_RELEASE_CONFIG_MAPS specifies additional release config map
   files to use.

This allows product config to specify build flags, which can then be
specified by users of that product.

This reverts commit 75bfc37ef4.

Bug: b/302593603
Test: manual
Change-Id: I031a00459893644d7f67b63b982db9ae9015ae4d
2023-11-02 15:56:03 +00:00
Treehugger Robot
821ab221be Merge changes from topic "revert-2787001-product-build-flags-PYFTWILGBK" into main
* changes:
  Revert "Add support for product-specific build flags"
  Revert "release_config: build flags can be lists"
2023-11-02 08:06:39 +00:00
Justin Yun
925d1f517c Set ro.product.vndk.version for VNDK v35
Until we have updated art mainline module, we must provide
ro.product.vndk.version to use product namespace for product apks.

This can be removed when art mainline module is updated.

Bug: 308676119
Test: See if product apps uses product-clns namespace in
      cf_x86_64_phone-next-userdebug
Change-Id: I5030fb0f82c80e0cb94c89179e6c71df119368da
2023-11-02 11:48:39 +09:00
Colin Cross
75bfc37ef4 Revert "Add support for product-specific build flags"
Revert submission 2787001-product-build-flags

Reason for revert: Possible cause of b/308849337

Reverted changes: /q/submissionid:2787001-product-build-flags

Bug: 302593603
Bug: 308849337
Change-Id: I01b5905a0a20a1401dcc1267e7fafc893e57d637
2023-11-02 00:13:30 +00:00
Colin Cross
b05eaac092 Revert "release_config: build flags can be lists"
Revert submission 2787001-product-build-flags

Reason for revert: Possible cause of b/308849337

Reverted changes: /q/submissionid:2787001-product-build-flags

Bug: 302593603
Bug: 308849337
Change-Id: I6246d20201e674ba99faf6b880ecdc7ef934c653
2023-11-02 00:13:32 +00:00
Oriol Prieto Gascó
8b1d74ec60 Merge "Revert^2 "aconfig: cache flag value in generated java code"" into main 2023-11-01 21:56:38 +00:00
Treehugger Robot
be56ac9aad Merge "Convert partition size to int before CheckSize" into main 2023-11-01 18:22:13 +00:00
Treehugger Robot
5f4a51ef66 Merge "Fix prebuilt boot image hermetic build" into main 2023-11-01 18:22:10 +00:00
Peiyong Lin
71af449630 Make ANGLE part of Android OS system image.
As ANGLE will become the default GLES drivers and by shipped by Google,
this patch allows ANGLE to be built into Android OS image.

Bug: b/293503000
Test: atest CtsAngleDeveloperOptionHostTest -c with ANGLE being default
Test: atest CtsAngleDeveloperOptionHostTest -c with native being default
Change-Id: I72aa4e126916419d2350a4ce980bd33cb4537c73
2023-11-01 18:20:33 +00:00
Ronald Braunstein
75b114560a Merge "Add banner announcing adevice when running builds." into main 2023-11-01 17:54:03 +00:00
Anas Sulaiman
b72060b029 fix potential encoding issues in remote actions
The new docker image contains all en_*.UTF-8 locales to ensure Java (and
other) actions produce the correct bytes.

Bug: b/300624128
Test: Ran an android build and verified there are no encoding issues in
metalava outputs.

Change-Id: Id1eab37edfc71b3b56f4ac38259407c0a1b10667
2023-11-01 17:41:34 +00:00
Kelvin Zhang
8c9166ae37 Convert partition size to int before CheckSize
Test: th
Change-Id: Ic312e40fdad99afd65b4fc259395b8952bb038c6
2023-11-01 10:14:13 -07:00
Kelvin Zhang
9f9ac4e8a0 Fix prebuilt boot image hermetic build
Break when we find a working salt, certain devices have boot image
containing both the kernel and ramdisk, resulting in the ramdisk being
used as salt. Since core/Makefile uses kernel as salt, update python
code to match.

Bug: 293313353
Test: th
Change-Id: I68b5a8c2f0747ddf68f775bc2a6c5db46eb7eb64
2023-11-01 10:14:13 -07:00
Ted Bauer
ad2c02c98d Merge "Revert^2 "Do not generate aconfig_flags.textproto"" into main 2023-11-01 17:05:20 +00:00
Zhi Dou
72c2a93006 Revert^2 "aconfig: cache flag value in generated java code"
This reverts commit 257f64347d.

Reason for revert: fix in Roboletric will subimt together with this change

Change-Id: I03c9ed627e6a4153db9c9074daf821ea6d19bc33
2023-11-01 16:42:31 +00:00
LaMont Jones
99845eeaba Export build flags to soong.
This exports a map of build flags used in this release config to Soong.

Bug: b/302514918
Test: manual
Change-Id: Ia93195f09dee4945f07326eb7a5973c2ce2e025b
2023-11-01 16:16:53 +00:00
Ted Bauer
c0d16595b3 Revert^2 "Do not generate aconfig_flags.textproto"
This reverts commit 49fbb31fcf.

Reason for revert: textproto usages have been removed

Change-Id: I4021b5e79bcd114a610a529bc68e0be50500b339
2023-11-01 16:03:51 +00:00
LaMont Jones
752703251a Merge changes from topic "product-build-flags" into main
* changes:
  release_config: build flags can be lists
  Add support for product-specific build flags
2023-11-01 16:01:08 +00:00
Jooyung Han
aea4c9d496 Merge "Rewrite how to generate apexkeys.txt" into main 2023-11-01 05:13:06 +00:00
Jooyung Han
8b162283f7 Rewrite how to generate apexkeys.txt
Instead of listing all apexes in the source tree, now each apex emits
its own fragment for apexkeys.txt, which is pointed by
LOCAL_APEX_KEYS_FILE. Makefile collects apexkeys.txt from installed apex
files. This is to avoid listing unrelated apexes (not installed,
testdata, unexported namespaces, etc.)

Bug: 304914238
Test: m apexkeys.txt
Test: m blueprint-tests
Change-Id: I6b5601609d16452a0717f09ecaa703ee09693094
2023-11-01 13:06:08 +09:00
Treehugger Robot
acd740cf5b Merge "Fix non-AB ota generation failure" into main 2023-11-01 03:43:06 +00:00
Kelvin Zhang
782b752889 Fix non-AB ota generation failure
Test: ota generation on pinot target
Bug: 308615740
Change-Id: I8b540516c0ba9e3acb23eebad8569a6dbf2ef9f3
2023-10-31 19:42:39 -07:00
Dan Shi
d22a5558f4 Merge "Remove EXTRA_TEST_RUNNER_CONFIGS option in template for autogen instrumentation test" into main 2023-11-01 00:56:21 +00:00