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

98051 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Zheng
7e4cc58f2d create_brick_ota: logic fix 
ota_metadata should be initialized outside of the if block.

Bug: 3072303
Test: th
Change-Id: Iabe52be3557c71921586d960d8a8a91c33d5558b
 2024-05-02 09:55:45 -07:00
Mårten Kongstad
2f186f5151 Merge "check-flagged-apis: change internal format" into main am: 8b81af4e11 am: fad2e0c502 
Original change: https://android-review.googlesource.com/c/platform/build/+/3069745

Change-Id: I46e37c1275b268c0878bff9bf6ae51578c8bd433
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-02 15:42:48 +00:00
Mårten Kongstad
fad2e0c502 Merge "check-flagged-apis: change internal format" into main am: 8b81af4e11 
Original change: https://android-review.googlesource.com/c/platform/build/+/3069745

Change-Id: I28e680b62f3a933a7c75c3b8b400342390c12247
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-02 15:16:15 +00:00
LaMont Jones
20dd4c2360 Enable build flags in protobuf 
If RELEASE_BUILD_FLAGS_IN_PROTOBUF is False, then the results from
out/release-config are ignored and we do the old processing.

The following additional logic all goes away once the migration to protobuf
is finished.

- If we found .textproto files that don't have corresponding .mk files,
  we require protobuf.
- If we found .mk files that don't have corresponding .textproto files,
  we require legacy (make) processing.
- If PRODUCT_RELEASE_CONFIG_MAPS specifies .textproto files, we require
  protobuf.

In order to further isolate migration, the choice can be determined on a
release-config by release-config basis.  in each release config
directory, we look for:
 - `build_config/DEFAULT=proto`
 - `build_config/DEFAULT=make`
 - `build_config/${TARGET_RELEASE}=proto`
 - `build_config/${TARGET_RELEASE}=make`
The last such file found determines which code path is used.

Bug: 328495189
Test: manual, TH
Change-Id: I1d84db76b157082fc7db1b3cb7c9afe8cdf46cbf
 2024-05-02 08:07:30 -07:00
Mårten Kongstad
8b81af4e11 Merge "check-flagged-apis: change internal format" into main 2024-05-02 14:51:49 +00:00
Mårten Kongstad
b9ce4c92e0 check-flagged-apis.sh: use correct path to generated API signature files 
The path to the generated API signature files used with --api-signature
in the check-flagged-apis.sh script are different based on the lunch
target used: sometimes it's under $ANDROID_PRODUCT_OUT, other times
under out/target/product/mainline_x86.

Teach check-flagged-apis.sh to dynamically find the correct path by
querying ninja.

Bug: 334870672
Test: croot && build/tools/check-flagged-apis/check-flagged-apis.sh
Change-Id: I1b0b41ef3ad1bc7113a3b31323d81251e7e65933
 2024-05-02 14:30:56 +02:00
Mårten Kongstad
cd93aeb947 check-flagged-apis: suppress unused variable warning 
Bug: 334870672
Test: m check-flagged-apis # verify no Lint warnings
Change-Id: If4fb93703f0f0bf3f27e6ec052cf488796bd717e
 2024-05-02 14:01:12 +02:00
Mårten Kongstad
b4a14bfaa9 check-flagged-apis: add support for method with parameters 
Teach check-flagged-apis to parse methods containing parameters.

Bug: 334870672
Test: atest --host check-flagged-apis-test
Change-Id: I171660b914b73fd85e03ed9300c2c81f33d80d61
 2024-05-02 09:53:54 +02:00
Mårten Kongstad
ece054c856 check-flagged-apis: change internal format 
Switch the internal format to represent Symbols to (something close to)
the format described in section 4.3.2 of the JVM spec, i.e.

  com/android/SomeClass/someMethod(II[Ljava/lang/String;)Z

This will make parsing method parameters from api-versions.xml easier,
as that file already uses this format, and converting API signature
files to the same format is less painful than going in the other
direction.

Bug: 334870672
Test: atest --host check-flagged-apis-test
Change-Id: I1e1fb8fe208cd51cce2cc129f5aa1cb495672c16
 2024-05-02 09:50:33 +02:00
Inseob Kim
beff4ab9a2 Add LOCAL_SOONG_LOGTAGS_FILES 
LOCAL_SOONG_LOGTAGS_FILES is similar to LOCAL_LOGTAGS_FILES but it uses
full paths rather than relative paths, to correctly support Soong's
`android:"path"` which may produce paths outside module directories.

Bug: 336189540
Test: m out/soong/.intermediates/all-event-log-tags.txt
Test: m out/target/common/obj/all-event-log-tags.txt
Change-Id: I129b96f3e06036ded76d2657e25e895f8c946cfb
 2024-05-02 13:51:41 +09:00
Inseob Kim
f441f7d8fd Add python Soong modules for logtags 
Bug: 336189540
Test: m out/soong/.intermediates/all-event-log-tags.txt
Test: m out/target/common/obj/all-event-log-tags
Change-Id: Iae336a05bb2f27564b0bf8d4ea3753a30be89e90
 2024-05-02 13:51:34 +09:00
Treehugger Robot
38862f3719 Merge "Disable kotlin -checkdiscard rule" into main am: 7faf630b7c am: 389d17186d 
Original change: https://android-review.googlesource.com/c/platform/build/+/3070709

Change-Id: I509e3239925413a72b640d2163b5837d7e2e9e9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-02 01:36:37 +00:00
Treehugger Robot
389d17186d Merge "Disable kotlin -checkdiscard rule" into main am: 7faf630b7c 
Original change: https://android-review.googlesource.com/c/platform/build/+/3070709

Change-Id: Icc9652ea8fa25a2261fbb076c7fd193b49a39be2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-02 01:11:32 +00:00
Treehugger Robot
7faf630b7c Merge "Disable kotlin -checkdiscard rule" into main 2024-05-02 00:50:05 +00:00
Treehugger Robot
82981c1791 Merge "Add a release config map override for go devices" into main am: e78ad285cb am: 9b261d0362 
Original change: https://android-review.googlesource.com/c/platform/build/+/3069967

Change-Id: I90d19cb89617a9c4c1ac3cdd16bd9f0737b8bc02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-01 23:44:09 +00:00
Jared Duke
32c8a6a43d Disable kotlin -checkdiscard rule 
kotlin-stdlib is included transitively as a library jar by way of
androidx.annotations, which means we cannot ensure associated classes
are discarded by R8. Disable the related `-checkdiscard` proguard rule
until that inclusion is resolved, avoiding spurious warnings in build
output.

Bug: 302383328
Test: m
Flag: NA
Change-Id: I7514e6841735e95e1a16d42d6a6e134103ecb108
 2024-05-01 23:34:24 +00:00
Treehugger Robot
9b261d0362 Merge "Add a release config map override for go devices" into main am: e78ad285cb 
Original change: https://android-review.googlesource.com/c/platform/build/+/3069967

Change-Id: Iae3b30bc43ae35d292520759e4ce1126aaec77c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-01 23:22:08 +00:00
Treehugger Robot
e78ad285cb Merge "Add a release config map override for go devices" into main 2024-05-01 23:05:20 +00:00
Spandan Das
68dce16b3f Add a release config map override for go devices 
One use case for this is to select go prebuilt apexes when building go
devices.

Bug: 338002385
Test: presubmits
Test: verified that this map shows up in `get_build_var
PRODUCT_RELEASE_CONFIG_MAPS` of a go device

Change-Id: I5505c581597bbd5a4e5f8fc6cd69987f67f0adb6
 2024-05-01 22:04:36 +00:00
Treehugger Robot
b32b8aba80 Merge "Remove deprecated Goma makefiles" into main am: b604cf3f81 am: b40a227dc2 
Original change: https://android-review.googlesource.com/c/platform/build/+/3070442

Change-Id: I283f4c906558b8b8546d732c9a49b77580ec25df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-01 21:06:59 +00:00
Treehugger Robot
b40a227dc2 Merge "Remove deprecated Goma makefiles" into main am: b604cf3f81 
Original change: https://android-review.googlesource.com/c/platform/build/+/3070442

Change-Id: Ide52e63074c8527b5f42722090100a65582f1fb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-01 20:44:34 +00:00
Treehugger Robot
b604cf3f81 Merge "Remove deprecated Goma makefiles" into main 2024-05-01 20:23:18 +00:00
Cole Faust
546ef69fea Merge "sdk-addon: Prevent nested data/ inside $(PRIVATE_STAGING_DIR)" into main am: c80e7eeb77 am: dabe8ef1f5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2976591

Change-Id: I86026cba2d201635531f2c5a0ac523290b365aa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-01 20:10:21 +00:00
Cole Faust
dabe8ef1f5 Merge "sdk-addon: Prevent nested data/ inside $(PRIVATE_STAGING_DIR)" into main am: c80e7eeb77 
Original change: https://android-review.googlesource.com/c/platform/build/+/2976591

Change-Id: Id56d95de97977f0d57632a2925e0c90b38a7df23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-01 19:46:56 +00:00
Cole Faust
c80e7eeb77 Merge "sdk-addon: Prevent nested data/ inside $(PRIVATE_STAGING_DIR)" into main 2024-05-01 19:32:12 +00:00
Kousik Kumar
fe9aaa23fe Remove deprecated Goma makefiles 
Goma is no longer used with android platform builds. Just a minor cleanup.

Bug: n/a
Change-Id: I62844c1d555677006a1022dab4f12bcfd7e55758
 2024-05-01 18:14:17 +00:00
Florian Mayer
0349db6826 Use memtag_stack variants in make 
Bug: 309446520
Change-Id: Ib67b37e97d9fabd2be3236d80a695c4883eccb7b
 2024-05-01 10:41:09 -07:00
Treehugger Robot
3b255ab264 Merge ""Steal" single value variables in rbc inheritance" into main am: 0c2ef754f3 am: fc7bd470e8 
Original change: https://android-review.googlesource.com/c/platform/build/+/3067949

Change-Id: Ib017678a42222d3b8e24f626e953c1e22e6ad458
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-01 16:10:18 +00:00
Ted Bauer
881c93aca6 Merge "Update dependencies for new aconfig flag storage" into main am: daa3c71739 am: 3011ec66ed 
Original change: https://android-review.googlesource.com/c/platform/build/+/3068041

Change-Id: If9255711db8691fcc7e0bd71f7c0efde012aabee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-01 16:10:07 +00:00
Treehugger Robot
fc7bd470e8 Merge ""Steal" single value variables in rbc inheritance" into main am: 0c2ef754f3 
Original change: https://android-review.googlesource.com/c/platform/build/+/3067949

Change-Id: Ibc94715e0ae835832e77eb7a7ace6906f567a1ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-01 15:58:15 +00:00
Treehugger Robot
0c2ef754f3 Merge ""Steal" single value variables in rbc inheritance" into main 2024-05-01 15:54:12 +00:00
Ted Bauer
3011ec66ed Merge "Update dependencies for new aconfig flag storage" into main am: daa3c71739 
Original change: https://android-review.googlesource.com/c/platform/build/+/3068041

Change-Id: Iad23c5a46f16b23155c4cfdf27278d405bfd5907
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-01 15:51:27 +00:00
Ted Bauer
daa3c71739 Merge "Update dependencies for new aconfig flag storage" into main 2024-05-01 15:37:20 +00:00
Cole Faust
8383184b7a "Steal" single value variables in rbc inheritance 
This behavior of "stealing" values from parent makefiles is needed to
match make. We already had similar behavior for list variables via
the __move_items function, but were missing it for single value
variables.

Test: ./out/rbcrun -mode rbc ./build/make/tests/run.rbc
Change-Id: Ib320b9b1cce0224184f585c7a391be1b5353b440
 2024-04-30 17:30:18 -07:00
Ted Bauer
4560e3ae8f Update dependencies for new aconfig flag storage 
Bug: 328444881
Test: m
Change-Id: I3685a74e9e93a6ecb89a054e243b48b67f470d55
 2024-04-30 23:57:51 +00:00
Spandan Das
846e223607 Merge "Revert "Align boot jar exclusion with apex_contributions"" into main am: 7d5b29ef85 am: 5501c82004 
Original change: https://android-review.googlesource.com/c/platform/build/+/3067767

Change-Id: I1f9dc9a7b2734f29c271c6efba6e1e109a554f91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-30 23:45:28 +00:00
Dennis Shen
93b2796372 Merge "aconfig: add a new aconfig storage file flag listing api" into main am: c0102331c8 am: a8d8b351da 
Original change: https://android-review.googlesource.com/c/platform/build/+/3065243

Change-Id: I6069f7dc83ea8f7d8f26ec89601134f83b31fbc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-30 23:45:16 +00:00
Spandan Das
5501c82004 Merge "Revert "Align boot jar exclusion with apex_contributions"" into main am: 7d5b29ef85 
Original change: https://android-review.googlesource.com/c/platform/build/+/3067767

Change-Id: I6045af65d63876cda4fbcfebff0d3de23b160cb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-30 23:29:26 +00:00
Spandan Das
7d5b29ef85 Merge "Revert "Align boot jar exclusion with apex_contributions"" into main 2024-04-30 23:24:05 +00:00
Dennis Shen
a8d8b351da Merge "aconfig: add a new aconfig storage file flag listing api" into main am: c0102331c8 
Original change: https://android-review.googlesource.com/c/platform/build/+/3065243

Change-Id: Ide49f40e593c0930117192ee559552ece6e2dd27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-30 23:22:55 +00:00
Spandan Das
213847d3f6 Revert "Align boot jar exclusion with apex_contributions" 
This reverts commit f340066ee3.

Reason for revert: Breaks go/ab/git_main:barbet-ap2a-userdebug

Change-Id: I62639525d5b2507a07c3145ff556fdf2b156cb01
 2024-04-30 23:10:28 +00:00
Dennis Shen
c0102331c8 Merge "aconfig: add a new aconfig storage file flag listing api" into main 2024-04-30 23:06:18 +00:00
Treehugger Robot
7362178af3 Merge "Align boot jar exclusion with apex_contributions" into main am: 3c5b13078b am: 60517e93c1 
Original change: https://android-review.googlesource.com/c/platform/build/+/3063301

Change-Id: I899efc78b00a77a4abe3daa58d035b61c44efe05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-30 22:25:46 +00:00
Treehugger Robot
60517e93c1 Merge "Align boot jar exclusion with apex_contributions" into main am: 3c5b13078b 
Original change: https://android-review.googlesource.com/c/platform/build/+/3063301

Change-Id: I03ecd32acb575d8a6a0f20ab059a9e3468dbeb92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-30 22:06:35 +00:00
Treehugger Robot
3c5b13078b Merge "Align boot jar exclusion with apex_contributions" into main 2024-04-30 21:46:01 +00:00
Treehugger Robot
421265faa8 Merge "Move coverage builds prebuilt special case to make" into main am: 40cc23b709 am: 62206ac83a 
Original change: https://android-review.googlesource.com/c/platform/build/+/3065665

Change-Id: I7596d03e86bf6a30b21cc8014bb58ec71dbe951f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-30 20:46:08 +00:00
Treehugger Robot
62206ac83a Merge "Move coverage builds prebuilt special case to make" into main am: 40cc23b709 
Original change: https://android-review.googlesource.com/c/platform/build/+/3065665

Change-Id: If86509e853f34205d5a12714215f76b1941bc293
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-30 20:27:19 +00:00
Treehugger Robot
40cc23b709 Merge "Move coverage builds prebuilt special case to make" into main 2024-04-30 20:04:44 +00:00
Treehugger Robot
77e796a1fc Merge "Move aosp_x86_64 away from non-AB" into main am: 13f8f70758 am: c252a67443 
Original change: https://android-review.googlesource.com/c/platform/build/+/3065894

Change-Id: If30250ea57688182d11f9c6e1d812c8e4e22beef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-30 19:15:24 +00:00
Treehugger Robot
c252a67443 Merge "Move aosp_x86_64 away from non-AB" into main am: 13f8f70758 
Original change: https://android-review.googlesource.com/c/platform/build/+/3065894

Change-Id: I195e4721e4157f2da4c7accfa1b0ec7e5d74f7ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-04-30 18:55:29 +00:00