Commit graph

97881 commits

Author SHA1 Message Date
Treehugger Robot
9830e817d6 Merge "Reland "check_elf_file: check prebuilts are aligned"" into main am: 69e8c9be5f
Original change: https://android-review.googlesource.com/c/platform/build/+/3110301

Change-Id: I53a7274547eb1731191a5ea4690d4627926f9e13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-04 21:47:36 +00:00
Treehugger Robot
69e8c9be5f Merge "Reland "check_elf_file: check prebuilts are aligned"" into main 2024-06-04 21:29:47 +00:00
Steven Moreland
52c2371ae8 Reland "check_elf_file: check prebuilts are aligned"
This reverts commit 411fb17537.

Reason for revert: reland after other targets are fixed b/342466032

Bug: 342466032
Test: build, w/ and w/o checking enabled

Change-Id: I830166faffec781cf6cc4fea47140a60b0a12466
2024-06-04 17:26:12 +00:00
Ronald Braunstein
173298547b Merge "Reapply "Add soong installed files to general-tests.zip"" into main am: 68452cdcce
Original change: https://android-review.googlesource.com/c/platform/build/+/3111079

Change-Id: I94c5fcd5952eaa54fc34f4ee9aba5933f25c43a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-03 23:03:07 +00:00
Ronald Braunstein
68452cdcce Merge "Reapply "Add soong installed files to general-tests.zip"" into main 2024-06-03 22:54:57 +00:00
Steven Moreland
066ad556ab Merge "Android builds default to 64-bit." into main am: 48c53d600e
Original change: https://android-review.googlesource.com/c/platform/build/+/3109067

Change-Id: I69fb3c0342d84e5eac60e03ddce22ab350f23f81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-03 18:37:07 +00:00
Steven Moreland
48c53d600e Merge "Android builds default to 64-bit." into main 2024-06-03 18:32:26 +00:00
Ronald Braunstein
b86f9ef159 Reapply "Add soong installed files to general-tests.zip"
This reverts commit f2685e5ccf.

Original commit broke building sdk/ndk in post submit.
Fixed with small patch in build/soong

Test: m general-tests
Test: IST_DIR=/usr/local/google/dist/bug TARGET_RELEASE=trunk_staging TARGET_BUILD_VARIANT=userdebug UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true packages/modules/common/build/mainline_modules_sdks.sh
Change-Id: I47e39913878219adec6471a474e3c238c4bdeed1
2024-06-02 07:21:37 -07:00
Treehugger Robot
c284f8c8d2 Merge "Override map for enabling mainline module prebuilts" into main am: 08445aada2
Original change: https://android-review.googlesource.com/c/platform/build/+/3109349

Change-Id: I738f2e2367db36b4b1cef35dca8aa734288ca3ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-01 02:25:17 +00:00
Treehugger Robot
08445aada2 Merge "Override map for enabling mainline module prebuilts" into main 2024-06-01 02:21:29 +00:00
Treehugger Robot
6861c4e538 Merge "Enable <uses-library> check for WTS" into main am: bbce78d721
Original change: https://android-review.googlesource.com/c/platform/build/+/3109347

Change-Id: Idef740bdafd2d3d028ee1c3120aea773f234719c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-01 01:09:45 +00:00
Treehugger Robot
bbce78d721 Merge "Enable <uses-library> check for WTS" into main 2024-06-01 01:02:59 +00:00
Spandan Das
c3ff9f4beb Override map for enabling mainline module prebuilts
The release config maps in `v/g_sh/b/r/gms_mainline/required`
to enable mainline prebuilts of mandatory modules by
both internal google products and partner OEMs.

Addition of `v/g_sh/b/r/gms_mainline/optional` is product dependent, and
will have to be added separately

Bug: 342265627
Test: lunch cf_x86_64_phone-ap3a-userdebug
Test: verified that the following vars are same before and after change
Test: get_build_var RELEASE_APEX_CONTRIBUTIONS_ADBD # prebuilt
Test: get_build_var RELEASE_APEX_CONTRIBUTIONS_REMOTEKEYPROVISIONING #
prebuilt
Test: get_build_var RELEASE_APEX_CONTRIBUTIONS_UWB # prebuilt

Test: lunch cf_x86_64_wear-ap3a-userdebug && get_build_var
RELEASE_APEX_CONTRIBUTION_ADBD # empty string

Change-Id: Id7f0f97aa3ea11d4ab5b818349cb7905e3e79b29
2024-06-01 00:05:22 +00:00
Yingzhe Li
6f29441e37 Enable <uses-library> check for WTS
<uses-library> checks are disabled on test suites by default. There were
changes merged in WTS that broke regular device build due to the lack of
this check in WTS.

This change adds such check to WTS.

Bug: 341311669

Test: m wts; verifies <uses-library> check is executed
Change-Id: Iafb10c15cf3569c500c46354f81325f0d834e0aa
2024-05-31 23:56:05 +00:00
Priyanka Advani
4a6c4b076d Merge "Revert "Add soong installed files to general-tests.zip"" into main am: cfb51aa499
Original change: https://android-review.googlesource.com/c/platform/build/+/3109351

Change-Id: I9dcf300af6407f9a42827a417417970e739adecd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-31 23:43:54 +00:00
Priyanka Advani
cfb51aa499 Merge "Revert "Add soong installed files to general-tests.zip"" into main 2024-05-31 23:39:49 +00:00
Priyanka Advani
f2685e5ccf Revert "Add soong installed files to general-tests.zip"
Revert submission 3060229-ron-tmc-symlinks

Reason for revert: Droidmonitor created revert due to b/344045516

Reverted changes: /q/submissionid:3060229-ron-tmc-symlinks

Change-Id: Ic471df68c3ebdeb368eac9549446ee50b17d7c2f
2024-05-31 23:31:17 +00:00
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
Steven Moreland
c89cf9628b Android builds default to 64-bit.
Some people don't specify what they build. This came up on
some host tools target, and there were some interactions.
Anyway, 64-bit is in, 32-bit is out. Cheers.

Bug: N/A
Test: N/A
Change-Id: I69ab62d88011df90874e4ba05ee34b61805911e0
2024-05-31 20:23:16 +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