Commit graph

89896 commits

Author SHA1 Message Date
Robin Lee
092c6b68b8 Merge "Revert "Require TARGET_RELEASE for builds"" into main 2023-11-09 08:49:25 +00:00
Robin Lee
50fe46c1d3 Revert "Require TARGET_RELEASE for builds"
This reverts commit 24366c842b.

Reason for revert: b/309900087

Change-Id: I36550cbb0ae21a9c4f783f8a2fcd08ade2707f68
2023-11-09 08:01:06 +00:00
Treehugger Robot
1f94a3d547 Merge "Require TARGET_RELEASE for builds" into main 2023-11-09 04:23:37 +00:00
Abhishek Nigam
80b1a3fc38 Merge changes from topic "nonabrevert" into main
* changes:
  Revert "Move more non-AB code to separate files"
  Revert "Fix non-AB ota generation failure"
2023-11-09 01:02:58 +00:00
Treehugger Robot
386a58310a Merge "Fix example lunch target" into main 2023-11-09 00:43:22 +00:00
Cole Faust
f50c26e6e3 Merge "Remove release_config.bzl" into main 2023-11-09 00:41:50 +00:00
Treehugger Robot
2b46f4d199 Merge "build: add a few proguard rules [1/3]" into main 2023-11-08 23:06:02 +00:00
Abhishek Nigam
1dfca46094 Revert "Move more non-AB code to separate files"
This reverts commit 513b86e5c2.

Change-Id: I6aae60642772a052404eb1773966b2e637864bbc
2023-11-08 22:29:18 +00:00
Abhishek Nigam
b148ac22f8 Revert "Fix non-AB ota generation failure"
This reverts commit 782b752889.

bug: 308932171
tested: locally generated and applied ota on nonab device
Change-Id: I67b26be01d6240b2cb332e13bc7c7959de128755
2023-11-08 22:29:18 +00:00
Roshan Pius
7705138aed Merge "Revert "handheld_system: Replace NFC app with NFC apex"" into main 2023-11-08 21:16:19 +00:00
Greg Kaiser
24366c842b Require TARGET_RELEASE for builds
Rather than use an unsupported flag setting that the user likely
doesn't even realize is being used, we immediately stop the build.

This error message is more verbose, mentioning 'lunch', because
it's anticipated a lot more users will hit this issue when first
switching to trunk stable, and more details will hopefully help
them out.

We have some complication in that some internal commands set
TARGET_RELEASE to an empty string.  We put in logic to allow
that path.

Since $(error) immediately stops the build, we also get rid of
some 'else' logic and indentation, to hopefully offset some of
the complication we've added.

Bug: 307946156
Test: 'lunch' (still) works; A build attempt without `TARGET_RELEASE` set (now) fails
Change-Id: I2f667668c6688e501a3536981b7bae5fdbf962a0
2023-11-08 11:20:28 -07:00
Cole Faust
9a106f3ebb Remove release_config.bzl
The internal usages have been switched to release_config.scl.

Bug: 309686282
Test: Presubmits
Change-Id: If8e5a5b94a47474f5e76cf189c41980402f31085
2023-11-08 10:11:03 -08:00
Cole Faust
bcaac55c35 Merge "Remove release_config.bzl load" into main 2023-11-08 07:46:54 +00:00
Cole Faust
6291522c70 Remove release_config.bzl load
This was mistakenly copy/pasted.

Test: Presubmits
Change-Id: I01dcf65464428d56c2246cf70f6e769e842f28b1
2023-11-07 21:05:37 -08:00
Treehugger Robot
8a5b9e4aa2 Merge "add product sepolicy into monitor list" into main 2023-11-08 03:28:35 +00:00
Adam Shih
894cf688a9 add product sepolicy into monitor list
Bug: 256065208
Test: lunch raven-next-userdebug
Change-Id: I016f0340aecdc15af485c9fd51d6c0120ee8908f
2023-11-08 00:51:04 +00:00
Cole Faust
9af1856e91 Merge "Rename bzl files to scl" into main 2023-11-08 00:49:34 +00:00
Treehugger Robot
bf25b080d6 Merge "Generate incremental OTAs for 16K/4K boot option" into main 2023-11-08 00:11:41 +00:00
Cole Faust
a44c7bd1ca Rename bzl files to scl
These files don't have anything to do with bazel, they just use starlark as a configuration
language. Bazel recently introduced the scl file extension to use for this format, which doesn't
have any bazel-specific symbols. Use that extension for our pure starlark files as well.

Bug: 309686282
Test: Presubmits
Change-Id: I7b08f342e7fb94405a52af0918ae6a7d542f3282
2023-11-07 15:30:39 -08:00
Yifei Zhang
e6d996479b build: add a few proguard rules [1/3]
- Introduce a new directory for some specific proguard rules.

kotlin.flags:
- Remove DebugMetadata
- Don't warn about missing non-runtime annotations

Test: build AOSP & test on internal
Bug: 309023911
Change-Id: Iee740b61a2afeba3482ff4e1f8213bd4cf46174a
2023-11-07 14:36:01 -08:00
Cole Faust
7c8607715d Merge "Only allow .scl files to load other .scl files" into main 2023-11-07 21:41:37 +00:00
LaMont Jones
bae67b9994 Merge changes from topic "product-flags2" into main
* changes:
  Reapply "release_config: build flags can be lists"
  Reapply "Add support for product-specific build flags"
2023-11-07 20:12:50 +00:00
Cole Faust
5b8dda087d Only allow .scl files to load other .scl files
.scl files are starlark configuraiont language files, which is starlark
without any of the bazel buildin symbols.

This is to match bazel's behavior, and it doesn't make sense for
scl files to load bzl files.

We should change all the release config bzl files to scl, and then
also make it so that when using executionModeScl you can only load
scl files.

Test: go test
Change-Id: I196bcf3a4548118791ed1d47c2d37e46a1ef86c4
2023-11-07 11:27:41 -08:00
LaMont Jones
2dae3d6b50 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.

Bug: b/302593603, b/304814040, b/309477343
Test: manual
Change-Id: I58eb71f2ee6d8f08f11a432993f23157831ec93c
2023-11-06 22:16:49 +00:00
LaMont Jones
38b195ea7e 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.

Bug: b/302593603, b/309477343
Test: manual
Change-Id: Ic1f0512ec4b06ac94dd3f29eadd6a03ba8ebf6d2
2023-11-06 22:15:19 +00:00
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
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