Commit Graph

98051 Commits

Author SHA1 Message Date
Treehugger Robot
c10417e486 Merge "check-flagged-apis.sh: speed up build step" into main am: 984f5ca822
Original change: https://android-review.googlesource.com/c/platform/build/+/3074283

Change-Id: I28bf115df15ee621495fae5187b03a9f618743e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-03 09:36:56 +00:00
Treehugger Robot
984f5ca822 Merge "check-flagged-apis.sh: speed up build step" into main 2024-05-03 09:03:12 +00:00
Mårten Kongstad
22063d0670 check-flagged-apis.sh: speed up build step
Instead of building the entire SDK, explicitly build the
api-versions.xml files.

Bug: 334870672
Test: croot && build/tools/check-flagged-apis/check-flagged-apis.sh
Change-Id: Ib165c0acd4766ad3000aaf17220050d5e66ddf2c
2024-05-03 10:05:03 +02:00
Mårten Kongstad
722c137ae4 Merge "check-flagged-apis.sh: use correct path to generated API signature files" into main am: a57d0ef0a1 am: 14d8cdbb4d
Original change: https://android-review.googlesource.com/c/platform/build/+/3070895

Change-Id: Ic0e5e1c9776cbf4899456ffc4bfba010e4705a8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-03 07:38:37 +00:00
Mårten Kongstad
14d8cdbb4d Merge "check-flagged-apis.sh: use correct path to generated API signature files" into main am: a57d0ef0a1
Original change: https://android-review.googlesource.com/c/platform/build/+/3070895

Change-Id: If574cae2f479f025d9f767129cc4a6e9f5351fab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-03 07:16:38 +00:00
Mårten Kongstad
a57d0ef0a1 Merge "check-flagged-apis.sh: use correct path to generated API signature files" into main 2024-05-03 06:53:52 +00:00
Inseob Kim
01252a6306 Merge changes from topic "merge_cc_logtags" into main am: ab47e15dd1 am: abb6097bf9
Original change: https://android-review.googlesource.com/c/platform/build/+/3063907

Change-Id: I2b569a6fe59179e9379d9f5a0ef50412b71a6a39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-03 05:53:48 +00:00
Inseob Kim
219d7fe36c Add python Soong modules for logtags am: f441f7d8fd am: 74bf96730d
Original change: https://android-review.googlesource.com/c/platform/build/+/3066464

Change-Id: Id7cf0d488b7b1eb9c34b8014054c087ac6eda7a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-03 05:53:44 +00:00
Inseob Kim
abb6097bf9 Merge changes from topic "merge_cc_logtags" into main am: ab47e15dd1
Original change: https://android-review.googlesource.com/c/platform/build/+/3063907

Change-Id: Ifebcc12ad32018b6bd43697bedbab2b8bf877cf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-03 05:31:53 +00:00
Inseob Kim
74bf96730d Add python Soong modules for logtags am: f441f7d8fd
Original change: https://android-review.googlesource.com/c/platform/build/+/3066464

Change-Id: Ibd8fdbc3cf29f004b93d32f395338f3ca2889e4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-03 05:31:47 +00:00
Inseob Kim
ab47e15dd1 Merge changes from topic "merge_cc_logtags" into main
* changes:
  Add LOCAL_SOONG_LOGTAGS_FILES
  Add python Soong modules for logtags
2024-05-03 05:10:23 +00:00
Spandan Das
d09a2872ab Merge "Drop ART_MODULE_BUILD_FROM_SOURCE" into main am: 09c5581b12 am: 45fc708b27
Original change: https://android-review.googlesource.com/c/platform/build/+/3037396

Change-Id: Icb84ea236480cdde942f90c94bba927b468ae047
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-03 03:08:39 +00:00
Jooyung Han
d6a9631d8b Remove unused testdata
com.android.apex.compressed.v1_original is removed.

Bug: 338157001
Test: releasetools_test
Change-Id: Icd4fe958f260640a541e9843efa64e85036542ed
2024-05-03 11:49:55 +09:00
Spandan Das
45fc708b27 Merge "Drop ART_MODULE_BUILD_FROM_SOURCE" into main am: 09c5581b12
Original change: https://android-review.googlesource.com/c/platform/build/+/3037396

Change-Id: Ifb05414bfd9472d17d0c5ec3d9e2631eabed2aca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-03 02:46:43 +00:00
Spandan Das
09c5581b12 Merge "Drop ART_MODULE_BUILD_FROM_SOURCE" into main 2024-05-03 02:27:51 +00:00
Spandan Das
1dcca5239a Drop ART_MODULE_BUILD_FROM_SOURCE
RELEASE_APEX_CONTRIBUTIONS_ART provides a similar functionality, and
also allows selection of a specific art prebuilt if multiple art
prebuilts exists in the tree

`art_module.source_build` was also previously used to conditionally
disable the source soong modules of art/, but this conditional disabling
has been removed with r.android.com/3045792

Bug: 308188056
Test: presubmits
Test: lunch cf_x86_64_phone-trunk_staging-userdebug; mmma art
Test: git_master-art:art-host-x86_64,art-target-arm64,mainline_modules
https://android-build.corp.google.com/builds/abtd/run/L30200030003163172
Test: git_master-art-host:art-build,art-gtest,art-test,art-preopt
https://android-build.corp.google.com/builds/abtd/run/L07600030003164399

Change-Id: Idbb129d2ec304d5320754cd61d40e10e5c7d5414
2024-05-03 02:27:39 +00:00
Florian Mayer
8c69fec8a1 Merge "Use memtag_stack variants in make" into main am: 610cd25c88 am: 3aa9411d27
Original change: https://android-review.googlesource.com/c/platform/build/+/3070322

Change-Id: I1240c28d0719a3dc7a624020399977a00de0aacd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-03 00:53:38 +00:00
Wei Li
0e805a76a4 Add proposed trendy teams for CTS modules to be added in platinum.
Bug: 333956273
Test: CIs
Change-Id: Ic4c45a495ecba1cd9ef86e5938dcea2ccff935e5
2024-05-03 00:46:52 +00:00
Florian Mayer
3aa9411d27 Merge "Use memtag_stack variants in make" into main am: 610cd25c88
Original change: https://android-review.googlesource.com/c/platform/build/+/3070322

Change-Id: Ie906e12502439b1432beec5010b8e975d7806792
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-03 00:37:37 +00:00
Florian Mayer
610cd25c88 Merge "Use memtag_stack variants in make" into main 2024-05-03 00:20:37 +00:00
Wei Li
a4bec3ef26 [automerger skipped] Merge "Add new trendy team module for Pearl team" into main am: f142d91a17 am: 9784d3a749 -s ours
am skip reason: Merged-In Ia1ebbf5c6b010b381aa70ba0edd7b00fd05c0e59 with SHA-1 e072257bda is already in history

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

Change-Id: Ib45126a87601bc0abe54e6a36dbff175079b80b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-02 23:07:19 +00:00
Wei Li
6cb6fe0660 Merge "Add license metadata declarations which are moved from device/google/trout/Android.mk." into main am: 5ff777f333 am: b6598cc3b7
Original change: https://android-review.googlesource.com/c/platform/build/+/3065663

Change-Id: I89ffb9f6a99a7226235ebc358e33f25df9e8f904
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-02 23:06:58 +00:00
Wei Li
be21974f95 Add license metadata declarations which are moved from device/google/barbet/Android.mk.
Bug: 311287207
Test: CIs
Change-Id: I7a36359845865f3ddda503b5600a52fc16013cc9
2024-05-02 15:46:29 -07:00
Wei Li
9784d3a749 Merge "Add new trendy team module for Pearl team" into main am: f142d91a17
Original change: https://android-review.googlesource.com/c/platform/build/+/3073426

Change-Id: I3a39250ef645f3c4ceb433ca5350e3ceb0e90ff4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-02 22:46:00 +00:00
Wei Li
b6598cc3b7 Merge "Add license metadata declarations which are moved from device/google/trout/Android.mk." into main am: 5ff777f333
Original change: https://android-review.googlesource.com/c/platform/build/+/3065663

Change-Id: Ibecb56c0286c3132090d9ac94dcd25a238ac7290
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-02 22:45:37 +00:00
Wei Li
f142d91a17 Merge "Add new trendy team module for Pearl team" into main 2024-05-02 22:42:40 +00:00
Wei Li
5ff777f333 Merge "Add license metadata declarations which are moved from device/google/trout/Android.mk." into main 2024-05-02 22:23:35 +00:00
Xuanang Zhao
73bc3c0e73 Add new trendy team module for Pearl team
Bug: 332479829
Ignore-AOSP-First: internal config
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e072257bdaf20c5d0a09f5908123d2d283dedfd3)
Merged-In: Ia1ebbf5c6b010b381aa70ba0edd7b00fd05c0e59
Change-Id: Ia1ebbf5c6b010b381aa70ba0edd7b00fd05c0e59
2024-05-02 21:58:16 +00:00
Zhuoyao Zhang
b24bfa844c Merge "Add an integration test" into main am: a7df315755 am: 76395530f6
Original change: https://android-review.googlesource.com/c/platform/build/+/3065703

Change-Id: I93cdd729ecc0447d2b1df6b5e45760092ce2ec1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-02 21:36:29 +00:00
Zhuoyao Zhang
76395530f6 Merge "Add an integration test" into main am: a7df315755
Original change: https://android-review.googlesource.com/c/platform/build/+/3065703

Change-Id: Ieb9386134631cf1cd1e431e0d1be1e253b138950
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-02 21:16:42 +00:00
Zhuoyao Zhang
a7df315755 Merge "Add an integration test" into main 2024-05-02 20:54:52 +00:00
LaMont Jones
ec4f5cd634 Merge "Enable build flags in protobuf" into main am: dac6b97f63 am: bf34be40e0
Original change: https://android-review.googlesource.com/c/platform/build/+/3069963

Change-Id: Ibef15bd05302142b6095c62efe4ff403734a2e7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-02 20:16:26 +00:00
Treehugger Robot
e803ed9470 Merge "Enable perfetto persistent tracing" into main am: b9ffad8376 am: 13d7e5ffae
Original change: https://android-review.googlesource.com/c/platform/build/+/3067084

Change-Id: I05049f666ce7779b9c712c9d56a41343209bf7f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-02 20:16:10 +00:00
LaMont Jones
bf34be40e0 Merge "Enable build flags in protobuf" into main am: dac6b97f63
Original change: https://android-review.googlesource.com/c/platform/build/+/3069963

Change-Id: If7ec7e9d870f06f0e60ee4017d4312cce757327c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-02 19:55:39 +00:00
Treehugger Robot
13d7e5ffae Merge "Enable perfetto persistent tracing" into main am: b9ffad8376
Original change: https://android-review.googlesource.com/c/platform/build/+/3067084

Change-Id: I7801e281e4d8b2b3aa217f9c3729e7c8b9d5be33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-02 19:55:14 +00:00
LaMont Jones
dac6b97f63 Merge "Enable build flags in protobuf" into main 2024-05-02 19:51:01 +00:00
Treehugger Robot
da7654889b Merge "check-flagged-apis: suppress unused variable warning" into main am: c039204466 am: d81c46b595
Original change: https://android-review.googlesource.com/c/platform/build/+/3069746

Change-Id: Ifbab111944b683e6c0302dc5385f6c7cb014cc96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-02 19:39:14 +00:00
Treehugger Robot
20405dc008 Merge "check-flagged-apis: add support for method with parameters" into main am: 83705ef7d1 am: a0166f7362
Original change: https://android-review.googlesource.com/c/platform/build/+/3061973

Change-Id: I0bc6a0594e46c196739f9ad2bcca71c1d54b99d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-02 19:38:42 +00:00
Treehugger Robot
b9ffad8376 Merge "Enable perfetto persistent tracing" into main 2024-05-02 19:29:08 +00:00
Treehugger Robot
d81c46b595 Merge "check-flagged-apis: suppress unused variable warning" into main am: c039204466
Original change: https://android-review.googlesource.com/c/platform/build/+/3069746

Change-Id: I06af81c383f3ffb3f6b19b852d8f5f539e2766dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-02 19:17:26 +00:00
Treehugger Robot
a0166f7362 Merge "check-flagged-apis: add support for method with parameters" into main am: 83705ef7d1
Original change: https://android-review.googlesource.com/c/platform/build/+/3061973

Change-Id: I5e56d85c81adae878405ea8c35a2ea2acb4bf309
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-02 19:17:14 +00:00
Treehugger Robot
c039204466 Merge "check-flagged-apis: suppress unused variable warning" into main 2024-05-02 19:01:48 +00:00
Treehugger Robot
83705ef7d1 Merge "check-flagged-apis: add support for method with parameters" into main 2024-05-02 18:59:48 +00:00
Daniel Zheng
2e7aebcf2a Merge "create_brick_ota: logic fix" into main am: 76f13d280c am: 4477ffc2b9
Original change: https://android-review.googlesource.com/c/platform/build/+/3072303

Change-Id: I91dd65dde33f23f8db76edb7dda9f93bdae30ee7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-02 18:50:16 +00:00
Treehugger Robot
a824186f2f Merge "Add * support products and modules" into main am: 7bff3a85f9 am: f002c90953
Original change: https://android-review.googlesource.com/c/platform/build/+/3059622

Change-Id: Ib32667db1de37b7c9da12aff4bebdc308c09cd77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-02 18:49:50 +00:00
Zhuoyao Zhang
db666bcb0c Add an integration test
Add a test to verify that the parameters passed from the
envsetup.sh function are compatible with the actual tool
event logger implementation.

Note that this change adds support for extra logger arguments.
This enables calling the real logger binary with a 'dry run'
flag to avoid actual logging during test execution.

Test: atest rul_tool_with_logging_test
Bug: 331638854

Change-Id: I6b280c53baae03477d4f52f0084efb1f500bd5d0
2024-05-02 18:43:19 +00:00
Daniel Zheng
4477ffc2b9 Merge "create_brick_ota: logic fix" into main am: 76f13d280c
Original change: https://android-review.googlesource.com/c/platform/build/+/3072303

Change-Id: I0f19dd9084ede2d6aafb459347acf94dadcc473c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-02 18:25:41 +00:00
Treehugger Robot
f002c90953 Merge "Add * support products and modules" into main am: 7bff3a85f9
Original change: https://android-review.googlesource.com/c/platform/build/+/3059622

Change-Id: Ic969d7aa37ea4231ccb93bfdbaee5917c1e17b55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-02 18:25:21 +00:00
Daniel Zheng
76f13d280c Merge "create_brick_ota: logic fix" into main 2024-05-02 18:10:51 +00:00
Treehugger Robot
7bff3a85f9 Merge "Add * support products and modules" into main 2024-05-02 18:07:48 +00:00