Steven Moreland
343a1c90ea
Merge "Android builds default to 64-bit." into main am: 48c53d600e
am: 066ad556ab
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3109067
Change-Id: I3357273d9954511175bcd5ae5bfd9257230934b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-03 18:43:58 +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
Treehugger Robot
df8589e6b6
Merge "Override map for enabling mainline module prebuilts" into main am: 08445aada2
am: c284f8c8d2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3109349
Change-Id: Ie740a8039108aa04051af68188bf323e2ef9a851
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-01 02:33:14 +00: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
51d73a71bd
Merge "Enable <uses-library> check for WTS" into main am: bbce78d721
am: 6861c4e538
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3109347
Change-Id: I617a94d8c52d815e8956565633e2a805b06d6586
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-01 01:17:35 +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
967e1ddf25
Merge "Revert "Add soong installed files to general-tests.zip"" into main am: cfb51aa499
am: 4a6c4b076d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3109351
Change-Id: I7bd9312dd4aaca27eae23f1a405fd9b2af56f667
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-31 23:52:08 +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
1516b5e02e
Merge "Add soong installed files to general-tests.zip" into main am: 279204f0c9
am: 7d64251134
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3066804
Change-Id: I2941ecbf220e8d1422883fc1ef2ff7619e339c54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-31 23:09:16 +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
2737f1d829
Merge "Revert "check_elf_file: check prebuilts are aligned"" into main am: 8d5b8c1f98
am: 9b6857d6f8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3110411
Change-Id: Id4663969203b19071f009a27c4b7250d50ae2f63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-31 22:45:32 +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
Steven Moreland
f47dbd2922
Merge "check_elf_file: check prebuilts are aligned" into main am: 26bb2346de
am: b716e006ed
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3101471
Change-Id: I81ab2ae179b0cfc48c0dbd5351b73c53e76dc00e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-31 22:19:47 +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
233e60a3d6
Merge "Rename _all_release_configs so it's more accessible for list_releases command" into main am: 4c825353f9
am: 884f91d424
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3109688
Change-Id: I7f5d8d9433e244f92aa771c8421a53ee8ce8d71d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-31 20:34:25 +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
b4b7d6389e
[automerger skipped] Merge "DO NOT MERGE ANYWHERE Require protobuf for build flags" into main am: ec11bca5c3
-s ours am: 94ba65dc93
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/build/+/3107022
Change-Id: I8ed164f77eba176b110a6fa2cd6053ecda321101
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-31 16:25:07 +00:00
LaMont Jones
dd538a50db
[automerger skipped] DO NOT MERGE ANYWHERE Require protobuf for build flags am: b324a11a6a
-s ours am: de762a00fa
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/build/+/3107022
Change-Id: I6e12180e8551693572656c4ee3f5f7bfa58cd100
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-31 16:24:54 +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
fdd0fa2cd0
Merge "Use generated pvmfw_embedded_key_pub_bin" into main am: 6d52c945d5
am: e8d3b0147c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3101342
Change-Id: Ifccc545695e491aa1ac30357b0bdc33ecad6c2d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-31 09:24:37 +00: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
83e9751766
Merge "Collect xTS jar/apk packages from soong intermediate dirs" into main am: 69fe181b1d
am: c28c06c89a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3105340
Change-Id: Ib96d5ff9cb120599a68c6c8adf29e97feb7971c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-31 09:03:08 +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
f50d2cacd5
Merge "Set appcompat system properties flag if userdebug/eng" into main am: 7de8a01cc1
am: c39dc6a8d7
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3107744
Change-Id: Iac2b233e02104a34e4b39ab8100a94f9db2ba954
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-31 01:45:46 +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
93dc702a1b
Merge "Deliver inheritance_graph-$(TARGET_PRODUCT).dot" into main am: 3cb645bef1
am: 64308c7604
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3106444
Change-Id: I4e37d69bd1bfb484a890a592ebe1651346dbb6f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-31 00:43:46 +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
6ef1489b44
Merge "aconfig: create first implementation of aconfig storage java read api" into main am: ca6602821b
am: 845de05ab4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3106837
Change-Id: I2f1c01b7a62c06eb8047cdee9dfbdcbc98301a51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-30 22:44:19 +00: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