Cole Faust
6309234411
Require scl files in ExecutionModeScl
...
Also remove json from scl file builtins, as it's not in bazel.
Bug: 309686282
Test: Presubmits
Change-Id: I6227c5dc14922b4682380254b4716b4ae38c47b9
2023-11-13 11:47:30 -08:00
Devin Moore
0b69afa338
Revert "Remove android.hidl.memory library from the VNDK"
...
Revert submission 2818339-remove_hidl_memory
Reason for revert: b/310680652 broke VTS tests
Reverted changes: /q/submissionid:2818339-remove_hidl_memory
Change-Id: Ie55fd1d0b8429a17966755ec1c54b2868ca966f9
2023-11-13 19:32:46 +00:00
Devin Moore
77393ba39d
Revert "Stop including android.hidl.memory ashmem impl on V+ devices"
...
Revert submission 2818339-remove_hidl_memory
Reason for revert: b/310680652 broke VTS tests
Reverted changes: /q/submissionid:2818339-remove_hidl_memory
Change-Id: I1065d67949c4270d5351a9ca00ec79ead845020d
2023-11-13 19:32:54 +00:00
Zi Wang
2b09495e2a
Merge "Update test: true to mode: "test"" into main
2023-11-13 19:23:55 +00:00
Devin Moore
7622538d1c
Merge changes from topic "remove_hidl_memory" into main am: 001ed67bba
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2818339
Change-Id: Id79bd6d0bdba7006fee6f1b261155f264c13d812
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-13 19:02:56 +00:00
Devin Moore
001ed67bba
Merge changes from topic "remove_hidl_memory" into main
...
* changes:
Stop including android.hidl.memory ashmem impl on V+ devices
Remove android.hidl.memory library from the VNDK
2023-11-13 17:55:30 +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
7523abc4e1
Merge "Escape sbom lines" into main am: 70ed34cc72
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2824847
Change-Id: I752a0a0e5ac53dd24a797259529aa66d72c13e81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-11 03:52:29 +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
Android Build Coastguard Worker
e07e49acf7
Version bump to UQ1A.231205.015 [core/build_id.mk]
...
Change-Id: Ib41cbea79382fe38bc11a2013d27cc395084c2ed
2023-11-10 23:00:38 +00:00
Treehugger Robot
84d00a4ff6
Merge changes from topic "disable-dexpreopt-dexopt" into main am: fc9ebd2684
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2817440
Change-Id: I3d4007a6aea280118df9cb0073478a497d01590e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-10 19:18:23 +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
Treehugger Robot
0049761888
Merge "Don't build VNDK on GSI" into main am: 1f9ba9c4ec
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2825192
Change-Id: Ibd220ff1a38643d437a363c3a930c02eade12f26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-10 09:08:59 +00:00
Treehugger Robot
0a7b4ebd66
Merge "GSI: add VNDK 34/remove VNDK 29" into main am: 4e7ba9e30c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2826010
Change-Id: Ic4d8d9a155f34b5b8c05c61b60e9b74e05646fb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-10 09:08:45 +00:00
Treehugger Robot
1f9ba9c4ec
Merge "Don't build VNDK on GSI" into main
2023-11-10 09:04:16 +00:00
Treehugger Robot
4e7ba9e30c
Merge "GSI: add VNDK 34/remove VNDK 29" into main
2023-11-10 08:31:14 +00:00
Hung-ying Tyan
d116600dc1
Don't build VNDK on GSI
...
Bug: 308878144
Test: manual mix on T Pixel 6
Change-Id: I924d9a52f542450bdfc727d65e668e56bb89bc50
2023-11-10 08:01:59 +00:00
Hung-ying Tyan
04531b5c79
GSI: add VNDK 34/remove VNDK 29
...
Bug: 291204040
Test: boot GSI on U Pixel
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d4639705bdf86c8b8c1607719eab4f5791e236fe )
Merged-In: I04c50ca03a6ebd9b371a35f66faf5ea7861c6ca5
Change-Id: I04c50ca03a6ebd9b371a35f66faf5ea7861c6ca5
2023-11-10 08:00:56 +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
d8be2bfeef
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: I91ee4c153dd76c4d66ba3e14eb769610233cf129
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-10 07:13:51 +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
Treehugger Robot
5ddf4a3006
Merge "Prevent using symlinks to starlark files" into main am: 124101862b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2824818
Change-Id: Ie8b9274d39ceba0892e90b788afa00b8ab3066e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-10 00:45:45 +00:00
Zi Wang
0ab8a96dcf
Update test: true to mode: "test"
...
Test: CI
Bug: 309990433
Change-Id: I31644510002560fd81c41fbe37f0872fc1135390
2023-11-09 16:33:39 -08:00
Treehugger Robot
124101862b
Merge "Prevent using symlinks to starlark files" into main
2023-11-10 00:00:41 +00:00
Juan Yescas
1b51f6ec38
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: Iaaa88ab3fa7c6302008b04c5400dbdf099697ff3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-09 23:25:59 +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
Cole Faust
ccd26808af
Prevent using symlinks to starlark files
...
Symlinks are frequently confusing / a source of bugs. They also don't
provide much utility over just loading the other file and re-exporting
its symbols, so recommend doing that instead.
Test: Presubmits
Change-Id: Ie3052ebc0add77f1746d6321fbdf7bc15df9819b
2023-11-09 14:32:55 -08:00
Treehugger Robot
1d1abfeded
Merge "Remove _kwmarker" into main am: c50601abc4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2824864
Change-Id: I668458272c7a0bc5a522c273fce9050824d1730e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-09 22:05:10 +00:00
Treehugger Robot
c50601abc4
Merge "Remove _kwmarker" into main
2023-11-09 21:35:20 +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
Dennis Shen
e9ca2c03bf
Merge changes from topic "rust_caching" into main am: 05585a9fa3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2822932
Change-Id: Ibf951e107a314b5aa386fdc41a52c754c3b7f964
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-09 20:46:35 +00: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
Dennis Shen
05585a9fa3
Merge changes from topic "rust_caching" into main
...
* changes:
aconfig: Cache flag values for rust codegen
aconfig: Cache flag values for c/c++ codegen
2023-11-09 20:03:42 +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
Dennis Shen
737b8e30a1
aconfig: Cache flag values for rust codegen
...
Bug: b/307336730
Test: atest aconfig.test
Change-Id: I01741a4205cbe4e9b007f43b043505bcbcf05cd8
2023-11-09 15:15:54 +00:00
Jiakai Zhang
7707456104
Update dexopt system properties.
...
"extract" is now an alias of "verify".
Bug: 309011617
Test: Presubmit
Change-Id: I2bbe1874e2ea3725f3ec46ec6b50287e86cb1cca
2023-11-09 14:04:43 +00:00
Robin Lee
d9bd4a88c9
Merge "Revert "Require TARGET_RELEASE for builds"" into main am: 092c6b68b8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2821997
Change-Id: I82c1101e7b18988f111cec4c61991bfece6ce305
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-09 09:08:32 +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
a4ab25fe43
Merge "Require TARGET_RELEASE for builds" into main am: 1f94a3d547
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2806253
Change-Id: I68c654590b6efe5c398003005a4c171769e9d080
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-09 05:13:44 +00:00
Treehugger Robot
1f94a3d547
Merge "Require TARGET_RELEASE for builds" into main
2023-11-09 04:23:37 +00:00
Abhishek Nigam
795ffffd00
Merge changes from topic "nonabrevert" into main am: 80b1a3fc38
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2820713
Change-Id: I8080b0b0f3c9b0f403a08fe029502246c6736d34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-09 01:21:46 +00:00
Treehugger Robot
884ae7716b
Merge "Fix example lunch target" into main am: 386a58310a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2815677
Change-Id: I520e594e15876d5659e7fc97212e3cc4a0fc9eec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-09 01:21:25 +00:00
Cole Faust
309d2e8113
Merge "Remove release_config.bzl" into main am: f50c26e6e3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2822913
Change-Id: I3259c6510b9e7011ed5229e7d5bb99f61abaf55b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-09 01:21:12 +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
8a01fbd083
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: I7a7241c8f4f0390b2fe8f2e892bc0bbb05e2be5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-08 23:26:12 +00:00