Commit Graph

97863 Commits

Author SHA1 Message Date
Ronald Braunstein
7d64251134 Merge "Add soong installed files to general-tests.zip" into main am: 279204f0c9
Original change: https://android-review.googlesource.com/c/platform/build/+/3066804

Change-Id: I0c8cc58b7977a1b36b04905bf06b071b4590daa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-31 23:03:11 +00:00
Ronald Braunstein
279204f0c9 Merge "Add soong installed files to general-tests.zip" into main 2024-05-31 22:58:10 +00:00
Priyanka Advani
9b6857d6f8 Merge "Revert "check_elf_file: check prebuilts are aligned"" into main am: 8d5b8c1f98
Original change: https://android-review.googlesource.com/c/platform/build/+/3110411

Change-Id: I25ab04d528185a17f3f82b089b1292a97a9d65fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-31 22:37:38 +00:00
Priyanka Advani
8d5b8c1f98 Merge "Revert "check_elf_file: check prebuilts are aligned"" into main 2024-05-31 22:27:08 +00:00
Priyanka Advani
411fb17537 Revert "check_elf_file: check prebuilts are aligned"
This reverts commit 432bd660dc.

Reason for revert: Droidmonitor created revert due to breakage in b/344033120

Change-Id: I40f3e1becf3e7d944fdc868bd4000d7602db1d15
2024-05-31 22:14:22 +00:00
Steven Moreland
b716e006ed Merge "check_elf_file: check prebuilts are aligned" into main am: 26bb2346de
Original change: https://android-review.googlesource.com/c/platform/build/+/3101471

Change-Id: I29118e75b78ccfbfcc1b69640d0f2078804e21d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-31 22:11:13 +00:00
Steven Moreland
26bb2346de Merge "check_elf_file: check prebuilts are aligned" into main 2024-05-31 22:02:55 +00:00
Joe Onorato
884f91d424 Merge "Rename _all_release_configs so it's more accessible for list_releases command" into main am: 4c825353f9
Original change: https://android-review.googlesource.com/c/platform/build/+/3109688

Change-Id: I6d908f2ae66c5f40b2801896edc544fdacab9f98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-31 20:27:00 +00:00
Joe Onorato
4c825353f9 Merge "Rename _all_release_configs so it's more accessible for list_releases command" into main 2024-05-31 20:22:06 +00:00
LaMont Jones
94ba65dc93 [automerger skipped] Merge "DO NOT MERGE ANYWHERE Require protobuf for build flags" into main am: ec11bca5c3 -s ours
am skip reason: contains skip directive

Original change: https://android-review.googlesource.com/c/platform/build/+/3107022

Change-Id: I5252460098db060fa09ca40be99cf77e1e0d9ded
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-31 16:18:09 +00:00
LaMont Jones
de762a00fa [automerger skipped] DO NOT MERGE ANYWHERE Require protobuf for build flags am: b324a11a6a -s ours
am skip reason: contains skip directive

Original change: https://android-review.googlesource.com/c/platform/build/+/3107022

Change-Id: Ifc48d68d7a5331eec6a575ee849a51296901d55e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-31 16:18:03 +00:00
LaMont Jones
ec11bca5c3 Merge "DO NOT MERGE ANYWHERE Require protobuf for build flags" into main 2024-05-31 16:10:37 +00:00
Ronald Braunstein
523696e964 Add soong installed files to general-tests.zip
The module `test_module_config` will be installing symlinks in the
testcases directory pointing back to the `base` test for .apk files.
This saves a gigs of space on disk and in suite zip files.

However, the .mk files were using  LOCAL_COMPATIBILITY_SUPPORT_FILE to
do two things:
  1) copy the file from intermediates to testcases
  2) package the testcases files in zips.

Because the test_module_config rule is taking care of 1), we need a new
variable to do just 2)

Test: m general-tests device-tests
Change-Id: Icdad4401cde27d8edd5e13e486b96c62817a4bbb
2024-05-31 08:23:08 -07:00
Treehugger Robot
e8d3b0147c Merge "Use generated pvmfw_embedded_key_pub_bin" into main am: 6d52c945d5
Original change: https://android-review.googlesource.com/c/platform/build/+/3101342

Change-Id: I16fc8a2f2d00544ef28a75dc30f483682a677f40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-31 09:18:41 +00:00
Treehugger Robot
6d52c945d5 Merge "Use generated pvmfw_embedded_key_pub_bin" into main 2024-05-31 09:09:31 +00:00
Yihan Dong
c28c06c89a Merge "Collect xTS jar/apk packages from soong intermediate dirs" into main am: 69fe181b1d
Original change: https://android-review.googlesource.com/c/platform/build/+/3105340

Change-Id: I5ea7ea5dde42a0f99b828bb92c95616dd75ae803
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-31 08:55:48 +00:00
Yihan Dong
69fe181b1d Merge "Collect xTS jar/apk packages from soong intermediate dirs" into main 2024-05-31 08:46:25 +00:00
Nate Myren
c39dc6a8d7 Merge "Set appcompat system properties flag if userdebug/eng" into main am: 7de8a01cc1
Original change: https://android-review.googlesource.com/c/platform/build/+/3107744

Change-Id: Iffb914e72be4c1c69bd59f5b2caec5aad28e55f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-31 01:38:56 +00:00
Nate Myren
7de8a01cc1 Merge "Set appcompat system properties flag if userdebug/eng" into main 2024-05-31 01:31:38 +00:00
Treehugger Robot
64308c7604 Merge "Deliver inheritance_graph-$(TARGET_PRODUCT).dot" into main am: 3cb645bef1
Original change: https://android-review.googlesource.com/c/platform/build/+/3106444

Change-Id: I59088fabe26d72aeb84b60716cc9642a30d4bddf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-31 00:43:15 +00:00
Treehugger Robot
3cb645bef1 Merge "Deliver inheritance_graph-$(TARGET_PRODUCT).dot" into main 2024-05-31 00:38:07 +00:00
Joe Onorato
5f14162375 Rename _all_release_configs so it's more accessible for list_releases
command

Bug: 340648588
Test: list_releases
Change-Id: Id5397a0e06585897866b7497837e1a106ab0c28e
2024-05-30 15:48:07 -07:00
Dennis Shen
845de05ab4 Merge "aconfig: create first implementation of aconfig storage java read api" into main am: ca6602821b
Original change: https://android-review.googlesource.com/c/platform/build/+/3106837

Change-Id: I9c8280841afb2153c7e716ceea4947026744129a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-30 22:36:10 +00:00
Dennis Shen
ca6602821b Merge "aconfig: create first implementation of aconfig storage java read api" into main 2024-05-30 22:09:44 +00:00
LaMont Jones
b324a11a6a DO NOT MERGE ANYWHERE Require protobuf for build flags
This change forces build flags from .scl to .textproto format.

Bug: 328495189
Bug: 338450506
Test: manual, TH
Change-Id: Ia33aae158d62c12666d97449cea0c02b60550a21
2024-05-30 13:49:10 -07:00
Nate Myren
eb2648eacc Set appcompat system properties flag if userdebug/eng
Bug: 331307495
Test: m
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c7d08b74321a355c5a5daefdb899d1ac63b861fa)
Merged-In: I7d3080487b60536f5948ab1482a3fd4aee8371d4
Change-Id: I7d3080487b60536f5948ab1482a3fd4aee8371d4
2024-05-30 19:03:56 +00:00
Steven Moreland
432bd660dc check_elf_file: check prebuilts are aligned
WARNING: two things still need to be done
1. this should probably only be enabled when PAGE_SIZE
   is undefined, but I'm curious what other targets
   break now.
2. we may need a per-prebuilt way to disable this,
   like some of the other settings here.

For prebuilts added onto a device, we can check the
page alignment matches the one declared in the build
configuration.

Bug: 342466032
Test: manually, by changing the script to require 64 KB
  alignment, I was able to see its errors on new targets.
Change-Id: Ic118245e64d67204bf5fa740a3e1afb7325b34f5
2024-05-30 17:31:08 +00:00
Dennis Shen
e5dd91bca7 aconfig: create first implementation of aconfig storage java read api
1, See AconfigStorageReadAPI.java to see java APIs to map storage files
and read flag values. It is using fast native annotation, in theory it
should be faster than regular JNI without much of the overhead.

2, The java api calls into Rust wrapper in srcs/lib.rs, note that
MappedByteBuffer is not copied during JNI. In the rust side
implementation we get the underlying raw pointer and buffer size and
reconstruct a rust slice. However, at current implmentation, the string
input such as package name and flag name are most likely copied. They
are converted from JStirng to JavaStr first without copy, then the
into() call to convert it to Rust string. We could potentially optimize
it to without copy.

3, Add an android_test target to lock down the API behaviors.

Bug: b/321077378
Test: atest -c
Change-Id: I8915fe70e8eb341be563c70f85e19e644e8aa6be
2024-05-30 00:32:42 +00:00
LaMont Jones
52f63ed170 Deliver inheritance_graph-$(TARGET_PRODUCT).dot
Bug: 328495189
Test: manual, TH
Change-Id: I9cf6a7e2eed173add02bfb8ccb10a3bf31e7812c
2024-05-29 14:59:28 -07:00
Yihan Dong
f55cd66417 Collect xTS jar/apk packages from soong intermediate dirs
These data will be used in API map analysis.

Test: m
Bug: 328699028

Change-Id: Ie95d8fd46ecb3b2eec4441b91c5ad5297558f3ee
2024-05-29 17:52:21 +08:00
Treehugger Robot
59761b9ce6 Merge "Add a release config map override for go devices" into main am: 8a402d7e30
Original change: https://android-review.googlesource.com/c/platform/build/+/3107061

Change-Id: Ic7c990088c1706fd7eef4535510e15c14f8ad1e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-28 23:13:19 +00:00
Treehugger Robot
8a402d7e30 Merge "Add a release config map override for go devices" into main 2024-05-28 22:53:34 +00:00
Treehugger Robot
652e8c890f Merge "Fix syntax error in Makefile" into main am: d4f1d2e6e8
Original change: https://android-review.googlesource.com/c/platform/build/+/3098978

Change-Id: I5434c715719309f792300b2586baf88c2fb9127f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-28 21:48:15 +00:00
Treehugger Robot
d4f1d2e6e8 Merge "Fix syntax error in Makefile" into main 2024-05-28 21:27:38 +00:00
Spandan Das
fa22579c4d Add a release config map override for go devices
This is a followup to https://r.android.com/3069967 and moves the
override map to v/google_shared/build/release. This allows sharing of
build flags between internal and partner builds.

Bug: 342265627
Test: presubmits
Test: verified that this map shows up in `get_build_var
PRODUCT_RELEASE_CONFIG_MAPS` of a go device

Change-Id: I1cb874a27cd3029a47a4634598420fb5b218ce7d
2024-05-28 21:12:10 +00:00
Cole Faust
19dae885ab Merge "Add instructions to generate java keystore" into main am: 31e9d3d1b2
Original change: https://android-review.googlesource.com/c/platform/build/+/3104279

Change-Id: I4d8f3b5ffb70c6eb707717884f9ebf440924ba61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-28 20:41:11 +00:00
Cole Faust
31e9d3d1b2 Merge "Add instructions to generate java keystore" into main 2024-05-28 20:28:46 +00:00
Alice Wang
e73a902801 Merge "Allow AVF remote attestation to be disabled" into main am: 9347e36e33
Original change: https://android-review.googlesource.com/c/platform/build/+/3092139

Change-Id: I1ce6dfb7f4fe21f0e6b0e84d0ea7e1a3dee1e461
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-27 08:57:16 +00:00
Alice Wang
9347e36e33 Merge "Allow AVF remote attestation to be disabled" into main 2024-05-27 08:38:37 +00:00
Daniel Zhang
b46b840e18 Add instructions to generate java keystore
copied from commit message packages/inputmethods/LatinIME c884b6631f5d13637167f6bc66bbb81e6a00bd8f

Change-Id: Ie3d48041004930ca5e62c442778eb915fb99d257
Signed-off-by: Daniel Zhang <danielzhang130@gmail.com>
Test: none
2024-05-27 01:30:15 +00:00
Kiyoung Kim
bbb9d437b1 Merge "Do not pass VndkUseCoreVariant into Soong" into main am: 62d2ff000e
Original change: https://android-review.googlesource.com/c/platform/build/+/3102697

Change-Id: I6946af113dbfe7ffff5f3be833dd236bd410936e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-27 01:11:55 +00:00
Kiyoung Kim
62d2ff000e Merge "Do not pass VndkUseCoreVariant into Soong" into main 2024-05-27 00:59:37 +00:00
Joe Onorato
8b8b002ad0 Merge changes from topics "envsetup_cleanup_2", "fix_get_build_var", "module_info_functions" into main am: 0f4e684dcf
Original change: https://android-review.googlesource.com/c/platform/build/+/3103323

Change-Id: Ib1dda05ad3d05309ebd1ccb6c3505b0991bcced3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-25 17:34:36 +00:00
Joe Onorato
2d85231cb6 Make get_build_var and get_abs_build_var into scripts. am: 0e68f70ab7
Original change: https://android-review.googlesource.com/c/platform/build/+/3103322

Change-Id: I3db7dfe91c1922a0c13cc0a25f9f06a5db0f4372
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-25 17:34:32 +00:00
Joe Onorato
1c1f18c9cf More moving shell functions in envsetup.sh to standalone scripts. am: 3acb308f98
Original change: https://android-review.googlesource.com/c/platform/build/+/3103321

Change-Id: Ib366837c4912edf61f13adfdda0c84667048d404
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-25 17:34:30 +00:00
Joe Onorato
e5a3740024 Remove apparently unused 'pez' function from envsetup.sh am: ff277c5412
Original change: https://android-review.googlesource.com/c/platform/build/+/3103320

Change-Id: Ie52872572e0c4efa088225f42b69ea556ddaeaaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-25 17:34:25 +00:00
Joe Onorato
cb9fa217ee build/make side of move the module-info.json commands into standalone scripts. am: 6b543839b1
Original change: https://android-review.googlesource.com/c/platform/build/+/3103319

Change-Id: If9c7ca161f7040fcc1fdea8f5124aa67f0ade7ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-25 17:34:22 +00:00
Joe Onorato
5875b3f025 Remove the "provision" shell function from envsetup.sh am: d4e29a4b63
Original change: https://android-review.googlesource.com/c/platform/build/+/3103318

Change-Id: Ia1c86dff8bc457a436770f9745f8d695363fc70d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-25 17:34:16 +00:00
Joe Onorato
0f4e684dcf Merge changes from topics "envsetup_cleanup_2", "fix_get_build_var", "module_info_functions" into main
* changes:
  Delete envsetup.sh functions that haven't worked for a long time.
  Make get_build_var and get_abs_build_var into scripts.
  More moving shell functions in envsetup.sh to standalone scripts.
  Remove apparently unused 'pez' function from envsetup.sh
  build/make side of move the module-info.json commands into standalone scripts.
  Remove the "provision" shell function from envsetup.sh
2024-05-25 17:17:01 +00:00
Joe Onorato
0e68f70ab7 Make get_build_var and get_abs_build_var into scripts.
Inside envsetup.sh there's an optimization to batch their calls. That's
now done by _get_build_var_cached and _get_abs_build_var_cached.

Bug: 340648588
Test: lunch
Change-Id: I63e39c7dc7705b0e6e7052cb8d9f9840ae398e6b
2024-05-24 14:37:51 -07:00