StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
99,868 Commits 1 Branch 0 Tags
766a3487ef429bcc0ebe9b4fb6563a90d92d529e
Commit Graph

99868 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
75fef75f4f Merge changes from topic "am-233042b8d4194015b3e2cf0f69bfda1b" into android14-tests-dev am: 4f0f22ed65 
Original change: https://android-review.googlesource.com/c/platform/build/+/3198231

Change-Id: I0bc1198446a16a13ee843c2d9e3634bc628664af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 05:17:54 +00:00
Ziwei Zhang
29cef0f2c5 [automerger skipped] Merge "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS." into android13-tests-dev am: 8fc262ab36 -s ours am: 1513cac5ae -s ours 
am skip reason: contains skip directive

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

Change-Id: Ic11a400b2e6d2cd0b73e922ebb66799914b3cec9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 05:17:48 +00:00
Treehugger Robot
7e26d04367 Merge "Add art_build_host_debug to soong config variable" into main am: 9b6324bf40 
Original change: https://android-review.googlesource.com/c/platform/build/+/3189262

Change-Id: Ie9db02b47db5f8f4d5d60fddc56e3d39177ef758
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 05:08:59 +00:00
Automerger Merge Worker
4f0f22ed65 Merge changes from topic "am-233042b8d4194015b3e2cf0f69bfda1b" into android14-tests-dev 
* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS." into android13-tests-dev am: 8fc262ab36 -s ours
  [automerger skipped] RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS. am: 11840e42bd -s ours
 2024-08-02 05:03:00 +00:00
Ziwei Zhang
1513cac5ae [automerger skipped] Merge "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS." into android13-tests-dev am: 8fc262ab36 -s ours 
am skip reason: contains skip directive

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

Change-Id: If5a06d363f6dbd482b653a35676474f9dd08df62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 05:02:54 +00:00
Ziwei Zhang
ae8433307d [automerger skipped] RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS. am: 11840e42bd -s ours 
am skip reason: contains skip directive

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

Change-Id: I458567a2b0bc267aea22b86cbea3b127cec04abe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 05:02:50 +00:00
Ziwei Zhang
8fc262ab36 Merge "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS." into android13-tests-dev 2024-08-02 04:52:40 +00:00
Treehugger Robot
9b6324bf40 Merge "Add art_build_host_debug to soong config variable" into main 2024-08-02 04:50:44 +00:00
Treehugger Robot
4926d66e1b Merge "Reland "Add variables for init.environ.rc"" into main am: 351106c236 
Original change: https://android-review.googlesource.com/c/platform/build/+/3203670

Change-Id: I695a9196a402832bfda4fa3b6edf4a853157b0b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 02:48:05 +00:00
Treehugger Robot
351106c236 Merge "Reland "Add variables for init.environ.rc"" into main 2024-08-02 02:28:10 +00:00
John Wu
5a6dc72340 [Ravenwood] Use default socket timeout 
Test: manually run long ravenwood tests
Flag: EXEMPT host side change only
Change-Id: Ic29bd9279c55a7f9d75aa873451e53bf725b8e6d
 2024-08-02 00:24:18 +00:00
Xin Li
1545a6095b Mark AP3A.240905.001 as merged in aosp-main-future 
Bug: 347831320
Merged-In: I5cf032164ee3086c6e79342fe4a89b1c013ee9fe
Change-Id: Ic12b218f15d360a71c0a5e392e831c4fa318167b
 2024-08-01 16:56:01 -07:00
Lokesh Kumar Goel
c4baa3aa72 Allow PLATFORM_BASE_OS override from product config 
PLATFORM_BASE_OS is used to set value for
ro.build.version.base_os which is used to qualify
a device build as SMR (Security Maintenance Release)
during APFE (Android Partner Approval) to optimize the test span.
See ag/26859560 on how we plan to use this variable.

Add PRODUCT_BASE_OS that can be used to override
PLATFORM_BASE_OS value before making it read_only.

Plan is to set the value for PRODUCT_BASE_OS using build flags.
This way, it can be easily set per device when making on-demand
SMR releases. In future, move it to be set via soong variable
during build process once build system side is ready.

Test: None
Bug: 155105803

Change-Id: I7c4a1f291bb426ad599e1dc937e6ecd3889b5820
 2024-08-01 15:38:12 -07:00
Yurii Zubrytskyi
5dbc1b979b Merge "Revert^2 "Fix signing failure for split APKs"" into main am: 7575d3f967 
Original change: https://android-review.googlesource.com/c/platform/build/+/3204750

Change-Id: Ib6dc29beb720575c55a4bd4eb39f24129d03f027
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-01 16:19:04 +00:00
Yurii Zubrytskyi
7575d3f967 Merge "Revert^2 "Fix signing failure for split APKs"" into main 2024-08-01 15:59:31 +00:00
ELIYAZ MOMIN
10e47e3723 Revert^2 "Fix signing failure for split APKs" 
This reverts commit d06e5a83ba.

Reason for revert: <It's not a culprit any more.>

Change-Id: I405c418e6da88774b174fcb3508eb54039fbdf8e
 2024-08-01 15:43:31 +00:00
Treehugger Robot
6a134d85dc Merge "Added a basic prober script to test code completion." into main am: 80a07d6870 
Original change: https://android-review.googlesource.com/c/platform/build/+/3184559

Change-Id: Ia8ef73d1f8e3757de3d4cf057ef9631d5189b7d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-01 12:20:36 +00:00
Treehugger Robot
80a07d6870 Merge "Added a basic prober script to test code completion." into main 2024-08-01 12:00:01 +00:00
ELIYAZ MOMIN
c3b0167348 Merge "Revert "Fix signing failure for split APKs"" into main am: 8a3f6256fc 
Original change: https://android-review.googlesource.com/c/platform/build/+/3203851

Change-Id: I34d192280b3d3761dcb587675533e8bd141f32b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-01 10:48:36 +00:00
ELIYAZ MOMIN
8a3f6256fc Merge "Revert "Fix signing failure for split APKs"" into main 2024-08-01 10:19:11 +00:00
Ilshat Aliyev
8e13493d4d Added a basic prober script to test code completion. 
Run tests locally

Change-Id: Id8b8b6b4d9b1fae9d7cd5f04a20c239628351b16
 2024-08-01 08:11:45 +00:00
Treehugger Robot
c1fbe7acf3 Merge "Move license metadata declaration of cuttlefish/Android.mk into meta-lic.mk" into main am: ff301aa3a9 
Original change: https://android-review.googlesource.com/c/platform/build/+/3196133

Change-Id: Iaec2858232544463a0bbaf2ce7ce29717bef60d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-01 07:19:07 +00:00
Treehugger Robot
ff301aa3a9 Merge "Move license metadata declaration of cuttlefish/Android.mk into meta-lic.mk" into main 2024-08-01 07:01:29 +00:00
Pechetty Sravani (xWF)
d06e5a83ba Revert "Fix signing failure for split APKs" 
This reverts commit 6871779d9b.

Reason for revert: Potential culprit for b/356752725- verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: I4c29b27f0318901130036dbe8ab9edef37f08875
 2024-08-01 05:54:13 +00:00
Inseob Kim
ef566ac4f6 Reland "Add variables for init.environ.rc" 
Relanding with a fix for hwasan build.
HWADDRESS_SANITIZER_GLOBAL_OPTIONS is set by Soong's MakeVars, so we
can't refer the variable on soong config modules. Instead, as the
variable is hard-coded, this change hard-codes options in Android.bp.

Bug: 353429422
Test: boot shiba with SANITIZE_TARGET=hwaddress
Change-Id: Idaf4417e3f51c1933264866799c211de7bd0821d
 2024-08-01 03:31:28 +00:00
Android Build Coastguard Worker
d51d544c9f Version bump to AP3A.240905.008 [core/build_id.mk] 
Change-Id: I57996cdd63dffa7ea3d0d8baf373a7d6436a3760
 2024-08-01 02:48:29 +00:00
Inseob Kim
a59d703cb9 Merge changes from topic "revert-3200273-revert-3196490-revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA-PCKYAVELZP-XOXPVYPSBJ" into main am: 0c7915558e 
Original change: https://android-review.googlesource.com/c/platform/build/+/3201036

Change-Id: I00de7c0b81989d3aa45283c5da893c01d6c5a032
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-01 00:05:10 +00:00
Inseob Kim
57ff7bdd84 Revert "Revert "Revert "Revert "Revert^2 "Add more variables for..." am: 774a6dbbe8 
Original change: https://android-review.googlesource.com/c/platform/build/+/3201035

Change-Id: I43c6a91e611a4fb2bec9431714029cbdcee1716b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-01 00:05:07 +00:00
Inseob Kim
37b05bf09c Revert^2 "Conditionally pass kernel version to build.prop" am: b186331478 
Original change: https://android-review.googlesource.com/c/platform/build/+/3201034

Change-Id: I1c93023d7d4ed234a6d42588f0b9d874c015ded0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-01 00:05:05 +00:00
Inseob Kim
0c7915558e Merge changes from topic "revert-3200273-revert-3196490-revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA-PCKYAVELZP-XOXPVYPSBJ" into main 
* changes:
  Revert^6 "Use Soong-built system/build.prop"
  Revert "Revert "Revert "Revert "Revert^2 "Add more variables for..."
  Revert^2 "Conditionally pass kernel version to build.prop"
 2024-08-01 00:02:58 +00:00
Treehugger Robot
53d9852f35 Merge "Fix signing failure for split APKs" into main am: 787d933f87 
Original change: https://android-review.googlesource.com/c/platform/build/+/3202232

Change-Id: Ia9832e2218b9b8518435d9c289512f337d6e93bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-31 21:10:02 +00:00
Treehugger Robot
787d933f87 Merge "Fix signing failure for split APKs" into main 2024-07-31 21:06:37 +00:00
Liana Kazanova
37614d801a Merge "Revert "Add variables for init.environ.rc"" into main am: d0b03dd868 
Original change: https://android-review.googlesource.com/c/platform/build/+/3202811

Change-Id: I52b6ab657b4d45717cbb4def9928344f54feed09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-31 20:55:31 +00:00
Liana Kazanova
d0b03dd868 Merge "Revert "Add variables for init.environ.rc"" into main 2024-07-31 20:49:29 +00:00
Colin Cross
75c29b8bd3 Create transitive-res-packages for prebuilt java libraries 
I4e8ace497d701a9645a62dd5a6ac12e9a6830dcf added support for
transitive resource packages from Soong, but missed updating
prebuilt java libraries defined in Android.mk files.  Add an
empty file to fix build errors.

Bug: 355468901
Test: manual
Flag: EXEMPT bugfix
Change-Id: I04ae82bbc13e369f220392af1408d8890034d420
 2024-07-31 11:02:29 -07:00
Liana Kazanova
f2289bfdd2 Revert "Add variables for init.environ.rc" 
Revert submission 3197177-init_environ_rc_soong

Reason for revert: DroidMonitor: Potential culprit for b/356587212 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:3197177-init_environ_rc_soong

Change-Id: I7cfe54a994179577a7f3e3f86618ff04980aaf35
 2024-07-31 17:56:40 +00:00
Kelvin Zhang
6871779d9b Fix signing failure for split APKs 
Test: th
Bug: 353837347
Change-Id: Ifed9746c1e1d053a97860de3bab4380d6e207412
 2024-07-31 10:36:47 -07:00
Android Build Coastguard Worker
3020900a45 Version bump to AP3A.240905.007 [core/build_id.mk] 
Change-Id: I1f91291a3a8b05ac4301cbb62a7c5f06dfd25112
 2024-07-31 17:33:38 +00:00
Android Build Coastguard Worker
77072e88e4 Version bump to AP3A.240905.006 [core/build_id.mk] 
Change-Id: Ie60ce523b47bc2f4906fe07d77aad0269f763aee
 2024-07-31 15:40:59 +00:00
Android Build Coastguard Worker
67ffedda59 Version bump to AP3A.240905.005 [core/build_id.mk] 
Change-Id: I71558816b9b595d9bee866788b04e9af747d68ea
 2024-07-31 08:35:10 +00:00
Treehugger Robot
907656e003 Merge "Add variables for init.environ.rc" into main am: 44b3f9eb39 
Original change: https://android-review.googlesource.com/c/platform/build/+/3198791

Change-Id: Ic3ddf58e1ba62f4cd31272012c0853454f89f842
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-31 06:06:14 +00:00
Treehugger Robot
44b3f9eb39 Merge "Add variables for init.environ.rc" into main 2024-07-31 05:37:30 +00:00
Inseob Kim
774a6dbbe8 Revert "Revert "Revert "Revert "Revert^2 "Add more variables for..." 
Revert submission 3200273-revert-3196490-revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA-PCKYAVELZP

Reason for revert: fixed breakage with aosp/3200730, verified with ABTD

Reverted changes: /q/submissionid:3200273-revert-3196490-revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA-PCKYAVELZP

Change-Id: I19163de97c397b9c171362d221389a1d66a5712a
 2024-07-31 02:00:41 +00:00
Inseob Kim
b186331478 Revert^2 "Conditionally pass kernel version to build.prop" 
ff77e22213

Change-Id: I846175bb9dc2b0e000fc39c7faf2e24167b4a513
 2024-07-31 02:00:41 +00:00
Inseob Kim
b97c96b4b3 Revert^6 "Use Soong-built system/build.prop" 
0b2f48f0b2

Change-Id: I5d89d26945a3ab94f102633ccffa7622b5f99469
 2024-07-31 02:00:41 +00:00
Spandan Das
99419d2e06 Move the installation rules of device boot images to soong 
This CL adds moves the installation rules of boot images to soong. This
will eventually allow us to build devices by skipping `katiBuild` and
moving straight to `katiPackaging`

Details
1. Drop `dex_preopt_libart.mk` calls for device boot images. This was
   previously generating the copy rules of soong built artifacts into
the installation directory in $PRODUCT_OUT. The installation rules will
now be generated by soong's dex_bootjars singleton
2. Drop the profile files of `DEXPREOPT_IMAGE_PROFILE_BUILT_INSTALLED`
   from the `ALL_DEFAULT_INSTALLED_MODULES`. This will be installed by
dex_bootjars singleton as well.
3. Replace the REQUIRED property in reverse dependencies with
   `dex_bootjars`. By adding this singleton to required, we ensure that
the boot images get installed on device.

This CL does not change the behavior for installation rules of host boot
images. (Those will be tracked in b/355706080)

Test: no diff in
target/product/vsoc_x86_64/obj/PACKAGING/system_intermediates/file_list.txt
(top of stack)
Bug: 355700341
Bug: 355703904

Change-Id: Id854feead08df6c2fcbb6175860f76378fc5af5f
 2024-07-31 00:21:25 +00:00
Zhi Dou
5a464e039d Merge "aconfig: make java cached indicator volatile" into main am: 3d960c5638 
Original change: https://android-review.googlesource.com/c/platform/build/+/3199672

Change-Id: I476b8e6ee613342e6a03b85771bc3aaebb98ef9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-30 23:51:45 +00:00
Zhi Dou
f409df4939 Merge "close file stream" into main am: 39020e05c6 
Original change: https://android-review.googlesource.com/c/platform/build/+/3199474

Change-Id: I8c40d1a77546c28e1ece9f5ae45e29ce6eb1a034
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-30 23:51:32 +00:00
Inseob Kim
7ad308a3e7 Merge changes from topic "revert-3196490-revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA-PCKYAVELZP" into main am: aac9b8d04f 
Original change: https://android-review.googlesource.com/c/platform/build/+/3200277

Change-Id: Ie37f5786614d47bb9968292d9fa2a71c086eaea9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-30 23:51:02 +00:00
Liana Kazanova
d23cef7401 Revert "Revert "Revert "Revert^2 "Add more variables for system/..." am: dd3d5c1f3d 
Original change: https://android-review.googlesource.com/c/platform/build/+/3200276

Change-Id: Ic1e255edea95c79f470f9ffc2460b1fe04dec4d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-30 23:50:59 +00:00