StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,623 Commits 1 Branch 0 Tags
ad5e953a7d0c5e3f5fa5cc80be8d6c42f4618c0e
Commit Graph

84623 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jihoon Kang
ad5e953a7d Merge "Revert "Enable from-text stub generation in non-sdk java_sdk_library"" into main am: f6d9965cc5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3207397

Change-Id: I46b1257ff9b15143ebed6c3a3e36db5d2617acf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-06 10:14:59 +00:00
Treehugger Robot
696cea31d3 Merge "Enable from-text stub generation in non-sdk java_sdk_library" into main am: 99417ba9ea 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2983176

Change-Id: I01a3955f2c44dddff31a0b61bf18af34d243856e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-06 10:09:34 +00:00
Jihoon Kang
f6d9965cc5 Merge "Revert "Enable from-text stub generation in non-sdk java_sdk_library"" into main 2024-08-05 20:51:31 +00:00
Liana Kazanova
a574cd28a8 Revert "Enable from-text stub generation in non-sdk java_sdk_library" 
Revert submission 2982300-java_api_library_non_sdk

Reason for revert: DroidMonitor: Potential culprit for b/357648959 - 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:2982300-java_api_library_non_sdk

Change-Id: I5ef7afd9ec3e10ea99f82d02172843ad9b2cfda9
 2024-08-05 19:45:03 +00:00
Treehugger Robot
99417ba9ea Merge "Enable from-text stub generation in non-sdk java_sdk_library" into main 2024-08-05 18:25:36 +00:00
Spandan Das
c9335250b2 Merge "Create an installation rule to copy vdex to common arch device directory" into main am: acfa26b5ba 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3200722

Change-Id: I25a5681cdec7fa2e105a251503041b38d25cf917
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-05 17:34:12 +00:00
Spandan Das
acfa26b5ba Merge "Create an installation rule to copy vdex to common arch device directory" into main 2024-08-05 16:38:53 +00:00
Spandan Das
715594304d Create an installation rule to copy vdex to common arch device directory 
The installation rules for soong built system images are generated by
soong, but the installation rules rules for make built images are still
generated by make in dex_preopt_libart.mk. There is an existing
discrepancy between the two. Make built images generates three
installation rules for
1. system/framework/<primary_arch>/$bootjar.vdex (symlink)
2. system/framework/<secondary_arch>/$bootjar.vdex (symlink)
3. system/framework/$bootjar.vdex (actual file)

Soong copies the file to (1), creates a symlink from (2) to (1) and
skips (3) altogether. This CL makes the Soong installation rules match
Make installation rules. This will eventually allow
us to build devices by skipping `katiBuild` and moving straight to
`katiPackaging`.

Test: no diff in make built installed files
target/product/vsoc_x86_64/obj/PACKAGING/system_intermediates/file_list.txt
(top of stack)

Test: debugfs out/target/product/vsoc_x86_64/system/etc/aosp_cf_system_x86_64.img
verified system/framework/boot-apache-xml.vdex exists
verified system/framework/x86/boot-apache-xml.vdex exists as a symlink
verified system/framework/x86_64/boot-apache-xml.vdex exists as a symlink

Bug: 355700341

Change-Id: I52853c07674b77a984b5a5ac5dcd69236b642b46
 2024-08-05 02:18:03 +00:00
Treehugger Robot
ad61633160 Merge "Mark AP3A.240905.001 as merged in aosp-main-future" into aosp-main-future 2024-08-03 00:22:13 +00:00
Treehugger Robot
6a2025bdae Merge "Remove HWADDRESS_SANITIZER_GLOBAL_OPTIONS" into main am: 0ca0dd8e1c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3203690

Change-Id: I82b964344f87c35e528998d9429ee6dd76ba1bec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 02:48:05 +00:00
Treehugger Robot
0ca0dd8e1c Merge "Remove HWADDRESS_SANITIZER_GLOBAL_OPTIONS" into main 2024-08-02 02:28:10 +00:00
Xin Li
eec0e30137 Mark AP3A.240905.001 as merged in aosp-main-future 
Bug: 347831320
Merged-In: I717e035165a7529629061cbfcb076b168dc031d6
Change-Id: I3d9ddef59e933db630519639dd5489761f9937a0
 2024-08-01 16:56:01 -07:00
Cole Faust
855c130b32 Merge "Tag resource_dirs as android:"path"" into main am: 3bec2a77a6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3203075

Change-Id: Idd595d679d76891546aebec6ca7146aae4942fc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-01 17:57:54 +00:00
Cole Faust
3bec2a77a6 Merge "Tag resource_dirs as android:"path"" into main 2024-08-01 17:22:45 +00:00
Inseob Kim
af2994ccb6 Remove HWADDRESS_SANITIZER_GLOBAL_OPTIONS 
It doesn't need to be a Makefile variable exported from Soong as it's
hard-coded.

Bug: 353429422
Test: boot shiba with SANITIZE_TARGET=hwaddress
Change-Id: I4a98eaaf1002aa7aba5d5131ff251bdcbdd2e0ef
 2024-08-01 10:30:02 +09:00
Jooyung Han
de22d9608a Merge "apex: respect PRODUCT_COMPRESSED_APEX for prebuilt APEXes" into main am: b42b703f53 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3201250

Change-Id: I4cd2420e0138f31a5cbc546a637ce32bdeb030ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-01 01:23:34 +00:00
Jooyung Han
b42b703f53 Merge "apex: respect PRODUCT_COMPRESSED_APEX for prebuilt APEXes" into main 2024-08-01 01:01:41 +00:00
Inseob Kim
e3a9c50b34 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: 81e60c9c0b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3201032

Change-Id: I0eaf12f8c85663a2b579597baf203d3e396f84ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-01 00:05:22 +00:00
Inseob Kim
24b560ec10 Revert^6 "Sync gen_build_prop.py to sysprop.mk" am: 2887482f0f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3200731

Change-Id: I1d09321490301aa44e31cbcbe3c458a2284bf3d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-01 00:05:19 +00:00
Inseob Kim
db166effa0 Revert^2 "Conditionally pass kernel version to build.prop" am: 6bd92d5924 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3199371

Change-Id: I47dd45bd74c11e604b17ee195f95a6e2575a23b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-01 00:05:16 +00:00
Inseob Kim
6fb79d21f5 Revert^6 "Add TARGET_SYSTEM_PROP to system build.prop" am: d8538e5db0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3201030

Change-Id: Ic6b0119e38b0c7e7592735289553e8e60e3c86ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-01 00:05:13 +00:00
Inseob Kim
9ed0b86ae8 Revert "Revert "Revert^2 "Set output for build_prop even on Soon..." am: 88b109e6b4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3201033

Change-Id: I5a1607b9c86248ecc74591178d345608cdb45be1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-01 00:05:09 +00:00
Inseob Kim
a1e8c1c4d5 Merge "Fix build thumbprint in gen_build_prop.py" into main am: 9e51973c13 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3200730

Change-Id: Ibe23fca0f03f72e5595b0adb83efdc5105dadfe1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-01 00:05:05 +00:00
Inseob Kim
81e60c9c0b 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^6 "Sync gen_build_prop.py to sysprop.mk"
  Revert^2 "Conditionally pass kernel version to build.prop"
  Revert^6 "Add TARGET_SYSTEM_PROP to system build.prop"
  Revert "Revert "Revert^2 "Set output for build_prop even on Soon..."
 2024-08-01 00:02:58 +00:00
Inseob Kim
9e51973c13 Merge "Fix build thumbprint in gen_build_prop.py" into main 2024-08-01 00:02:58 +00:00
Cole Faust
d65add2253 Tag resource_dirs as android:"path" 
Resource_dirs is queried using PathsWithOptionalDefaultForModuleSrc,
which includes all the infrastructure to resolve module references,
but needs to be tagged android:"path" to be able to add the module
references as dependencies.

Test: Manually
Change-Id: Ie3f75332c9a4cc0ee4b4c93268188440ff7ce249
 2024-07-31 16:42:33 -07:00
Yu Liu
cc3a65b73f Rename ModuleId to ModuleCacheKey and call the same named method on moduleInfo am: 2800675b31 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3190612

Change-Id: Iae9c8e69604ef75023b261b1ed4feeca9174f8e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-31 22:58:51 +00:00
Yu Liu
2800675b31 Rename ModuleId to ModuleCacheKey and call the same named method on moduleInfo 
Bug: 335718784
Test: local manual tests
Change-Id: I364cd20281e52a1682f14a43c41bfe9993f04477
 2024-07-31 21:38:15 +00:00
Jihoon Kang
8726ef8826 Merge "Convert imageMutator to TransitionMutator" into main am: 7eaa83707e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3202440

Change-Id: I5e4fd9545690fb0b76a99b3f904680e2412b7518
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-31 20:54:54 +00:00
Jihoon Kang
7eaa83707e Merge "Convert imageMutator to TransitionMutator" into main 2024-07-31 20:39:16 +00:00
Treehugger Robot
ae3bd5dd99 Merge "fix soongdbg missing args" into main am: 043503e6aa 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3196960

Change-Id: I0828b635cee37ac8dbde1af9bfcda4785fe25301
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-31 19:22:09 +00:00
Treehugger Robot
043503e6aa Merge "fix soongdbg missing args" into main 2024-07-31 19:02:09 +00:00
Jihoon Kang
5402bbd8d7 Convert imageMutator to TransitionMutator 
Replace android.imageMutator with a TransitionMutator

Test: diff out/soong/Android-<product>.mk
Bug: 319288033
Change-Id: Id6a50a2aacb32ecfadf7e45ada4956e85b55fef2
 2024-07-31 18:53:06 +00:00
Taylor Santiago
bfd38179c4 Merge "Use consistent directory for source and output inside the build sandbox for ABFS." into main am: 60fa202bb5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3200300

Change-Id: Ic91a01e20e7ff0d3e5c71d8938ef1e9a2148dbf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-31 18:13:45 +00:00
Taylor Santiago
60fa202bb5 Merge "Use consistent directory for source and output inside the build sandbox for ABFS." into main 2024-07-31 17:55:41 +00:00
Treehugger Robot
97083b0dd4 Merge "Fix RBE tmp dir" into main am: 3cc8933133 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3192211

Change-Id: I8aeeed023a8812b52825b22d9f371bc01eb6b932
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-31 15:50:47 +00:00
Treehugger Robot
3cc8933133 Merge "Fix RBE tmp dir" into main 2024-07-31 15:28:12 +00:00
Jerome Gaillard
14fe8f808b Merge "Handle missing dependencies in ravenwood.go" into main am: 6524e1d51c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3199471

Change-Id: I725805e93b8a3827f7697944f5fba603dc7c9f5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-31 11:16:23 +00:00
Jerome Gaillard
6524e1d51c Merge "Handle missing dependencies in ravenwood.go" into main 2024-07-31 11:02:10 +00:00
Zijun
8ef4e9e053 Turn on relaxed-template-template-args as a workaround am: 09fdda5b3b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3199348

Change-Id: Ie6f4efc64fa0faf4d2397cb8d0fcb9ce96eee7ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-31 09:26:40 +00:00
Jooyung Han
26ec8484e4 apex: respect PRODUCT_COMPRESSED_APEX for prebuilt APEXes 
If a prebuilt APEX is compressed, it's installed without decompression
even when PRODUCT_COMPRESSED_APEX is false.

This change decompresses the prebuilt/compressed APEX.

Bug: 356533488
Test: OVERRIDE_PRODUCT_COMPRESSED_APEX=false m
Change-Id: Ifdde074e383837df92d172bc483bfca9a97cb6f8
 2024-07-31 15:04:05 +09:00
Zijun
09fdda5b3b Turn on relaxed-template-template-args as a workaround 
Update compiler to r536225 and the error: argument '-fno-relaxed-template-template-args' is deprecated arises.

Bug: b/341084395
Test: presubmit
Change-Id: If714f96e4537b5f8d695cd7c0d1cd0a8ddcbb96e
 2024-07-31 05:12:41 +00:00
Maciej Żenczykowski
cca917b38f Merge "Soong: BPF: Cflag and btf defaults" into main am: 469b5a1236 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3196890

Change-Id: I9dbc65d365df25f6a51c5dfe84fb51a21b311d0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-07-31 03:56:08 +00:00
Maciej Żenczykowski
469b5a1236 Merge "Soong: BPF: Cflag and btf defaults" into main 2024-07-31 03:35:33 +00:00
Inseob Kim
bc4ef22b9b Revert^6 "Use Soong-built system/build.prop" 
d5a12721b5

Change-Id: I6f4bf3043e73763b047bec3303f1547ec647d12b
 2024-07-31 02:18:22 +00:00
Inseob Kim
2887482f0f Revert^6 "Sync gen_build_prop.py to sysprop.mk" 
This reverts commit 7b7593968b.

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

Change-Id: I83a4cb1a39bce1a1da8fabd49c6c895862a6c686
 2024-07-31 02:18:07 +00:00
Inseob Kim
6bd92d5924 Revert^2 "Conditionally pass kernel version to build.prop" 
This reverts commit 29fed1efe8.

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

Change-Id: I207abd188636673250eb9a070be95db0b82f39e7
 2024-07-31 02:17:49 +00:00
Inseob Kim
d8538e5db0 Revert^6 "Add TARGET_SYSTEM_PROP to system build.prop" 
530c32acbe

Change-Id: I9dc817855e3db7b96320a977b24b84d72e762893
 2024-07-31 02:17:39 +00:00
Inseob Kim
88b109e6b4 Revert "Revert "Revert^2 "Set output for build_prop even on Soon..." 
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: If9e6841bb915a79d9817838a1657017ddee9c1a7
 2024-07-31 02:16:54 +00:00
Liana Kazanova
329f004d5f Revert^5 "Add TARGET_SYSTEM_PROP to system build.prop" am: 530c32acbe 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3200273

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