LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,313 Commits 2 Branches 0 Tags
676d6510d2dab64232e3a3832aa7071baf80fa21
Commit Graph

33313 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cole Faust
676d6510d2 Merge "Fix array-related errorprone warnings" am: 159371eef5 am: 201f62aa05 am: db8f0c7c2d am: a81487ec4c 
Original change: https://android-review.googlesource.com/c/platform/development/+/2184500

Change-Id: I8e8ed3f15fab4b4826b15417fb4cd62aa56c6827
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 00:26:34 +00:00
Cole Faust
a81487ec4c Merge "Fix array-related errorprone warnings" am: 159371eef5 am: 201f62aa05 am: db8f0c7c2d 
Original change: https://android-review.googlesource.com/c/platform/development/+/2184500

Change-Id: I538267d5c3916cc019c936eda85fdeb4f2656a2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 00:00:44 +00:00
Cole Faust
db8f0c7c2d Merge "Fix array-related errorprone warnings" am: 159371eef5 am: 201f62aa05 
Original change: https://android-review.googlesource.com/c/platform/development/+/2184500

Change-Id: I460f3c7f38846bf3044c7da263202e33d0efb847
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 23:42:05 +00:00
Cole Faust
201f62aa05 Merge "Fix array-related errorprone warnings" am: 159371eef5 
Original change: https://android-review.googlesource.com/c/platform/development/+/2184500

Change-Id: Iee056a1b6eee9732d5b7b03b78c6278ce84afc89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 23:14:08 +00:00
Cole Faust
159371eef5 Merge "Fix array-related errorprone warnings" 2022-08-22 22:51:09 +00:00
Mu-Le Lee
79515838e8 Merge "Fix header-abi-diff skips diff when config.json is not found" am: 3bf758113b am: cf474e4d59 am: b5b440b045 am: 1dc581c810 
Original change: https://android-review.googlesource.com/c/platform/development/+/2190085

Change-Id: I2bf1b53b76f541bc4c31c46eb864422907157a5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 16:34:01 +00:00
Mu-Le Lee
1dc581c810 Merge "Fix header-abi-diff skips diff when config.json is not found" am: 3bf758113b am: cf474e4d59 am: b5b440b045 
Original change: https://android-review.googlesource.com/c/platform/development/+/2190085

Change-Id: I13de8d71f0ac6ebe30416c43607072aab22a59e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 16:16:58 +00:00
Mu-Le Lee
b5b440b045 Merge "Fix header-abi-diff skips diff when config.json is not found" am: 3bf758113b am: cf474e4d59 
Original change: https://android-review.googlesource.com/c/platform/development/+/2190085

Change-Id: I3dd5d77afd3f55d1a7da8e7b22d82ac92ea28db8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 15:58:08 +00:00
Mu-Le Lee
cf474e4d59 Merge "Fix header-abi-diff skips diff when config.json is not found" am: 3bf758113b 
Original change: https://android-review.googlesource.com/c/platform/development/+/2190085

Change-Id: I737afb42d20ea81a5b104fb1aae2a49623dc88f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 15:30:59 +00:00
Mu-Le Lee
3bf758113b Merge "Fix header-abi-diff skips diff when config.json is not found" 2022-08-22 15:09:09 +00:00
Inseob Kim
de7f5184fe Merge "Analyze project usages with manifest" am: 61b8730ec6 am: bfbe1c167d am: 28f0ca1b34 am: e9afefc6b8 
Original change: https://android-review.googlesource.com/c/platform/development/+/2190086

Change-Id: I8c167eda299e4cc277203d43df3d3004a4ebf09a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 08:39:52 +00:00
Mu-Le Lee
82c4dd2bc7 Fix header-abi-diff skips diff when config.json is not found 
Skip loading config.json when the config.json is not found so the
header-abi-diff will still perform abi diff.

Test: preform abi diff without config.json
Bug: 243328443
Change-Id: I92ebf7e7bfe6abb57bdefa211eaf604efaee517e
 2022-08-22 08:32:57 +00:00
Inseob Kim
e9afefc6b8 Merge "Analyze project usages with manifest" am: 61b8730ec6 am: bfbe1c167d am: 28f0ca1b34 
Original change: https://android-review.googlesource.com/c/platform/development/+/2190086

Change-Id: Ic507a03029fb77f97ebf3b5e04d3a0ae92e1eec9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 08:14:16 +00:00
Inseob Kim
28f0ca1b34 Merge "Analyze project usages with manifest" am: 61b8730ec6 am: bfbe1c167d 
Original change: https://android-review.googlesource.com/c/platform/development/+/2190086

Change-Id: I5d26aabcaab1a043c01423a72824a87e038dafd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 07:55:43 +00:00
Inseob Kim
bfbe1c167d Merge "Analyze project usages with manifest" am: 61b8730ec6 
Original change: https://android-review.googlesource.com/c/platform/development/+/2190086

Change-Id: I936da4c46115c0f436eb6726383886e31b6d3d31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-22 07:36:31 +00:00
Inseob Kim
61b8730ec6 Merge "Analyze project usages with manifest" 2022-08-22 07:11:11 +00:00
Inseob Kim
4c8cf32e1e Analyze project usages with manifest 
Bug: 242961282
Test: manual
Change-Id: Ie5511541c3b2c60f3d56888b75e2e2ba2212123d
 2022-08-22 06:15:52 +00:00
Inseob Kim
9359b96056 Merge "Make build_vendor script configurable" am: b09c616b48 am: 0242c83aed am: a6ca8d6611 am: 88056ed243 
Original change: https://android-review.googlesource.com/c/platform/development/+/2190438

Change-Id: Id7eca74525c3aefb4a021bdbfc1f6a0018185aef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-19 14:38:05 +00:00
Inseob Kim
88056ed243 Merge "Make build_vendor script configurable" am: b09c616b48 am: 0242c83aed am: a6ca8d6611 
Original change: https://android-review.googlesource.com/c/platform/development/+/2190438

Change-Id: Icfa504ba1d4e8bc9e0b4e7a8378e03b769304dd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-19 14:20:50 +00:00
Inseob Kim
a6ca8d6611 Merge "Make build_vendor script configurable" am: b09c616b48 am: 0242c83aed 
Original change: https://android-review.googlesource.com/c/platform/development/+/2190438

Change-Id: Ic69667904dab9bf3a219b1562e892ef6276c3a3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-19 13:54:37 +00:00
Inseob Kim
0242c83aed Merge "Make build_vendor script configurable" am: b09c616b48 
Original change: https://android-review.googlesource.com/c/platform/development/+/2190438

Change-Id: Iba9d396c73dc44f6ce342797fe3f3f72ba5412d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-19 13:27:12 +00:00
Inseob Kim
b09c616b48 Merge "Make build_vendor script configurable" 2022-08-19 13:00:54 +00:00
Inseob Kim
68c004fbc7 Make build_vendor script configurable 
To support Pixel targets as well.

Bug: 242961282
Test: manual
Change-Id: Ieab708c42fec9ae488c47e8302fb01d6175c0550
 2022-08-19 19:55:41 +09:00
Mu-Le Lee
d41dda5ac4 Merge "Implement the Cross-Version ABI diff configuration" am: 7b72a4f5f1 am: 83faed3220 am: fdef618168 am: 5ecfa7be86 
Original change: https://android-review.googlesource.com/c/platform/development/+/2182596

Change-Id: I667fdc036578b68b6a9643e71c778c1e9436f8fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-19 09:51:21 +00:00
Mu-Le Lee
5ecfa7be86 Merge "Implement the Cross-Version ABI diff configuration" am: 7b72a4f5f1 am: 83faed3220 am: fdef618168 
Original change: https://android-review.googlesource.com/c/platform/development/+/2182596

Change-Id: I00d93b199b3220b6d008345d315ff5697ca3c2c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-19 09:24:23 +00:00
Mu-Le Lee
fdef618168 Merge "Implement the Cross-Version ABI diff configuration" am: 7b72a4f5f1 am: 83faed3220 
Original change: https://android-review.googlesource.com/c/platform/development/+/2182596

Change-Id: I4e9a82f2c5f14c26503693ae9da36e024cd5b785
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-19 09:06:55 +00:00
Mu-Le Lee
83faed3220 Merge "Implement the Cross-Version ABI diff configuration" am: 7b72a4f5f1 
Original change: https://android-review.googlesource.com/c/platform/development/+/2182596

Change-Id: I037c48d8db6c80e343aae6b598c8c986820abb44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-19 08:47:19 +00:00
Mu-Le Lee
7b72a4f5f1 Merge "Implement the Cross-Version ABI diff configuration" 2022-08-19 08:25:45 +00:00
Mu-Le Lee
2ce72d8673 Implement the Cross-Version ABI diff configuration 
Enable the Cross-Version ABI diff configuration so developers can
specify different flags for current and previous version ABI Check. The
-target-version flag were added to determine the config section to be
selected. The details of this configuration logic could be found in
go/cross-version-abi-diff-configuration.

Test: preform abi diff with config.json
Bug: 239792343
Change-Id: I8fdad2d18096cfa7866183ecc2d7826682c85eb6
 2022-08-19 04:42:03 +00:00
Treehugger Robot
32997fd8a9 Merge "cargo2android: fix test detection when there is exactly 1 test" am: 9bd80cb611 am: 09a4fbcac7 am: e47f2b97c2 am: e0a3381203 
Original change: https://android-review.googlesource.com/c/platform/development/+/2188723

Change-Id: I9da1d81f15589f57d591e0b3ad601caf7daf2515
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-18 21:49:35 +00:00
Treehugger Robot
e0a3381203 Merge "cargo2android: fix test detection when there is exactly 1 test" am: 9bd80cb611 am: 09a4fbcac7 am: e47f2b97c2 
Original change: https://android-review.googlesource.com/c/platform/development/+/2188723

Change-Id: I66108be912052107c8fa9f4c0aef093a052a6704
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-18 21:33:35 +00:00
Treehugger Robot
e47f2b97c2 Merge "cargo2android: fix test detection when there is exactly 1 test" am: 9bd80cb611 am: 09a4fbcac7 
Original change: https://android-review.googlesource.com/c/platform/development/+/2188723

Change-Id: I634a52076e0835d75fac9ff99b04815b36971404
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-18 21:06:24 +00:00
Treehugger Robot
09a4fbcac7 Merge "cargo2android: fix test detection when there is exactly 1 test" am: 9bd80cb611 
Original change: https://android-review.googlesource.com/c/platform/development/+/2188723

Change-Id: I33dba89495f1df09409a9ac5187faed30c22fba8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-18 20:47:00 +00:00
Treehugger Robot
9bd80cb611 Merge "cargo2android: fix test detection when there is exactly 1 test" 2022-08-18 20:19:25 +00:00
Frederick Mayle
9f0dd71b8a cargo2android: fix test detection when there is exactly 1 test 
Example where it failed:

    tests::sock_send_recv_event: test

    1 test, 0 benchmarks
       Doc-tests vm_control
    0 tests, 0 benchmarks

the "1 test, 0 benchmarks" line wouldn't match the test regex, so it
would mistakenly parse the doc tests line instead and then fail to
generate a rust_test module.

Test: ran on crosvm repo

Change-Id: Id0286165405b58bf84b7261db842e272442c91e8
 2022-08-17 20:36:45 +00:00
Matthew Maurer
cc27840a54 Merge changes I4c3744e0,I91d8de92 am: b1d8a2de5f am: ad73674f9d am: b164b09cb1 am: c01e8b38b1 
Original change: https://android-review.googlesource.com/c/platform/development/+/2129337

Change-Id: Ia2ff1e5ad7ae47f08b06a856ad28fb15f51867a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 17:55:22 +00:00
Matthew Maurer
c01e8b38b1 Merge changes I4c3744e0,I91d8de92 am: b1d8a2de5f am: ad73674f9d am: b164b09cb1 
Original change: https://android-review.googlesource.com/c/platform/development/+/2129337

Change-Id: I0bb7c20bc59542e915be11bdb3dd73d3acee0849
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 17:22:25 +00:00
Matthew Maurer
b164b09cb1 Merge changes I4c3744e0,I91d8de92 am: b1d8a2de5f am: ad73674f9d 
Original change: https://android-review.googlesource.com/c/platform/development/+/2129337

Change-Id: Ia20151ca52b1933a342e8baea9c0a66f4dc02083
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 16:55:33 +00:00
Matthew Maurer
ad73674f9d Merge changes I4c3744e0,I91d8de92 am: b1d8a2de5f 
Original change: https://android-review.googlesource.com/c/platform/development/+/2129337

Change-Id: Ifa740eda5483de4b4a660fa52a8ab3b277b3c9e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 16:27:48 +00:00
Matthew Maurer
b1d8a2de5f Merge changes I4c3744e0,I91d8de92 
* changes:
  c2a: Our cargo works again, re-enable defaulting.
  c2a: Fix rust_version calculation
 2022-08-17 16:08:32 +00:00
Mu-Le Lee
61eaa2bfcf Merge "Change the format of header-abi-diff config from .ini to .json" am: e43c2bc9a7 am: 1997b594d6 am: 2af8de3972 am: 807bfe9ef1 
Original change: https://android-review.googlesource.com/c/platform/development/+/2176545

Change-Id: I6e99df7675b76c5056ca5ddbb91cf568f0b211ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 07:42:55 +00:00
Mu-Le Lee
807bfe9ef1 Merge "Change the format of header-abi-diff config from .ini to .json" am: e43c2bc9a7 am: 1997b594d6 am: 2af8de3972 
Original change: https://android-review.googlesource.com/c/platform/development/+/2176545

Change-Id: Icb8d9d4d69ee8d79f6f27f7c241737643c08d5da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 07:24:29 +00:00
Mu-Le Lee
2af8de3972 Merge "Change the format of header-abi-diff config from .ini to .json" am: e43c2bc9a7 am: 1997b594d6 
Original change: https://android-review.googlesource.com/c/platform/development/+/2176545

Change-Id: I6b97bbb31b9171d2b6f1fbc7a4f50c821f042b00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 06:54:26 +00:00
Mu-Le Lee
1997b594d6 Merge "Change the format of header-abi-diff config from .ini to .json" am: e43c2bc9a7 
Original change: https://android-review.googlesource.com/c/platform/development/+/2176545

Change-Id: I41ea447c0c56dbd4ec8123c579fa103f39964dad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 06:21:43 +00:00
Mu-Le Lee
e43c2bc9a7 Merge "Change the format of header-abi-diff config from .ini to .json" 2022-08-17 05:58:15 +00:00
Automerger Merge Worker
b70eae494c [automerger skipped] Merge changes from topic "am-96e5992b2dd4470eae48f4ad98b53c99" into stage-aosp-master am: cf3ad91aae -s ours am: 5dfccffb3c -s ours am: 7edbd525a5 -s ours 
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/2186582

Change-Id: I24f3dd1936e0aea66c740477aa47f3d3ad00b326
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 01:10:03 +00:00
Xin Li
4933be9baa [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 4ce806fe1b -s ours am: 4392c82f8e -s ours am: 1b2a51e7ff -s ours am: c18594cce8 -s ours 
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/2186582

Change-Id: I033fb1d5cea6daa77e25a2a6161f2f334cb2b2e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 01:09:34 +00:00
Automerger Merge Worker
7edbd525a5 [automerger skipped] Merge changes from topic "am-96e5992b2dd4470eae48f4ad98b53c99" into stage-aosp-master am: cf3ad91aae -s ours am: 5dfccffb3c -s ours 
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/2186582

Change-Id: I786a0bb017b1d4aa3d28b853c3f2651c90a9567d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 00:55:34 +00:00
Xin Li
c18594cce8 [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 4ce806fe1b -s ours am: 4392c82f8e -s ours am: 1b2a51e7ff -s ours 
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/2186582

Change-Id: I07cc9965afc8a6205c820dbd0e03c8ff7be35391
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 00:55:06 +00:00
Xin Li
eea6db0f4a [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 4ce806fe1b -s ours am: 7f7c44d6ca -s ours am: 1f110f2cf3 -s ours am: b7c85f9190 -s ours 
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/2186582

Change-Id: Id3413be10facb32f79170c59cab405555cdc4aa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 00:50:38 +00:00