Commit Graph

36017 Commits

Author SHA1 Message Date
Greg Kaiser
89f7e09c03 Merge "Reland: Require TARGET_RELEASE for builds" into main am: 2c8ece0b25
Original change: https://android-review.googlesource.com/c/platform/build/+/2824863

Change-Id: If92a7892878532c87fa3e3e6035cb65f37ebd242
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 14:17:51 +00:00
Greg Kaiser
2c8ece0b25 Merge "Reland: Require TARGET_RELEASE for builds" into main 2023-11-15 13:42:18 +00:00
Treehugger Robot
0c7dd1f269 Merge "Add .product suffix for the product variants" into main am: 251ad2f41f
Original change: https://android-review.googlesource.com/c/platform/build/+/2829418

Change-Id: I5e338a57785f6a84ed4269895bdeeeda0b454116
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 08:35:39 +00:00
Justin Yun
59fbdf0bba Add .product suffix for the product variants
Instead of adding .vendor suffix, add .product suffix to include
product variants.

Bug: 309511650
Test: atest com.android.gts.vndk.VndkDependencyTest#testVndkDependencyTestCase
Change-Id: I6d578be95c618c565347f0fdf660e82945ac77a3
2023-11-15 14:59:39 +09:00
Alyssa Ketpreechasawat
9364c5e506 Merge "Remove jars in PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY (e.g. framework-pdf in MP) from ApexBootJars when prebuilt is enabled." into main am: c7bc53999d
Original change: https://android-review.googlesource.com/c/platform/build/+/2822531

Change-Id: I594a68a6b0e12363378a62e7c59bae2a706f455d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14 19:46:03 +00:00
Alyssa Ketpreechasawat
c7bc53999d Merge "Remove jars in PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY (e.g. framework-pdf in MP) from ApexBootJars when prebuilt is enabled." into main 2023-11-14 19:13:32 +00:00
Justin Yun
0379fe98ee Merge "Define BOARD_API_LEVEL and BOARD_API_LEVEL_FROZEN" into main am: 136fa83d4e
Original change: https://android-review.googlesource.com/c/platform/build/+/2825990

Change-Id: Ie2c6ea2b8897810ab5504b3d88cf775e358ec34a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14 00:07:02 +00:00
Justin Yun
136fa83d4e Merge "Define BOARD_API_LEVEL and BOARD_API_LEVEL_FROZEN" into main 2023-11-13 23:40:06 +00:00
Alyssa Ketpreechasawat
ba231d2084 Remove jars in PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY (e.g. framework-pdf in MP) from ApexBootJars when prebuilt is enabled.
framework-pdf is newly added framework jar which is not yet included in
the actual prebuilt apex. Thus, we add it PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY. The APEX_BOOT_JARS_EXCLUDED will be created based on PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY and will be removed from ApexBootJars.

Bug: 304719212
Test: lunch cf_x86_phone-next-userdebug & m
Test: lunch cf_x86_phone-trunk-userdebug & m
Change-Id: I9902131629900fbd629b8560a422ed8c2b06073c
2023-11-13 13:22:32 +00:00
Colin Cross
4bd43459ea Merge "Escape sbom lines" into main am: 70ed34cc72
Original change: https://android-review.googlesource.com/c/platform/build/+/2824847

Change-Id: If4f0acc2ce978a83e6c2527080de24584dbc3b74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-11 03:52:28 +00:00
Colin Cross
70ed34cc72 Merge "Escape sbom lines" into main 2023-11-11 03:22:11 +00:00
Colin Cross
92f8043874 Escape sbom lines
Go 1.21 changes the names of some factory functions to include
characters that need shell escaping.  Wrap everything written to
the sbom file with single quotes.

Bug: 309895579
Test: m out/target/product/vsoc_x86_64/sbom-metadata.csv
Change-Id: Ia61f02d8b02dd9f92ce144307087423c592a1833
2023-11-10 15:06:21 -08:00
Treehugger Robot
4f0489ae6e Merge changes from topic "disable-dexpreopt-dexopt" into main am: fc9ebd2684
Original change: https://android-review.googlesource.com/c/platform/build/+/2817440

Change-Id: Idf689b6c79faddf383f905049c57aee5e548771a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 19:20:13 +00:00
Treehugger Robot
fc9ebd2684 Merge changes from topic "disable-dexpreopt-dexopt" into main
* changes:
  Add a Make variable to disable all dexpreopt and dexopt activities.
  Update dexopt system properties.
2023-11-10 18:47:19 +00:00
Justin Yun
23d52435f3 Define BOARD_API_LEVEL and BOARD_API_LEVEL_FROZEN
BOARD_API_LEVEL and BOARD_API_LEVEL_FROZEN are set by the release
flags.
BOARD_API_LEVEL sets ro.board.api_level that shows the API level of
the vendor API surface.
BOARD_API_LEVEL_FROZEN sets ro.board.api_frozen that shows if the
ro.board.api_level is finalized.

Bug: 295269182
Test: getprop ro.board.api_level
Change-Id: Ie57c57b6c9f1fc0c98968195843059a48da8e512
2023-11-10 16:31:04 +09:00
Colin Cross
d7f59ea0c9 Merge "Skip parts of notice_files.mk that don't apply to Soong modules" into main am: 481b02106c
Original change: https://android-review.googlesource.com/c/platform/build/+/2816118

Change-Id: Iebaf6e894b8131cc7ef9f5ba091b3e974f5407de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 07:13:56 +00:00
Colin Cross
481b02106c Merge "Skip parts of notice_files.mk that don't apply to Soong modules" into main 2023-11-10 06:15:45 +00:00
Juan Yescas
f476e19d72 Merge "16k: Support max-page-size alignment greater than 4096 for x86-64" into main am: 06b7b6c492
Original change: https://android-review.googlesource.com/c/platform/build/+/2824861

Change-Id: Ib4b97c0989ca1a4a8340549f988d56ad720c32a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 23:27:57 +00:00
Juan Yescas
06b7b6c492 Merge "16k: Support max-page-size alignment greater than 4096 for x86-64" into main 2023-11-09 23:07:09 +00:00
Treehugger Robot
62b0a71882 Merge "Remove _kwmarker" into main am: c50601abc4
Original change: https://android-review.googlesource.com/c/platform/build/+/2824864

Change-Id: Id2eb08dcc0bab817294353485302526a52b146dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 22:08:37 +00:00
Juan Yescas
ebadc969a8 16k: Support max-page-size alignment greater than 4096 for x86-64
To simulate 16k page size in x86-64 cuttefish, it is necessary
to compile the shared libraries and binaries with max-page-size greater
than 4096.

Bug: 309816695
Test: source build/envsetup.sh
      lunch aosp_cf_x86_64_phone_pgagnostic-trunk-userdebug
      m
Change-Id: Id8e142a5a3556f5fd30ce90eaac236dcbc1b0881
2023-11-09 12:51:30 -08:00
Cole Faust
b9b54396d4 Remove _kwmarker
python and starlark already have syntax for this.

Test: Presubmits
Change-Id: I9082c1cc62837840f091cd5856b1b4cc39064274
2023-11-09 12:40:38 -08:00
Greg Kaiser
0229ecfae5 Reland: Require TARGET_RELEASE for builds
Relanding because we've fixed a number of the broken build
setups this change exposed.  We will push to fix forward broken
build setups instead of reverting this change again.


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
Change-Id: I0fa4a1c876e607401f4c7f945b9971cfb8db71a0
Test: 'lunch' (still) works; A build attempt without `TARGET_RELEASE` set (now) fails
2023-11-09 20:28:55 +00:00
Jiakai Zhang
bf0c0e6856 Add a Make variable to disable all dexpreopt and dexopt activities.
This change adds a Make variable "OVERRIDE_DISABLE_DEXOPT_ALL", which
disables all dexpreopt and dexopt activities.

This is for faster iteration during development and should never be
enabled for production.

Bug: 309011617
Test: See no dex2oat invocation during build.
Test: Boot and see no dex2oat invocation during boot, except for the
  in-memory boot image for JIT Zygote.
Change-Id: I0193b57fdb18e1fb717f44af81d1cf525f1609ee
2023-11-09 16:50:18 +00:00
Robin Lee
1286a56891 Merge "Revert "Require TARGET_RELEASE for builds"" into main am: 092c6b68b8
Original change: https://android-review.googlesource.com/c/platform/build/+/2821997

Change-Id: I5283eeaf1d01f6d54d733d6094d2400344b7b84f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 09:11:41 +00:00
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
7ffd5ed86a Merge "Require TARGET_RELEASE for builds" into main am: 1f94a3d547
Original change: https://android-review.googlesource.com/c/platform/build/+/2806253

Change-Id: I5a7a346d397741baa773c9cb20232080b13b803b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 04:38:51 +00:00
Treehugger Robot
1f94a3d547 Merge "Require TARGET_RELEASE for builds" into main 2023-11-09 04:23:37 +00:00
Cole Faust
1793e15a24 Merge "Remove release_config.bzl" into main am: f50c26e6e3
Original change: https://android-review.googlesource.com/c/platform/build/+/2822913

Change-Id: I760c180966fa457a702dba27c573a4b01a0a03df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 01:23:17 +00:00
Cole Faust
f50c26e6e3 Merge "Remove release_config.bzl" into main 2023-11-09 00:41:50 +00:00
Treehugger Robot
22fb71304c Merge "build: add a few proguard rules [1/3]" into main am: 2b46f4d199
Original change: https://android-review.googlesource.com/c/platform/build/+/2815690

Change-Id: Ic78bd0b17a63f62686e70d8726236954a9bffbf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 23:28:28 +00:00
Treehugger Robot
2b46f4d199 Merge "build: add a few proguard rules [1/3]" into main 2023-11-08 23:06:02 +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
323bd875e3 Merge "Remove release_config.bzl load" into main am: bcaac55c35
Original change: https://android-review.googlesource.com/c/platform/build/+/2820879

Change-Id: Id7e5c7ff11cf1f035b7001f660fbd7c1198f64b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 08:24:04 +00: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
f9a5c42b65 Merge "add product sepolicy into monitor list" into main am: 8a5b9e4aa2
Original change: https://android-review.googlesource.com/c/platform/build/+/2821017

Change-Id: Ibaa672b0e5908e74a8da47eb1aa92d992585799e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 04:10:56 +00:00
Treehugger Robot
8a5b9e4aa2 Merge "add product sepolicy into monitor list" into main 2023-11-08 03:28:35 +00:00
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
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
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