Commit Graph

90603 Commits

Author SHA1 Message Date
Cole Faust
9b8bc9717f Merge "Rename bzl files to scl" into main am: 9af1856e91
Original change: https://android-review.googlesource.com/c/platform/build/+/2819902

Change-Id: I7cf7810870f6e7af16375071e70b0502a8094956
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 01:10:19 +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
8a627f0a15 Merge "Generate incremental OTAs for 16K/4K boot option" into main am: bf25b080d6
Original change: https://android-review.googlesource.com/c/platform/build/+/2768738

Change-Id: Ie3e20d0de73e1cc8a5fc39a512ae0aaa394810b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 00:35:43 +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
f85e863d75 Merge "Only allow .scl files to load other .scl files" into main am: 7c8607715d
Original change: https://android-review.googlesource.com/c/platform/build/+/2820037

Change-Id: I99375cb484df1a96d34fccbddcd25a1df10f3138
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07 22:10:27 +00: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
865c4ef49e Merge changes from topic "product-flags2" into main am: bae67b9994
Original change: https://android-review.googlesource.com/c/platform/build/+/2816075

Change-Id: I5dfeea7d7c8e4f44947728fb9ec45206fdba34d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07 20:20:58 +00:00
LaMont Jones
18bc5ccc98 Reapply "Add support for product-specific build flags" am: 38b195ea7e
Original change: https://android-review.googlesource.com/c/platform/build/+/2816074

Change-Id: I4587ac35f3a24c36d875fdada7303f5846cac66a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07 20:20:55 +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
Devin Moore
3ae48f2e66 Stop including android.hidl.memory ashmem impl on V+ devices
We no longer support HIDL in devices targeting Android V+ vendor.

Test: m && launch_cvd && adb shell ls /vendor/lib64/hw
Bug: 205764958
Change-Id: I6c528be1ae2bf34c790ab2efc83ce7a8db8c9770
2023-11-07 02:13:03 +00:00
Devin Moore
4859a6a250 Remove android.hidl.memory library from the VNDK
This is no longer going to be used in Android V+ device so remove it
from the VNDK.

Test: m
Bug: 205764958
Change-Id: I4f1fb8400a241961e577fbc2afb2730299a884c6
2023-11-06 23:35:48 +00:00
Colin Cross
3e228c7063 Merge "Revert "Reapply "Add support for product-specific build flags""" into main am: 5f24ce6158
Original change: https://android-review.googlesource.com/c/platform/build/+/2818085

Change-Id: If2e2f47e8bd2e3d76feda72124784b5da4e59c45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 22:47:41 +00:00
Colin Cross
336d458c50 Merge "Revert "Reapply "release_config: build flags can be lists""" into main am: cc318d33e1
Original change: https://android-review.googlesource.com/c/platform/build/+/2818084

Change-Id: Iaee8f8106c5157e9f8f8b3aca8ae6d6bb2c629b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 22:47:36 +00: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
1030fb06f9 Merge "Export build flags to soong." into main am: 1acc860f83
Original change: https://android-review.googlesource.com/c/platform/build/+/2795632

Change-Id: Ic17643c06edb3d3988bf6a09dbdc31d63004b0b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 21:34:22 +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
ca14f7f971 Merge "Add PRODUCT_VALIDATION_CHECKS" into main am: 54e9262f99
Original change: https://android-review.googlesource.com/c/platform/build/+/2816880

Change-Id: I89920199476b8dc129b339cf5d4ce1f4019496be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 20:21:30 +00: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
babf70fd87 Merge changes from topic "product-flags" into main am: 253bd067da
Original change: https://android-review.googlesource.com/c/platform/build/+/2815850

Change-Id: Ibe399ef6d26e67ccf1007654acf9d15583316cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 14:37:14 +00: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
0f5b04f64f Merge "add ot-cli-ftd in /system/bin/ for eng and userdebug builds" into main am: 8f1f35461e
Original change: https://android-review.googlesource.com/c/platform/build/+/2817055

Change-Id: Ia8277636b9953f28b379246571a4102bb6cfcc91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 08:33:12 +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
33f35cead6 Merge "Set ro.product.vndk.version for VNDK v35" into main am: 2071b4eac2
Original change: https://android-review.googlesource.com/c/platform/build/+/2814675

Change-Id: Ife0c6917e2f9a49b8edb525785724134dabaced7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-05 08:02:56 +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
4ab268de12 Merge "Retire emulator build files from build/make" into main am: e3dca814e3
Original change: https://android-review.googlesource.com/c/platform/build/+/2816877

Change-Id: I2d54ba35c9e83d9b397cb861b9fd2f6983557284
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-03 18:51:20 +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
0aa2a34d26 Merge changes I2ca9e674,I7e0db3c0,I7e1b6268,I0fa6a46e,I04e8178a into main am: b5ec156b32
Original change: https://android-review.googlesource.com/c/platform/build/+/2815683

Change-Id: If17d717883160e90a0aae19dbf2b6a8b12afcb0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-03 15:51:52 +00: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
26452946c5 Merge "Include following files in the SBOM of layoutlib, which are disted in Soong." into main am: 581b781ac4
Original change: https://android-review.googlesource.com/c/platform/build/+/2809912

Change-Id: Ib0f3825681ddff24501c0f0d3d998b5d691e9cee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 22:51:56 +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
9a22984fb9 Merge "fix potential encoding issues in remote actions" into main am: 39ccc6378e
Original change: https://android-review.googlesource.com/c/platform/build/+/2814613

Change-Id: I6a7e03f15c3b242d33b8dda443a5b7f2ecedc49b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 18:23:38 +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