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
Treehugger Robot
350375ef02
Merge "Add a release config map override for go devices" into main am: 8a402d7e30
am: 59761b9ce6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3107061
Change-Id: Ic4c65c60a83d8ade18d9352a0d1d3d83539151ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 22:37:36 +00:00
Treehugger Robot
da76ca76a6
Merge "Fix syntax error in Makefile" into main am: d4f1d2e6e8
am: 652e8c890f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3098978
Change-Id: Ib56de4029328c353b1b8534fc4af371864c37da7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 22:29:09 +00:00
Cole Faust
e34e931599
Merge "Add instructions to generate java keystore" into main am: 31e9d3d1b2
am: 19dae885ab
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3104279
Change-Id: I3c6a4a36fa8b0d32ba0b6df8299517c6ecc3029e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 22:15:55 +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
Alice Wang
4a3867eac4
Merge "Allow AVF remote attestation to be disabled" into main am: 9347e36e33
am: e73a902801
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3092139
Change-Id: I490474f035ed683dccfa958295a3850d9a7b2298
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 21:58:38 +00:00
Kiyoung Kim
29db52149c
Merge "Do not pass VndkUseCoreVariant into Soong" into main am: 62d2ff000e
am: bbb9d437b1
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3102697
Change-Id: Ifeb6ceac57124ba93fa3e9dc961ce22966cfdc6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 21:54:06 +00:00
Joe Onorato
dd3fb50ca2
Merge changes from topics "envsetup_cleanup_2", "fix_get_build_var", "module_info_functions" into main am: 0f4e684dcf
am: 8b8b002ad0
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3103323
Change-Id: I85255a5e5cb274db7a7cea69993247cfcea1126a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 21:53:37 +00:00
Joe Onorato
6dc381da50
Make get_build_var and get_abs_build_var into scripts. am: 0e68f70ab7
am: 2d85231cb6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3103322
Change-Id: I8b9c5e02683deee00d39ec4dc5c9ff98e63dc4eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 21:53:34 +00:00
Joe Onorato
ab7ae41fcd
More moving shell functions in envsetup.sh to standalone scripts. am: 3acb308f98
am: 1c1f18c9cf
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3103321
Change-Id: I1b8ae2aa6121531211e7d5f49980eb2d1c67bab1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 21:53:30 +00:00
Joe Onorato
d5da4c8df2
Remove apparently unused 'pez' function from envsetup.sh am: ff277c5412
am: e5a3740024
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3103320
Change-Id: I0bcf4c7d3dd756aaf08ea4860880bf96d1ac5e67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 21:53:26 +00:00
Joe Onorato
d18f73ac2c
build/make side of move the module-info.json commands into standalone scripts. am: 6b543839b1
am: cb9fa217ee
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3103319
Change-Id: Iace0e4320a90ff8de680e464635455ff8dcf0745
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 21:53:22 +00:00
Joe Onorato
66f7a6c9d7
Remove the "provision" shell function from envsetup.sh am: d4e29a4b63
am: 5875b3f025
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3103318
Change-Id: I51145999fc5b0658d6541d08fb572a3f803606bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 21:53:19 +00:00
Treehugger Robot
b6f89d44b3
Merge "Deliver all_release_configs.json as a build artifact" into main am: d9fe8f5a27
am: 0497847a43
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3097723
Change-Id: I4b743911846e46cf6cda35f2724365469352a1f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 21:52:53 +00:00
Xin Li
44cb713276
[automerger skipped] Merge "Merge Android 24Q2 Release (ab/11526283) to aosp-main-future" into aosp-main-future am: 2389748ddb
-s ours
...
am skip reason: Merged-In I713a528d437e3446d32461add648e3b52b036d7a with SHA-1 61b282a9b1
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/27273857
Change-Id: If51eab1b0aa8876c25aed6e3558117d827c31982
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 19:49:44 +00:00
Xin Li
cb086884bc
[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: b04e9cc36f
-s ours
...
am skip reason: Merged-In I713a528d437e3446d32461add648e3b52b036d7a with SHA-1 61b282a9b1
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/27273857
Change-Id: I7d0bfd36e4f9f72d28562196abe8b312d129355c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 19:45:33 +00: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
LaMont Jones
81142507ca
Deliver all_release_configs.json as a build artifact am: 6b081071b8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/27562359
Change-Id: I17c2026f2d597525d872db8b07799c064346aa06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 03:38:04 +00:00
LaMont Jones
6b081071b8
Deliver all_release_configs.json as a build artifact
...
Bug: 328495189
Test: manual
Ignore-AOSP-First: cherry-pick
Merged-In: Iebb07c303e6eae51d6c74dd80aa5ac2024b5629e
Change-Id: Iebb07c303e6eae51d6c74dd80aa5ac2024b5629e
2024-05-28 16:26:45 -07: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
Joe Onorato
3acb308f98
More moving shell functions in envsetup.sh to standalone scripts.
...
Bug: 340648588
Test: run the scripts
Change-Id: I2b7ca19946b3669a9aef101b504cf4cfcbed1da3
2024-05-24 14:37:51 -07:00
Joe Onorato
ff277c5412
Remove apparently unused 'pez' function from envsetup.sh
...
Bug: 340648588
Test: treehugger, code search
Change-Id: I0a433b36c21a0bda4635463ab70f88d7ae40878c
2024-05-24 14:37:51 -07:00
Joe Onorato
6b543839b1
build/make side of move the module-info.json commands into standalone scripts.
...
Bug: 340648588
Test: run them
Change-Id: I5c072ee8481630327be9dccbbca501293a7b34cd
2024-05-24 14:37:51 -07:00
Joe Onorato
d4e29a4b63
Remove the "provision" shell function from envsetup.sh
...
It's been a long time since anything in the tree generated the
$ANDROID_PRODUCT_OUT/provision-device script needed for it to work.
Bug: 340648588
Test: treehugger
Change-Id: I5f34fb7b9ed9f6c06d422ddeb55a5ef9aa367538
2024-05-24 14:37:51 -07:00
Joe Onorato
1487ee1dba
Delete envsetup.sh functions that haven't worked for a long time.
...
- Bugreports don't go to /sdcard/bureports, and adb bugreport has
a much better UI now.
- I don't hink smoketest hasn't worked since the original Android
git contribution, based on the path names in this function.
Bug: 340648588
Test: treehugger
Change-Id: Ie450f9740aa3fe7af50d64c2d9d7da56d6d3e39a
2024-05-24 14:37:51 -07:00
Treehugger Robot
0497847a43
Merge "Deliver all_release_configs.json as a build artifact" into main am: d9fe8f5a27
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3097723
Change-Id: I9010d16aebc8a60fa2d47c405745ea69bf07219f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-24 21:33:04 +00:00
Treehugger Robot
d9fe8f5a27
Merge "Deliver all_release_configs.json as a build artifact" into main
2024-05-24 21:16:28 +00:00