Treehugger Robot
5470a305ff
[automerger skipped] Merge "Add permission to the list of individually toggleable modules" am: 8bfd7fa7d6
-s ours am: 1675ebe0a7
-s ours am: 3bf76f727c
-s ours am: 79c7dbd3e8
-s ours
...
am skip reason: Merged-In Id4eb9ba0da8a05c41d3b29b1cb8fa1d2d485c7b9 with SHA-1 86251a5450
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2151255
Change-Id: I38ca173114fe6049025562ce47211eefdec86c1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-13 21:10:22 +00:00
Paul Duffin
5ca0addd3b
[automerger skipped] Add permission to the list of individually toggleable modules am: 3ec92f2695
-s ours am: 7e74ff5f49
-s ours am: 911c67df0d
-s ours am: daf91586a3
-s ours
...
am skip reason: Merged-In Id4eb9ba0da8a05c41d3b29b1cb8fa1d2d485c7b9 with SHA-1 86251a5450
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2151255
Change-Id: I3f8c218aa4c3202c8295870e74c01b3a3f60fd96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-13 21:10:20 +00:00
Treehugger Robot
79c7dbd3e8
[automerger skipped] Merge "Add permission to the list of individually toggleable modules" am: 8bfd7fa7d6
-s ours am: 1675ebe0a7
-s ours am: 3bf76f727c
-s ours
...
am skip reason: Merged-In Id4eb9ba0da8a05c41d3b29b1cb8fa1d2d485c7b9 with SHA-1 86251a5450
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2151255
Change-Id: I939b4a845f8fafda6161962c25bfaa6f282f1c84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-13 20:36:16 +00:00
Paul Duffin
daf91586a3
[automerger skipped] Add permission to the list of individually toggleable modules am: 3ec92f2695
-s ours am: 7e74ff5f49
-s ours am: 911c67df0d
-s ours
...
am skip reason: Merged-In Id4eb9ba0da8a05c41d3b29b1cb8fa1d2d485c7b9 with SHA-1 86251a5450
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2151255
Change-Id: Ibb188d232e5e46d93d1625b5b64b40f7267fda79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-13 20:36:14 +00:00
Treehugger Robot
3bf76f727c
[automerger skipped] Merge "Add permission to the list of individually toggleable modules" am: 8bfd7fa7d6
-s ours am: 1675ebe0a7
-s ours
...
am skip reason: Merged-In Id4eb9ba0da8a05c41d3b29b1cb8fa1d2d485c7b9 with SHA-1 86251a5450
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2151255
Change-Id: Iaf30c6f58b0de1c0400f89810b6d05b17cc1ea07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-13 20:11:21 +00:00
Paul Duffin
911c67df0d
[automerger skipped] Add permission to the list of individually toggleable modules am: 3ec92f2695
-s ours am: 7e74ff5f49
-s ours
...
am skip reason: Merged-In Id4eb9ba0da8a05c41d3b29b1cb8fa1d2d485c7b9 with SHA-1 86251a5450
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2151255
Change-Id: I53992283628599e3d80e1f6fbcacadb2e0856e89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-13 20:11:19 +00:00
Treehugger Robot
1675ebe0a7
[automerger skipped] Merge "Add permission to the list of individually toggleable modules" am: 8bfd7fa7d6
-s ours
...
am skip reason: Merged-In Id4eb9ba0da8a05c41d3b29b1cb8fa1d2d485c7b9 with SHA-1 86251a5450
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2151255
Change-Id: I8f1cfd31298085ba4b031047d5b07ed62086acb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-13 19:52:34 +00:00
Paul Duffin
7e74ff5f49
[automerger skipped] Add permission to the list of individually toggleable modules am: 3ec92f2695
-s ours
...
am skip reason: Merged-In Id4eb9ba0da8a05c41d3b29b1cb8fa1d2d485c7b9 with SHA-1 86251a5450
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2151255
Change-Id: If46ead84417243e3eba93ef126d14ae208ee920f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-13 19:52:32 +00:00
Treehugger Robot
8bfd7fa7d6
Merge "Add permission to the list of individually toggleable modules"
2022-07-13 19:34:19 +00:00
Paul Duffin
71607f0aeb
Add permission to the list of individually toggleable modules am: 86251a5450
am: 19b7f009b2
am: 238bd4f17e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19280252
Change-Id: If7eaf3ba1a98902b0c71027b3cef416a025cc072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-13 18:40:03 +00:00
Paul Duffin
238bd4f17e
Add permission to the list of individually toggleable modules am: 86251a5450
am: 19b7f009b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19280252
Change-Id: I6276ae4f4e40c940831afba9090702176e71dcbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-13 18:15:40 +00:00
Paul Duffin
19b7f009b2
Add permission to the list of individually toggleable modules am: 86251a5450
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19280252
Change-Id: I27681657fdb108e92ba709ff92e1070e635ade57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-13 17:59:10 +00:00
Paul Duffin
86251a5450
Add permission to the list of individually toggleable modules
...
This is safe even though permission is not an optional mainline
module because devices that support mainline must pass GTS and
testModulesSignedCorrectly and testModulesPreloadedCorrectly in GTS
currently tests this, along with testMainlineApprovedTrain which checks
mandatory/optional, signing keys, and if what's preloaded are part of
approved trains.
Bug: 238175656
Test: # Cherry pick to branch that has Google signed prebuilts for
# permission and builds from prebuilts by default.
# Update the permission to an sdk snapshot generated with
# r.android.com/2151273.
# Make sure that the permission is built from prebuilts by
# default
Change-Id: Id4eb9ba0da8a05c41d3b29b1cb8fa1d2d485c7b9
(cherry picked from commit fb72d542ad
)
Merged-In: Id4eb9ba0da8a05c41d3b29b1cb8fa1d2d485c7b9
2022-07-13 16:28:57 +00:00
Zhi Dou
a40b963f34
Merge "Keep proguard fields for lite runtime of jarjared class" am: 3f45311ba2
am: 0ed7488697
am: af52a71d64
am: 49cb3ba7ed
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2151556
Change-Id: If020f2914f94551af7844326a7deae2b10975676
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-13 14:45:04 +00:00
Zhi Dou
49cb3ba7ed
Merge "Keep proguard fields for lite runtime of jarjared class" am: 3f45311ba2
am: 0ed7488697
am: af52a71d64
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2151556
Change-Id: Iad3fe2378d7d58605ae23b2c447f5a101850baff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-13 14:06:31 +00:00
Paul Duffin
3ec92f2695
Add permission to the list of individually toggleable modules
...
(cherry-picked from fb72d542ad
)
This is safe even though permission is not an optional mainline
module because devices that support mainline must pass GTS and
testModulesSignedCorrectly and testModulesPreloadedCorrectly in GTS
currently tests this, along with testMainlineApprovedTrain which checks
mandatory/optional, signing keys, and if what's preloaded are part of
approved trains.
Bug: 238175656
Test: # Cherry pick to branch that has Google signed prebuilts for
# permission and builds from prebuilts by default.
# Update the permission to an sdk snapshot generated with
# r.android.com/2151273.
# Make sure that the permission is built from prebuilts by
# default
Change-Id: Id4eb9ba0da8a05c41d3b29b1cb8fa1d2d485c7b9
Merged-In: Id4eb9ba0da8a05c41d3b29b1cb8fa1d2d485c7b9
2022-07-13 14:01:31 +00:00
Zhi Dou
af52a71d64
Merge "Keep proguard fields for lite runtime of jarjared class" am: 3f45311ba2
am: 0ed7488697
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2151556
Change-Id: If412f09c4d360cbedf968bf47135922732d24ff7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-13 13:44:43 +00:00
Zhi Dou
0ed7488697
Merge "Keep proguard fields for lite runtime of jarjared class" am: 3f45311ba2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2151556
Change-Id: I5cc461978d2c62e5b6114b1bacf344b54e1ff6eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-13 13:28:42 +00:00
Zhi Dou
3f45311ba2
Merge "Keep proguard fields for lite runtime of jarjared class"
2022-07-13 13:09:29 +00:00
zhidou
12fdb34299
Keep proguard fields for lite runtime of jarjared class
...
Some targets rename protobuf.MessageLite with jarjar rules. This change
adds keep rules to keep the fields of renamed classes.
Bug: 233746531
Test: m checkbuild.
Change-Id: Ib487dbd35f69654489aa28577afb47b9fb87c6f6
Merged-In: I986f05455b45651749fb5f819661041d7399f683
2022-07-13 13:09:09 +00:00
Cory Barker
b35c4cc634
Merge "Revert "Adding support for building AFLpp Test: Built AFL fuzzer..."" am: 990e6041ea
am: 4ab0d5531d
am: d3ba568907
am: c713c4eb54
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2151854
Change-Id: If3ae67e77976cfc59b09dfe3b867aaefcc49e4d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 22:12:39 +00:00
Cory Barker
c713c4eb54
Merge "Revert "Adding support for building AFLpp Test: Built AFL fuzzer..."" am: 990e6041ea
am: 4ab0d5531d
am: d3ba568907
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2151854
Change-Id: I755c75c1586845d617038eee453ea3a199abb518
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 21:50:21 +00:00
Cory Barker
d3ba568907
Merge "Revert "Adding support for building AFLpp Test: Built AFL fuzzer..."" am: 990e6041ea
am: 4ab0d5531d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2151854
Change-Id: If17631a1dfeeab554939351b113b6b82fa108d1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 21:28:55 +00:00
Cory Barker
4ab0d5531d
Merge "Revert "Adding support for building AFLpp Test: Built AFL fuzzer..."" am: 990e6041ea
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2151854
Change-Id: I2957590fbb01793f9c7de679f9ab9b43863fc921
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 20:40:44 +00:00
Cory Barker
990e6041ea
Merge "Revert "Adding support for building AFLpp Test: Built AFL fuzzer...""
2022-07-12 20:20:00 +00:00
Cory Barker
f190727316
Merge "Adding support for building AFLpp Test: Built AFL fuzzers locally and ran them" am: 66a7233b58
am: 6c54a1a369
am: 012be04e33
am: 658cc3680d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2124220
Change-Id: I8419b75f6db19479adbe69bf114ca17a74c18ef2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 19:12:13 +00:00
Cory Barker
658cc3680d
Merge "Adding support for building AFLpp Test: Built AFL fuzzers locally and ran them" am: 66a7233b58
am: 6c54a1a369
am: 012be04e33
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2124220
Change-Id: I0eb6c2ad65b822e66030a43baaf6e198ffe116ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 18:17:28 +00:00
Cory Barker
cadfdc16b9
Revert "Adding support for building AFLpp Test: Built AFL fuzzer..."
...
Revert "Adding support for building AFLpp Test: Build AFL fuzzer..."
Revert submission 2124256-AFLpp support in Soong
Reason for revert: It is breaking the build
Reverted Changes:
Ie07ec3368:Adding support for building AFLpp Test: Build AFL ...
I5bd6d1e9b:Adding support for building AFLpp Test: Built AFL ...
Change-Id: Iad3fa47397cfe3310f80e109af93d66eb40d9ab4
2022-07-12 18:04:17 +00:00
Cory Barker
012be04e33
Merge "Adding support for building AFLpp Test: Built AFL fuzzers locally and ran them" am: 66a7233b58
am: 6c54a1a369
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2124220
Change-Id: I3549c7c42929a3c2e1e66764dc52f98567bbe077
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 18:00:12 +00:00
Cory Barker
6c54a1a369
Merge "Adding support for building AFLpp Test: Built AFL fuzzers locally and ran them" am: 66a7233b58
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2124220
Change-Id: I29273d21519c046eb74a20eb33c48f6bf4b93b84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 17:39:55 +00:00
Cory Barker
66a7233b58
Merge "Adding support for building AFLpp Test: Built AFL fuzzers locally and ran them"
2022-07-12 17:21:05 +00:00
Xin Li
465f0ae9d0
DO NOT MERGE - Skip TP1A.220624.013 am: 294a1ab042
am: e1cfc89824
am: d8fe806e20
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19251469
Change-Id: Ic241618d7d130923af45f0d1f43c8eada5d66eca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 07:13:49 +00:00
Xin Li
d8fe806e20
DO NOT MERGE - Skip TP1A.220624.013 am: 294a1ab042
am: e1cfc89824
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19251469
Change-Id: Ic295466902ec6a65ce458d190a8911e033333728
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 06:55:58 +00:00
Xin Li
e1cfc89824
DO NOT MERGE - Skip TP1A.220624.013 am: 294a1ab042
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19251469
Change-Id: Ib7ed4b54db5a7524cbe92150f89271195f20a332
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 06:37:35 +00:00
Xin Li
294a1ab042
DO NOT MERGE - Skip TP1A.220624.013
...
Change-Id: I4488ab06208dd0b75edf98be138a65a5e0d9a63b
2022-07-11 21:55:40 -07:00
Treehugger Robot
41720536e0
Merge "make: fix memory leak" am: 66b010f2cf
am: 8493849334
am: e7c024b6d6
am: 748355fddf
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2138495
Change-Id: I734656ea25ee31b12943fabc1c717ed0d7bc4b96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-11 22:44:25 +00:00
Treehugger Robot
748355fddf
Merge "make: fix memory leak" am: 66b010f2cf
am: 8493849334
am: e7c024b6d6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2138495
Change-Id: I6f0b4a5146c469c00c6f86037a608ff1f9da285b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-11 22:25:31 +00:00
Treehugger Robot
e7c024b6d6
Merge "make: fix memory leak" am: 66b010f2cf
am: 8493849334
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2138495
Change-Id: I6fc5ddf2cb1683318f7315ecbea4c08032a336c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-11 22:09:06 +00:00
Treehugger Robot
8493849334
Merge "make: fix memory leak" am: 66b010f2cf
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2138495
Change-Id: Ica6a38075b8cc2320c9aa71a48c7c2b65af0e368
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-11 21:52:21 +00:00
Treehugger Robot
66b010f2cf
Merge "make: fix memory leak"
2022-07-11 21:09:58 +00:00
Treehugger Robot
98a5ec70cc
[automerger skipped] Merge "Revert "Revert "Target dist files not dist goals.""" am: 5eacd4a7f1
am: bfdcb63358
-s ours am: 71fc5b4865
-s ours am: 4c3ceffcea
-s ours
...
am skip reason: Merged-In I9fbcb07acfa7b14a140563cb031374160b6b23c2 with SHA-1 5a4fe7aa62
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2132647
Change-Id: Iba8df00805d91f8d65a94e10b1ab1cff85591cd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-11 20:20:20 +00:00
Treehugger Robot
4c3ceffcea
[automerger skipped] Merge "Revert "Revert "Target dist files not dist goals.""" am: 5eacd4a7f1
am: bfdcb63358
-s ours am: 71fc5b4865
-s ours
...
am skip reason: Merged-In I9fbcb07acfa7b14a140563cb031374160b6b23c2 with SHA-1 5a4fe7aa62
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2132647
Change-Id: I8b6ebc46928d3cd5550f5b92c9b28ce2e496e76e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-11 20:02:24 +00:00
Treehugger Robot
71fc5b4865
[automerger skipped] Merge "Revert "Revert "Target dist files not dist goals.""" am: 5eacd4a7f1
am: bfdcb63358
-s ours
...
am skip reason: Merged-In I9fbcb07acfa7b14a140563cb031374160b6b23c2 with SHA-1 5a4fe7aa62
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2132647
Change-Id: I12a49ae762479358168a2790c12448ef39671dfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-11 19:44:47 +00:00
Treehugger Robot
bfdcb63358
Merge "Revert "Revert "Target dist files not dist goals.""" am: 5eacd4a7f1
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2132647
Change-Id: I6330f9f094e7f21491f0bceb45bad018e8d64b1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-11 19:27:54 +00:00
Treehugger Robot
5eacd4a7f1
Merge "Revert "Revert "Target dist files not dist goals."""
2022-07-11 18:14:39 +00:00
Android Build Coastguard Worker
ea74f3753f
Version bump to TP1A.220624.013 [core/build_id.mk]
...
Change-Id: Ie16b441e03a031121fa6e3b1621a2c76ba8f4bb7
2022-07-09 21:53:22 +00:00
Android Build Coastguard Worker
d08025e143
Version bump to TP1A.220624.012 [core/build_id.mk]
...
Change-Id: Idfcc0649c498111bba9259ce76fafb9acfca585c
2022-07-09 07:37:45 +00:00
Bill Yi
365f7f0688
[automerger skipped] Merge "Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE" am: 13b4951c71
-s ours am: c64fc5b26b
-s ours am: b54e52a73c
-s ours am: 506771b3a0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/build/+/2147444
Change-Id: Ib0bab1d42bf85c412a3118af2298bf22c15bec11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-08 21:57:53 +00:00
Bill Yi
9b3443ca56
[automerger skipped] Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE am: f104ed681e
-s ours am: e93e967761
-s ours am: 31b6677cb8
-s ours am: 7978db625f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/build/+/2147444
Change-Id: I29e63a18c4bc0048d7c80af1919cf9113d26a10a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-08 21:57:35 +00:00
Bill Yi
506771b3a0
[automerger skipped] Merge "Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE" am: 13b4951c71
-s ours am: c64fc5b26b
-s ours am: b54e52a73c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/build/+/2147444
Change-Id: Iab44dc32f8b4f78c359b1dc69c921d7918aaacbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-08 21:34:42 +00:00