Luca Farsi
a646b75c2b
Merge changes Ia3ad8ebf,I94422993 into main am: 9c7dbf06a4
am: 98e8e1d2eb
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2915946
Change-Id: I75365bbacb0481ff9d6a3c60c84c85ba71b521ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-18 21:27:17 +00:00
Luca Farsi
98e8e1d2eb
Merge changes Ia3ad8ebf,I94422993 into main am: 9c7dbf06a4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2915946
Change-Id: Idda6aad6ce8d39706fe5a20c63b1cdfa3336195b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-18 20:44:51 +00:00
Luca Farsi
9c7dbf06a4
Merge changes Ia3ad8ebf,I94422993 into main
...
* changes:
Add option to print command output and fix env on dumpvars commands
Make build script executable via python
2024-01-18 19:56:57 +00:00
Yu Liu
158b4df6f9
Merge "Tweak the CUJ scripts to make it work in CI." into main am: 15fb2a41b1
am: d0273e9ca8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2911571
Change-Id: I74ad3dfbd45f8495d459161e3408620ce18b6312
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-18 05:48:06 +00:00
Yu Liu
d0273e9ca8
Merge "Tweak the CUJ scripts to make it work in CI." into main am: 15fb2a41b1
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2911571
Change-Id: Id0c0ba0ba0d3aa4799585384de8add100b525e89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-18 05:06:30 +00:00
Yu Liu
15fb2a41b1
Merge "Tweak the CUJ scripts to make it work in CI." into main
2024-01-18 04:23:49 +00:00
Yu Liu
cda84245af
Tweak the CUJ scripts to make it work in CI.
...
Bug: 318706915
Test: manual test
Change-Id: I0982d1d724ec05aee7a0d6bdaa05497745421674
2024-01-18 00:35:13 +00:00
Luca Farsi
b559eefb50
Add option to print command output and fix env on dumpvars commands
...
Two fixes:
soong dumpvars commands require TARGET_RELEASE to be set in the env, so
set that.
Added option to print command output which is useful for actually
logging build output not only in the case of command failures.
Test: ABTD run with this change
Bug: 314171817
Change-Id: Ia3ad8ebfa58959c13417abaeeaa42a354c4c61de
2024-01-17 16:14:55 -08:00
Luca Farsi
d42a053aa8
Make build script executable via python
...
Add shebang line to make build test suties script callable via command
line without needing python.
Test: ./build/make/ci/build_test_suites --target_product aosp_x86_64
--target_release trunk_staging --with_dexpreopt_boot_img_and_system_server_only --dist_dir <dist_dir> --change_info <change_info_file> <extra_targets>
Change-Id: I94422993e864e021b036a4eb1673b463ad4b86d4
2024-01-17 15:25:18 -08:00
Devin Moore
65a2aa24dd
Merge changes from topic "fina-vintf-fix" into main
...
* changes:
Capture queryview stderr and stdout in finalization scripts
Update vintf levels for finalization script
2024-01-17 21:52:52 +00:00
Tim Tsai
21fd6d814b
Merge "Fixed not mapping sdk_sandbox key to vendor key" into main am: 7cd5b313f6
am: ff22ed407c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2903807
Change-Id: I85e0eab1cf581c9b30e4ae8e25d71995c5b33979
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-17 18:26:19 +00:00
Tim Tsai
ff22ed407c
Merge "Fixed not mapping sdk_sandbox key to vendor key" into main am: 7cd5b313f6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2903807
Change-Id: Icfa308aa8f39c83164040fb43a26f91d14185f81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-17 17:44:22 +00:00
Aditya Choudhary
3048a0fb38
[automerger skipped] Metadata tool correction: Output empty proto in case of no input am: 9f6a0f1dfa
-s ours
...
am skip reason: Merged-In I85ca22574433ab164c303c1f6b0d29191e704cbb with SHA-1 f0670e89f4
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/25864655
Change-Id: Iedba95c818d3094f0b517b56b8ee31d46e590bcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-17 17:23:05 +00:00
Aditya Choudhary
e3b7b78ed8
[automerger skipped] Code metadata integration with Generator tool am: 8f986c3faf
-s ours
...
am skip reason: Merged-In Icf14b48bc777207ac7cc7a287a174c8de817339b with SHA-1 d96041a0c6
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/25828975
Change-Id: I939045dc95e42e6ce6df1affbaac60e52c616dd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-17 17:22:59 +00:00
Tim Tsai
7cd5b313f6
Merge "Fixed not mapping sdk_sandbox key to vendor key" into main
2024-01-17 17:08:07 +00:00
Devin Moore
395d5e32e2
Capture queryview stderr and stdout in finalization scripts
...
Sometimes the output wasn't grep-able and this fixes it.
Ignore-AOSP-First: b/304316873#comment10
Test: Run the bazel query command multiple times before/after
and verify it works 100% of the time after.
Bug: 320589170
Change-Id: Ic60d3318287353aa71fdeb2c540899d588a2d273
2024-01-17 16:51:10 +00:00
Devin Moore
196c1b5352
Update vintf levels for finalization script
...
This year's vintf levels changed from 9 to 202404, so the levels in the
finalization script need to change.
Ignore-AOSP-First: b/304316873#comment10
Test: ./finalize-vintf-resources.sh
Bug: 320589170
Change-Id: I2e9b3953233c8d032f44f379546919b9f3642a6f
2024-01-17 16:50:59 +00:00
Treehugger Robot
ec9729e476
Merge "Remove unnecessary calling of PayloadGenerator" into main am: 0562b343d1
am: 6014c0f910
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2900888
Change-Id: I69f759f4d29abbfaaa83203c86d5ba447495a186
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-17 08:59:11 +00:00
Treehugger Robot
6014c0f910
Merge "Remove unnecessary calling of PayloadGenerator" into main am: 0562b343d1
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2900888
Change-Id: Id3cd26becccb7e763b12d7a9452d369a3b6bb3b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-17 08:16:23 +00:00
Treehugger Robot
0562b343d1
Merge "Remove unnecessary calling of PayloadGenerator" into main
2024-01-17 07:18:51 +00:00
Treehugger Robot
b669528ef4
Merge "Remove RELEASE_EXPOSE_FLAGGED_API and PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API export" into main am: 0ac2d7fb7a
am: 51aab38cd3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2912014
Change-Id: If521bf07e9f68fd0b0e0b1c8ede22e03af5eba06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-17 01:42:48 +00:00
Treehugger Robot
51aab38cd3
Merge "Remove RELEASE_EXPOSE_FLAGGED_API and PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API export" into main am: 0ac2d7fb7a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2912014
Change-Id: Ib24751f30a951da6ceb3fb93f104c710e49356ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-17 00:59:37 +00:00
Treehugger Robot
0ac2d7fb7a
Merge "Remove RELEASE_EXPOSE_FLAGGED_API and PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API export" into main
2024-01-17 00:20:54 +00:00
Daniel Zheng
75b7748fba
Merge "Update check to work with compression levels" into main am: b7b838fd3b
am: 8f90739f3f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2912702
Change-Id: I6336cda449f7da3343ec3b09a6c3b16872e4b96d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-16 22:49:30 +00:00
Yu Liu
368ed21744
Merge "Properly report failures in the CUJ scripts" into main am: 5afa685f81
am: e75acf017d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2912200
Change-Id: Iea692d01e7f2f53ccdaa1a4e696c82af97ff6c30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-16 22:49:18 +00:00
Dennis Shen
cade8f552d
Merge "build system to create flag storage files per partition" into main am: 27cf1a5cd2
am: 35fb20af6e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2908579
Change-Id: I5189259019c4455e0f27d8ea4477b00a91fa4dff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-16 22:49:03 +00:00
Daniel Zheng
8f90739f3f
Merge "Update check to work with compression levels" into main am: b7b838fd3b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2912702
Change-Id: I0c3241ab449b8c2887ba99a6b147c16e4c82aadb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-16 22:05:24 +00:00
Yu Liu
e75acf017d
Merge "Properly report failures in the CUJ scripts" into main am: 5afa685f81
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2912200
Change-Id: I0fcd6a13178db151887b9ae75d82d56cdf631108
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-16 22:04:42 +00:00
Dennis Shen
35fb20af6e
Merge "build system to create flag storage files per partition" into main am: 27cf1a5cd2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2908579
Change-Id: Ie53a53ab77c5318209faa55e68c2c94f2626abaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-16 22:04:24 +00:00
Daniel Zheng
b7b838fd3b
Merge "Update check to work with compression levels" into main
2024-01-16 21:45:40 +00:00
Luca Farsi
793b94d12f
Merge "Add dexpreopt option to build commands" into main am: bb17372928
am: 9460a40c55
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2907700
Change-Id: Ibe3ba5d4efcbb6264322cf67c654790a190afc28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-16 21:43:58 +00:00
Yu Liu
5afa685f81
Merge "Properly report failures in the CUJ scripts" into main
2024-01-16 21:35:42 +00:00
Devin Moore
2d156106ce
Merge "Add new function to create a new compat matrix for finalization" into main
2024-01-16 21:35:19 +00:00
Dennis Shen
27cf1a5cd2
Merge "build system to create flag storage files per partition" into main
2024-01-16 21:26:50 +00:00
Daniel Zheng
15a36a14d6
Update check to work with compression levels
...
vabc_compression_param can be a combination of algorithm + level.
Updating this check so that it works with both.
Test: ota_from_target_files
Change-Id: I2f13ca31c728d7c8607ac085c9b663691f8dfa02
2024-01-16 12:41:01 -08:00
Jihoon Kang
5a438e61ba
Remove RELEASE_EXPOSE_FLAGGED_API and PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API export
...
As seen in the CLs in the same topic, these two variables are no longer
in used and do not need to be exported to Soong.
Test: m nothing --no-skip-soong-tests
Bug: 320515715
Change-Id: I268dc3f051d3ff15d95515755dd0c9f9c15dfc82
2024-01-16 20:09:50 +00:00
Luca Farsi
9460a40c55
Merge "Add dexpreopt option to build commands" into main am: bb17372928
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2907700
Change-Id: I85702ab0d91c92a7addc2eae66c1a49f2609d085
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-16 19:28:08 +00:00
Yu Liu
c6576ad307
Properly report failures in the CUJ scripts
...
Bug: 318706915
Test: manual test
Change-Id: I25dc7908f354c09cb829070e6de86f6cdfa38dab
2024-01-16 19:27:45 +00:00
Luca Farsi
bb17372928
Merge "Add dexpreopt option to build commands" into main
2024-01-16 18:21:14 +00:00
Roshan Pius
b4744d53e4
Merge "build: Set soong variable for enabling NFC apex bootclasspath fragment" into main
2024-01-15 21:59:44 +00:00
Treehugger Robot
a016367cdb
[automerger skipped] Merge "build: Allow NFC stack to be delivered as a mainline module or APK" into main am: c5b4b824ae
am: 18e2263dad
am: d4fd7da76a
-s ours
...
am skip reason: Merged-In Ib2170146d07763ff6c852ce810497ebe1ac2eead with SHA-1 a6d8073bcf
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2909038
Change-Id: I8e20b760a36c7c294a1bbcb32de4299e220fa734
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-14 00:24:36 +00:00
Treehugger Robot
d4fd7da76a
Merge "build: Allow NFC stack to be delivered as a mainline module or APK" into main am: c5b4b824ae
am: 18e2263dad
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2909038
Change-Id: I9d711a9bcb05cca27f31157a4cdca758bd37e233
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-13 23:42:36 +00:00
Treehugger Robot
18e2263dad
Merge "build: Allow NFC stack to be delivered as a mainline module or APK" into main am: c5b4b824ae
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2909038
Change-Id: I82a25486ae3bca7d7670581967c829e4c7badd05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-13 23:12:24 +00:00
Roshan Pius
7d26fd45c3
build: Set soong variable for enabling NFC apex bootclasspath fragment
...
Bug: 303286040
Test: Compiles (with RELEASE_PACKAGE_NFC_STACK=NfcNci)
Test: Compiles (with RELEASE_PACKAGE_NFC_STACK=com.android.nfcservices)
Change-Id: Ibd1e28c7b6bcbff81c98e6be91d6a11b1e3ab1ae
2024-01-13 14:53:41 -08:00
Treehugger Robot
c5b4b824ae
Merge "build: Allow NFC stack to be delivered as a mainline module or APK" into main
2024-01-13 22:12:12 +00:00
Roshan Pius
dea4f88f91
Merge "build: Allow NFC stack to be delivered as a mainline module or APK" into main
2024-01-13 16:05:20 +00:00
Jihoon Kang
9c148dde67
Merge "Export RELEASE_HIDDEN_API_EXPORTABLE_STUBS to soong" into main am: d6c7dadbb5
am: 37457d7d38
am: f12a0f6259
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2906339
Change-Id: I4fed0140b115b29da11bbdaef94e7261106c9db4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-13 03:27:13 +00:00
Jihoon Kang
f12a0f6259
Merge "Export RELEASE_HIDDEN_API_EXPORTABLE_STUBS to soong" into main am: d6c7dadbb5
am: 37457d7d38
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2906339
Change-Id: I82327b3b09abf3a6f89c1afa74be265c3661fc35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-13 02:18:39 +00:00
Roshan Pius
dbaddabffb
build: Allow NFC stack to be delivered as a mainline module or APK
...
These changes are necessary to allow NFC stack delivery to be properly
trunk stable flagged:
1. Delivered as NfcNci.apk and framework-nfc.jar for Android
U based builds (existing).
2. Delivered as com.android.nfcservices.apex which embeds NfcNci.apk &
framework-nfc.jar for Android V based builds (new).
Bug: 303286040
Test: Device boots up after flashing
Test: atest CtsNfcTestCases
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:046c1816091f9150c91953b8571dc946b0a59f86 )
Merged-In: Ib2170146d07763ff6c852ce810497ebe1ac2eead
Change-Id: Ib2170146d07763ff6c852ce810497ebe1ac2eead
2024-01-12 18:17:26 -08:00
Roshan Pius
a6d8073bcf
build: Allow NFC stack to be delivered as a mainline module or APK
...
These changes are necessary to allow NFC stack delivery to be properly
trunk stable flagged:
1. Delivered as NfcNci.apk and framework-nfc.jar for Android
U based builds (existing).
2. Delivered as com.android.nfcservices.apex which embeds NfcNci.apk &
framework-nfc.jar for Android V based builds (new).
Bug: 303286040
Test: Device boots up after flashing
Test: atest CtsNfcTestCases
Change-Id: Ib2170146d07763ff6c852ce810497ebe1ac2eead
2024-01-12 18:15:34 -08:00