StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
98,439 Commits 1 Branch 0 Tags
1e56e9660997e7bda045897155be7fd5a080fbdb
Commit Graph

98439 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Onorato
1e56e96609 Merge "Add new simplified lunch function (lunch2)" into main am: fc19715ebf am: 070808646e 
Original change: https://android-review.googlesource.com/c/platform/build/+/3101473

Change-Id: I589461579736e186abf852f7e55f8d20bad46f90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-04 23:34:18 +00:00
Joe Onorato
070808646e Merge "Add new simplified lunch function (lunch2)" into main am: fc19715ebf 
Original change: https://android-review.googlesource.com/c/platform/build/+/3101473

Change-Id: I1f41c20816e37c542468fc32da3bde4d2f380d38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-04 23:26:13 +00:00
Joe Onorato
fc19715ebf Merge "Add new simplified lunch function (lunch2)" into main 2024-06-04 23:09:10 +00:00
Cole Faust
2ccea368f6 Merge "Remove unused variables in soong variables file" into main am: d816a727b8 am: b5b8902b29 
Original change: https://android-review.googlesource.com/c/platform/build/+/3114139

Change-Id: I8b0306090b6fc98556c1519741f93533b04a9a4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-04 23:07:36 +00:00
Joe Onorato
590ae9f785 Add new simplified lunch function (lunch2) 
Includes tests for envsetup.sh

After we've tried this for a bit and are happy, this will be swapped out
to become the new standard lunch and all of the menus and stuff will be
removed.

Test: build/make/tools/envsetup/run_envsetup_tests
Change-Id: Idebeeb1153406238b6c32f3f564c7bc1e7ced7e6
 2024-06-04 16:04:49 -07:00
Cole Faust
b5b8902b29 Merge "Remove unused variables in soong variables file" into main am: d816a727b8 
Original change: https://android-review.googlesource.com/c/platform/build/+/3114139

Change-Id: Ic95341bfc82d33b117ba760d9d87340873111085
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-04 22:51:24 +00:00
Cole Faust
d816a727b8 Merge "Remove unused variables in soong variables file" into main 2024-06-04 22:23:09 +00:00
Treehugger Robot
9861b785c1 Merge "Reland "check_elf_file: check prebuilts are aligned"" into main am: 69e8c9be5f am: 9830e817d6 
Original change: https://android-review.googlesource.com/c/platform/build/+/3110301

Change-Id: I482fad100593b127dd8fb9e35bdabcfc4cfcd123
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-04 22:11:33 +00:00
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
LaMont Jones
391609c3bf Merge "Require protobuf for build flags" into main 2024-06-04 21:18:21 +00:00
Treehugger Robot
bd9e028af3 Merge "DO NOT MERGE ANYWHERE Revert "Require protobuf for build flags"" into main 2024-06-04 19:05:05 +00:00
LaMont Jones
2ef7438ff5 Require protobuf for build flags 
This change forces build flags from .scl to .textproto format.

This change resubmits commit 8663122eac
such that it will merge downstream.

Bug: 328495189
Bug: 338450506
Test: manual, TH
Ignore-AOSP-First: DNMA in aosp-main to avoid aosp-main-future
Change-Id: I024f620b55e5e655f2b7b4764b217744334f7995
 2024-06-04 11:45:53 -07:00
Cole Faust
58c46179b7 Remove unused variables in soong variables file 
Test: Presubmits
Change-Id: I9c303c4dab9ad18653cda7ca62ec8884d044bba0
 2024-06-04 11:10:59 -07: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
Treehugger Robot
081766d50c Merge "Override map for enabling Go mainline module prebuilts" into main 2024-06-04 00:19:37 +00:00
Ronald Braunstein
65f6aa6ba4 Merge "Reapply "Add soong installed files to general-tests.zip"" into main am: 68452cdcce am: 173298547b 
Original change: https://android-review.googlesource.com/c/platform/build/+/3111079

Change-Id: Ibc84773c742c6a01c5997a1dec1def34b383092b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-03 23:11:21 +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
LaMont Jones
d0b3b82d20 DO NOT MERGE ANYWHERE Revert "Require protobuf for build flags" 
This reverts commit 8663122eac.

Reason for revert: Was DNMA aosp/main with same ChangeId.  Will resubmit with new one, so that it actually merges.

Change-Id: Ifa1b3b3901b88882f5ea790b0cc582bd828a8619
 2024-06-03 22:05:14 +00:00
LaMont Jones
c58de8fbb3 Merge "Require protobuf for build flags" into main 2024-06-03 20:37:27 +00:00
Spandan Das
07609e780a Override map for enabling Go mainline module prebuilts 
The release config maps in `v/g_sh/b/r/gms_mainline_go/required`
will be used to enable Go mainline prebuilts of mandatory modules by
both internal google products and partner OEMs.

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

Bug: 342265627
Test: lunch mokey_go32-ap3a-userdebug
Test: verified that the following vars are same before and after change
Test: get_build_var RELEASE_APEX_CONTRIBUTIONS_ADBD # go prebuilt
Test: get_build_var RELEASE_APEX_CONTRIBUTIONS_REMOTEKEYPROVISIONING #
go prebuilt
Test: get_build_var RELEASE_APEX_CONTRIBUTIONS_UWB # go prebuilt
Ignore-AOSP-First: part of a topic

Change-Id: Ib80c4eef669dcfc3eaf8bb8dc5b9eb011d335fd0
 2024-06-03 19:07:31 +00:00
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
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
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