Commit Graph

71503 Commits

Author SHA1 Message Date
Colin Cross
13aeb689af Make CopyOf generic
Test: util_test.go
Change-Id: If8f2534ec454903eb967dc9ec0c8708096d1baff
2023-07-06 15:02:56 -07:00
Cole Faust
950689a9c2 Handle RepoMappingManifest actions
These are essentially FileWrite actions, like SourceSymlinkManifest.

However, currently aquery appears to give non-deterministic results
for the file content. Emit an empty file for now to avoid the
non-determinism.

Fixes: 288292933
Bug: 287539324
Test: Presubmits
Change-Id: Ieaf8aff0d58d2d69087e4e34dc99074a015e700c
2023-07-06 09:44:14 -07:00
Treehugger Robot
66569a3a4f Merge "Revert "Commend out dcla_apex_comparison_test.sh"" am: a9778d576b am: df2cf568a8 am: 4f0ebf0dc0 am: 60dd25b30b am: 70738d0fb9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2646204

Change-Id: I157aaad0b26ab2acb6ff81fbe42b5ec0380ec72d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 05:27:00 +00:00
Treehugger Robot
70738d0fb9 Merge "Revert "Commend out dcla_apex_comparison_test.sh"" am: a9778d576b am: df2cf568a8 am: 4f0ebf0dc0 am: 60dd25b30b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2646204

Change-Id: I7c14c059ac99be496fa404b40688026babe1fbea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 04:40:22 +00:00
Treehugger Robot
60dd25b30b Merge "Revert "Commend out dcla_apex_comparison_test.sh"" am: a9778d576b am: df2cf568a8 am: 4f0ebf0dc0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2646204

Change-Id: I7ba82b2d0a3e848e71cb588d93b2ec4a0372dac0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 03:33:31 +00:00
Treehugger Robot
4f0ebf0dc0 Merge "Revert "Commend out dcla_apex_comparison_test.sh"" am: a9778d576b am: df2cf568a8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2646204

Change-Id: If2a2141b7718addc4518318b83e4f749e606bbab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 02:49:26 +00:00
Treehugger Robot
df2cf568a8 Merge "Revert "Commend out dcla_apex_comparison_test.sh"" am: a9778d576b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2646204

Change-Id: If9ccd9d9617244a1988257fbd45dc598fa0689ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 02:05:36 +00:00
Treehugger Robot
a9778d576b Merge "Revert "Commend out dcla_apex_comparison_test.sh"" 2023-07-06 01:27:04 +00:00
Treehugger Robot
df749c46a8 Merge "Add comment for afdo flag" am: 253054a175 am: e568082a9a am: 0f43b8383b am: 314eb64bca am: f36fa8440f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2640130

Change-Id: I760e73864425b5a3c8c145428f9c4476f953d117
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 00:54:30 +00:00
Treehugger Robot
f36fa8440f Merge "Add comment for afdo flag" am: 253054a175 am: e568082a9a am: 0f43b8383b am: 314eb64bca
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2640130

Change-Id: I5f7ba887747ce894efd0877f420d55c9416d0578
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05 23:43:40 +00:00
Treehugger Robot
314eb64bca Merge "Add comment for afdo flag" am: 253054a175 am: e568082a9a am: 0f43b8383b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2640130

Change-Id: I8ecaf2cb2842c3bd0e29a666923a0c5607f4882d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05 22:57:01 +00:00
Sam Delmerico
612bbd81b9 [automerger skipped] don't export systemserverclasspath_fragment if contents are empty am: 754b054d63 am: 2444e2dd66 am: c5c5d38eb0 -s ours
am skip reason: Merged-In Ifefc6880228e4dd37f5e42b2bda31a83df785375 with SHA-1 754b054d63 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23903886

Change-Id: I29b435d427ddf5700f0f8737e590564b37d3d8a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05 22:16:21 +00:00
Sam Delmerico
5c5b3cf4e4 [automerger skipped] don't export systemserverclasspath_fragment if contents are empty am: 754b054d63 -s ours am: 69fb98b06f -s ours am: 3829525448 -s ours
am skip reason: Merged-In Ifefc6880228e4dd37f5e42b2bda31a83df785375 with SHA-1 35881365b4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23903886

Change-Id: Ie6737899217a1a387acd77b20fb8165d509d6f05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05 22:10:19 +00:00
Sam Delmerico
7c04cf006f [automerger skipped] don't export systemserverclasspath_fragment if contents are empty am: 754b054d63 am: 2444e2dd66 -s ours am: c01837ad6b -s ours
am skip reason: Merged-In Ifefc6880228e4dd37f5e42b2bda31a83df785375 with SHA-1 35881365b4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23903886

Change-Id: I2329a577fc458fe2b9fbaa424ced4e9dd76ae08b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05 22:09:49 +00:00
Treehugger Robot
0f43b8383b Merge "Add comment for afdo flag" am: 253054a175 am: e568082a9a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2640130

Change-Id: Ia1de4086ca29feed469aee22b4b35f3c60096a61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05 22:09:33 +00:00
Treehugger Robot
e568082a9a Merge "Add comment for afdo flag" am: 253054a175
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2640130

Change-Id: I08fcca2524cf822d9c895ee6000d2c4d9d16e264
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05 21:29:18 +00:00
Sam Delmerico
3829525448 [automerger skipped] don't export systemserverclasspath_fragment if contents are empty am: 754b054d63 -s ours am: 69fb98b06f -s ours
am skip reason: Merged-In Ifefc6880228e4dd37f5e42b2bda31a83df785375 with SHA-1 35881365b4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23903886

Change-Id: I0a952f733556bf6660977367742acaac02f64a11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05 21:29:18 +00:00
Sam Delmerico
c5c5d38eb0 don't export systemserverclasspath_fragment if contents are empty am: 754b054d63 am: 2444e2dd66
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23903886

Change-Id: I5baf130d7e6be34ab5ba3ab8de4d4b4de1ea3983
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05 21:28:38 +00:00
Sam Delmerico
c01837ad6b [automerger skipped] don't export systemserverclasspath_fragment if contents are empty am: 754b054d63 am: 2444e2dd66 -s ours
am skip reason: Merged-In Ifefc6880228e4dd37f5e42b2bda31a83df785375 with SHA-1 35881365b4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23903886

Change-Id: I4344ae5f8ee92c6e1d8f96b23cf1fbceb2fa7cb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05 21:23:56 +00:00
Sam Delmerico
2444e2dd66 don't export systemserverclasspath_fragment if contents are empty am: 754b054d63
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23903886

Change-Id: If8c891e11ce7d40336bd2f9ad255c3c9dd1bd613
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05 20:41:11 +00:00
Treehugger Robot
253054a175 Merge "Add comment for afdo flag" 2023-07-05 20:40:46 +00:00
Treehugger Robot
08fb446c59 Merge "Remove --skip-soong-tests from kzip builds" am: 0b42c30273 am: ff1271f74f am: 6a18dceebd am: eaba686f91 am: d235b67fad
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2648020

Change-Id: I63ecc19bbec6927cec6849593c404891c4468ed1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05 20:38:04 +00:00
Yi Kong
3a310d0eba Simplify LTO flags handling am: b9d5046d8b am: 2d7601c88f am: 35728f0827 am: 0b711dbd07 am: c449d12261
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2648279

Change-Id: I01bc690b7ac67debd46d67d4c14431b916f51a0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05 20:37:44 +00:00
Sam Delmerico
69fb98b06f [automerger skipped] don't export systemserverclasspath_fragment if contents are empty am: 754b054d63 -s ours
am skip reason: Merged-In Ifefc6880228e4dd37f5e42b2bda31a83df785375 with SHA-1 35881365b4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23903886

Change-Id: I8d13f5f8a198922b9860ea5b2956ad4095357f86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05 20:36:35 +00:00
Treehugger Robot
d235b67fad Merge "Remove --skip-soong-tests from kzip builds" am: 0b42c30273 am: ff1271f74f am: 6a18dceebd am: eaba686f91
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2648020

Change-Id: I65261a18a2c819f0bbac869de4a56d9d0987e4be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05 19:59:58 +00:00
Yi Kong
c449d12261 Simplify LTO flags handling am: b9d5046d8b am: 2d7601c88f am: 35728f0827 am: 0b711dbd07
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2648279

Change-Id: Idb701f35f68909d603b3bbeb98922281f611b52c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05 19:58:51 +00:00
Treehugger Robot
eaba686f91 Merge "Remove --skip-soong-tests from kzip builds" am: 0b42c30273 am: ff1271f74f am: 6a18dceebd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2648020

Change-Id: Ibf606e2e82fd71cdc2b135e5f0a72f9e63cdb59a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05 19:15:11 +00:00
Yi Kong
0b711dbd07 Simplify LTO flags handling am: b9d5046d8b am: 2d7601c88f am: 35728f0827
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2648279

Change-Id: Idab37d83d2ab4572e56cebd4c4ada1f0f7eb9bc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05 19:14:47 +00:00
Treehugger Robot
6a18dceebd Merge "Remove --skip-soong-tests from kzip builds" am: 0b42c30273 am: ff1271f74f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2648020

Change-Id: I6be2d4224d3552b66424c61b4547840bbb46e2c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05 18:25:39 +00:00
Yi Kong
35728f0827 Simplify LTO flags handling am: b9d5046d8b am: 2d7601c88f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2648279

Change-Id: I8c54b9f7b5d0207b7aa0d419938c449f91f0a9c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05 18:25:28 +00:00
Treehugger Robot
ff1271f74f Merge "Remove --skip-soong-tests from kzip builds" am: 0b42c30273
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2648020

Change-Id: Iccbc93054d586328202363ccf104a5d365fe2134
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05 17:38:58 +00:00
Yi Kong
2d7601c88f Simplify LTO flags handling am: b9d5046d8b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2648279

Change-Id: I81e6a30577972faa1736c4c99e5ff01038f70aa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05 17:38:46 +00:00
Sam Delmerico
754b054d63 don't export systemserverclasspath_fragment if contents are empty
If a systemserverclasspath_fragment only contains libraries that have a
higher min_sdk_version than the target build release version, then we
should not export the systemserverclasspath_fragment. Before this
change, the fragment was exported with an empty `contents` property
which caused errors after being dropped as a prebuilt.

Bug: 289183551
Test: go test ./sdk
(cherry picked from https://android-review.googlesource.com/q/commit:35881365b49235b2311f48bfcbaff8f873f19b88)
Merged-In: Ifefc6880228e4dd37f5e42b2bda31a83df785375
Change-Id: Ifefc6880228e4dd37f5e42b2bda31a83df785375
2023-07-05 17:10:20 +00:00
Treehugger Robot
0b42c30273 Merge "Remove --skip-soong-tests from kzip builds" 2023-07-05 17:00:41 +00:00
Vinh Tran
056effb8b1 Add comment for afdo flag
Change-Id: If80df0ac0527784b13158325589c29587db8d5f9
Test: N/A
2023-07-05 15:48:21 +00:00
Liz Kammer
e58161b93f Remove --skip-soong-tests from kzip builds
Bug:289993105
Change-Id: I12d0a980141a9ef03a42c943ae92d19b717e7ff9
2023-07-05 12:27:49 +00:00
Yi Kong
b9d5046d8b Simplify LTO flags handling
... and add more comments about the use of --lto-O0.

Test: presubmit
Change-Id: I2ef7bf4f100a8d7559a6b738e9211c596d579dc6
2023-07-03 17:16:42 +09:00
Treehugger Robot
1015b0295b Merge "don't export systemserverclasspath_fragment if contents are empty" am: 222995b2c1 am: e0b04715a1 am: 7ebf9d3a34 am: 0981431171 am: 6e9be42656
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2646181

Change-Id: I1eb3bbf6a90f5bdb7e3d00f9ae174ed6295a133f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-01 03:03:09 +00:00
Treehugger Robot
f5898b3e40 Merge "Suppress resourceshrinker stdout in soong" am: ece97e5658 am: 1890f082a7 am: b12365df34 am: 7a67e5ca42 am: 64b4d69f9e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2629191

Change-Id: Ie1c320e0c806d86c892b0107edd2cf439d8fb602
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-01 03:02:25 +00:00
Treehugger Robot
6e9be42656 Merge "don't export systemserverclasspath_fragment if contents are empty" am: 222995b2c1 am: e0b04715a1 am: 7ebf9d3a34 am: 0981431171
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2646181

Change-Id: I1901f823c2e1895495abe20e88123d0e1d51b925
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-01 02:20:12 +00:00
Treehugger Robot
64b4d69f9e Merge "Suppress resourceshrinker stdout in soong" am: ece97e5658 am: 1890f082a7 am: b12365df34 am: 7a67e5ca42
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2629191

Change-Id: Id2a2b8d8d44c5e4ae817d69d99ac6e105141b998
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-01 02:19:30 +00:00
Treehugger Robot
0981431171 Merge "don't export systemserverclasspath_fragment if contents are empty" am: 222995b2c1 am: e0b04715a1 am: 7ebf9d3a34
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2646181

Change-Id: I9580595ea8f9408d4c40b8ce387722e144c8ae25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-01 01:38:02 +00:00
Treehugger Robot
7a67e5ca42 Merge "Suppress resourceshrinker stdout in soong" am: ece97e5658 am: 1890f082a7 am: b12365df34
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2629191

Change-Id: Id3005c689e4d8b5badecc6a6a6c414fc86464abc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-01 01:37:17 +00:00
Treehugger Robot
7ebf9d3a34 Merge "don't export systemserverclasspath_fragment if contents are empty" am: 222995b2c1 am: e0b04715a1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2646181

Change-Id: I8c6721bf0c51c0f311deaa6a1f6db7d093a03dd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-01 00:53:29 +00:00
Treehugger Robot
b12365df34 Merge "Suppress resourceshrinker stdout in soong" am: ece97e5658 am: 1890f082a7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2629191

Change-Id: Ib3a05347c5bb1b9aea274cb740f063f9013c02a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-01 00:53:18 +00:00
Treehugger Robot
e0b04715a1 Merge "don't export systemserverclasspath_fragment if contents are empty" am: 222995b2c1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2646181

Change-Id: I75612c77734b751a608fbed16c0fe22de5d8a060
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-01 00:13:19 +00:00
Treehugger Robot
1890f082a7 Merge "Suppress resourceshrinker stdout in soong" am: ece97e5658
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2629191

Change-Id: I7b82f1d75e7d055b4963804c995e57f714fee1cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-01 00:13:05 +00:00
Treehugger Robot
222995b2c1 Merge "don't export systemserverclasspath_fragment if contents are empty" 2023-07-01 00:07:12 +00:00
Treehugger Robot
ece97e5658 Merge "Suppress resourceshrinker stdout in soong" 2023-06-30 23:26:28 +00:00
Cole Faust
837c3b9a55 Revert "Commend out dcla_apex_comparison_test.sh"
This reverts commit a56663f695.

Reason for revert: Original breaking change was reverted

Change-Id: I8e0c97f0b511f686f5efdb8a9e8c9f862fc41010
2023-06-30 22:53:10 +00:00