Treehugger Robot
251b5098c6
Merge "Add project specific definitions.mk files" am: a0827dcb0e
am: 4b3d38658a
am: e59fce2005
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2189578
Change-Id: I1c82351d8cf3815e204a9bb40e0475c3b5ad70ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-19 17:51:00 +00:00
Treehugger Robot
e59fce2005
Merge "Add project specific definitions.mk files" am: a0827dcb0e
am: 4b3d38658a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2189578
Change-Id: I9385e4a44777e45163cb52626effc2d09d92c618
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-19 17:30:13 +00:00
Treehugger Robot
4b3d38658a
Merge "Add project specific definitions.mk files" am: a0827dcb0e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2189578
Change-Id: Icdf70fab69033d28b8ddbd98d3e64f8dba64a160
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-19 16:49:14 +00:00
Treehugger Robot
a0827dcb0e
Merge "Add project specific definitions.mk files"
2022-08-19 16:06:55 +00:00
Greg Kaiser
85518aceab
Add project specific definitions.mk files
...
Just like we do with build/tasks/*.mk, we also look for project
specific definitions.mk files.
Test: TreeHugger
Bug: 243024627
Change-Id: I7f07546582eb02bba245a1f927a11efc1ddc3c6f
2022-08-18 12:22:15 -07:00
Steven Moreland
9f9829dad8
Merge "BOARD_VNDK_VERSION always by default" am: 34570d33f4
am: 731d649089
am: 5e882374d2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2175603
Change-Id: I66a33fa2839d5eaa75d7a2b9b8b0cb4cad917f59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 20:11:14 +00:00
Steven Moreland
5e882374d2
Merge "BOARD_VNDK_VERSION always by default" am: 34570d33f4
am: 731d649089
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2175603
Change-Id: I3449c41d09be835526094ed0d0f3fbff335ad1a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 19:45:03 +00:00
Steven Moreland
731d649089
Merge "BOARD_VNDK_VERSION always by default" am: 34570d33f4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2175603
Change-Id: Idbe1186f31bccb590c195ea2525896308fe34173
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 19:25:09 +00:00
Steven Moreland
34570d33f4
Merge "BOARD_VNDK_VERSION always by default"
2022-08-17 18:43:37 +00:00
Alix Espino
1ed186aa16
Merge "Updated Changes.md on deletion of clang property" am: 065afd42e8
am: 4b1f38076d
am: fda78d0287
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2075723
Change-Id: Id195688a0d23465d4d830804245b993ba65321c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 15:17:04 +00:00
Alix Espino
fda78d0287
Merge "Updated Changes.md on deletion of clang property" am: 065afd42e8
am: 4b1f38076d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2075723
Change-Id: Ibab5402d8b11e6145091fbaa1757833061958586
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 14:49:26 +00:00
Alix Espino
4b1f38076d
Merge "Updated Changes.md on deletion of clang property" am: 065afd42e8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2075723
Change-Id: Ib95ca998b32dbac61f2f7d3814dca22db716a279
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 14:21:13 +00:00
Alix Espino
065afd42e8
Merge "Updated Changes.md on deletion of clang property"
2022-08-17 13:42:28 +00:00
Hung-Wei Chen
653425238b
Merge changes Ifbcde7da,Icee659ff,I267da2d5 am: a7dfb456a1
am: cb7c04f783
am: f44646461d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2176952
Change-Id: Ibf3d91061c5753c96fb1991a9516d025cdbfb847
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 04:25:37 +00:00
Hung-Wei Chen
f44646461d
Merge changes Ifbcde7da,Icee659ff,I267da2d5 am: a7dfb456a1
am: cb7c04f783
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2176952
Change-Id: Id90490fac6fcd6476f4e9d6d244ed40eb89a44c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 04:04:28 +00:00
Hung-Wei Chen
cb7c04f783
Merge changes Ifbcde7da,Icee659ff,I267da2d5 am: a7dfb456a1
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2176952
Change-Id: Ibb11fab6513c726a03e6053f70caac0ddc3b6404
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 03:42:07 +00:00
Hung-Wei Chen
a7dfb456a1
Merge changes Ifbcde7da,Icee659ff,I267da2d5
...
* changes:
Remove verity.mk, verity_key, PRODUCT_VERITY_SIGNING_KEY
Remove PRODUCT_SUPPORTS_VERITY(_FEC) reference
Remove BOOT_SIGNER and PRODUCT_SUPPORTS_BOOT_SIGNER
2022-08-17 03:09:20 +00:00
Treehugger Robot
cdf1a82100
Merge "Suppress R8 warnings for support library annotations" am: 2dca04c64d
am: 8c90005ff0
am: 19ca755ba3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2182775
Change-Id: I143b236a22eeb5846658df9116a1829216e07921
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 01:36:02 +00:00
Treehugger Robot
19ca755ba3
Merge "Suppress R8 warnings for support library annotations" am: 2dca04c64d
am: 8c90005ff0
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2182775
Change-Id: Icc3c7290110fadf0cbc6a6ed9850dfb7130b975d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 01:13:31 +00:00
Automerger Merge Worker
8540ce34dd
[automerger skipped] Merge changes from topic "am-96e5992b2dd4470eae48f4ad98b53c99" into stage-aosp-master am: 4cb470ffd3
-s ours am: ae538dced1
-s ours
...
am skip reason: Merged-In Id4aaefbc53b4250b7308701493d151f9408f47f1 with SHA-1 b9fdf2dc08
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2186462
Change-Id: I8f9174bfc76a1b1cd1e75c20fbf1fc28483e27fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 00:55:34 +00:00
Xin Li
857fcdcfcf
[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: c0ec8b6803
-s ours am: 17296cdcf9
-s ours am: 754f97486f
-s ours
...
am skip reason: Merged-In Id4aaefbc53b4250b7308701493d151f9408f47f1 with SHA-1 b9fdf2dc08
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2186462
Change-Id: I53145bf821d2b6e0f78bb3f2163aacd1ef6fe15d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 00:55:05 +00:00
Treehugger Robot
8c90005ff0
Merge "Suppress R8 warnings for support library annotations" am: 2dca04c64d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2182775
Change-Id: I46af002f47f8a638cc3e31601de2a922ab2a212d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 00:49:11 +00:00
Automerger Merge Worker
ae538dced1
Merge changes from topic "am-96e5992b2dd4470eae48f4ad98b53c99" into stage-aosp-master am: 4cb470ffd3
-s ours
...
am skip reason: Merged-In Id4aaefbc53b4250b7308701493d151f9408f47f1 with SHA-1 b9fdf2dc08
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2186462
Change-Id: I31a05593fb59ea47272206bfaeb636da975871e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 00:29:56 +00:00
Xin Li
754f97486f
[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: c0ec8b6803
-s ours am: 17296cdcf9
-s ours
...
am skip reason: Merged-In Id4aaefbc53b4250b7308701493d151f9408f47f1 with SHA-1 b9fdf2dc08
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2186462
Change-Id: I9b7286158e85fc39645a72a5a17ec450415e6d0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 00:29:29 +00:00
Xin Li
b1ea9fc913
[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: c0ec8b6803
-s ours am: 4ce7e8cc2b
-s ours am: 57fd933c19
-s ours
...
am skip reason: Merged-In Id4aaefbc53b4250b7308701493d151f9408f47f1 with SHA-1 b9fdf2dc08
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2186462
Change-Id: I95a653f0ceea6d4255a1020e6e87977685c2661f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 00:26:21 +00:00
Xin Li
c73d06f8bd
[automerger skipped] DO NOT MERGE - Merge Android 13 am: 789597a58b
-s ours am: fe66e04bd5
-s ours am: 3b70c87f5b
-s ours
...
am skip reason: Merged-In Id4aaefbc53b4250b7308701493d151f9408f47f1 with SHA-1 b9fdf2dc08
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2186462
Change-Id: Ifba265555f866347b01bfbb91edd48dd9d329de7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 00:25:50 +00:00
Treehugger Robot
2dca04c64d
Merge "Suppress R8 warnings for support library annotations"
2022-08-17 00:07:51 +00:00
Xin Li
57fd933c19
[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: c0ec8b6803
-s ours am: 4ce7e8cc2b
-s ours
...
am skip reason: Merged-In Id4aaefbc53b4250b7308701493d151f9408f47f1 with SHA-1 b9fdf2dc08
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2186462
Change-Id: I94f76a21a60c87bd9775a05e0421b0c4b43a3ef0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 00:00:16 +00:00
Xin Li
3b70c87f5b
[automerger skipped] DO NOT MERGE - Merge Android 13 am: 789597a58b
-s ours am: fe66e04bd5
-s ours
...
am skip reason: Merged-In Id4aaefbc53b4250b7308701493d151f9408f47f1 with SHA-1 b9fdf2dc08
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2186462
Change-Id: Ib75c85ac390903232e2148aed9408b504e6dfcb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-16 23:59:48 +00:00
Trevor Radcliffe
7eb81dc1da
Merge "Add note to Changes.md about sysprop changes" am: 061479c528
am: 7b47295468
am: 8b352a5670
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2185179
Change-Id: Ibb3f63312e2378cab1c2b1e73f34e7bddef84d9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-16 23:58:45 +00:00
Automerger Merge Worker
4cb470ffd3
Merge changes from topic "am-96e5992b2dd4470eae48f4ad98b53c99" into stage-aosp-master
...
* changes:
[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: c0ec8b6803
-s ours
[automerger skipped] DO NOT MERGE - Merge Android 13 am: 789597a58b
-s ours
2022-08-16 23:43:03 +00:00
Xin Li
17296cdcf9
[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: c0ec8b6803
-s ours
...
am skip reason: Merged-In Id4aaefbc53b4250b7308701493d151f9408f47f1 with SHA-1 b9fdf2dc08
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2186462
Change-Id: I29a77bd44d43658a4eaaa1fb2f34146d3541c29b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-16 23:40:11 +00:00
Xin Li
b083f6aac0
[automerger skipped] DO NOT MERGE - Merge Android 13 am: 789597a58b
-s ours
...
am skip reason: Merged-In Id4aaefbc53b4250b7308701493d151f9408f47f1 with SHA-1 b9fdf2dc08
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2186462
Change-Id: I5df27d30d7bedada9707b11a1514872e5f320ab0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-16 23:39:44 +00:00
Xin Li
4ce7e8cc2b
[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: c0ec8b6803
-s ours
...
am skip reason: Merged-In Id4aaefbc53b4250b7308701493d151f9408f47f1 with SHA-1 b9fdf2dc08
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2186462
Change-Id: If424953ab758e45ae82863842a9746fb0036a494
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-16 23:37:48 +00:00
Xin Li
fe66e04bd5
[automerger skipped] DO NOT MERGE - Merge Android 13 am: 789597a58b
-s ours
...
am skip reason: Merged-In Id4aaefbc53b4250b7308701493d151f9408f47f1 with SHA-1 b9fdf2dc08
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2186462
Change-Id: Ib2048aa84fc3dc4509cd5ae0c67aa956773040b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-16 23:37:18 +00:00
Trevor Radcliffe
8b352a5670
Merge "Add note to Changes.md about sysprop changes" am: 061479c528
am: 7b47295468
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2185179
Change-Id: I10e8ed31374f100576cf9472c57b78e4d24805e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-16 23:09:50 +00:00
Trevor Radcliffe
7b47295468
Merge "Add note to Changes.md about sysprop changes" am: 061479c528
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2185179
Change-Id: I91ae2a3b16cecfde30cf6ce2f3537c775da4e676
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-16 22:32:27 +00:00
Steve Berbary
04a96a4c49
Update Security String to 2022-10-05 am: 763c03967e
am: e01df6fce7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19633096
Change-Id: Ibf71e0c3d338ef8e4ee9484cd3d5da4cf381605f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-16 21:25:47 +00:00
Steve Berbary
ed5f31ba5b
Update Security String to 2022-10-05 am: 763c03967e
am: d4ef068ecb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19633096
Change-Id: I1c7182ff1a59169581b05f4562a4b642d351bb7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-16 21:25:06 +00:00
Steve Berbary
d4ef068ecb
Update Security String to 2022-10-05 am: 763c03967e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19633096
Change-Id: Ic24594f0d8bac6dfbeaa48512e13f158d886b747
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-16 21:01:57 +00:00
Steve Berbary
e01df6fce7
Update Security String to 2022-10-05 am: 763c03967e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19633096
Change-Id: Ic17372e81b55d5c345a5656e7be7f72b2cbc1242
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-16 20:59:26 +00:00
Xin Li
c0ec8b6803
Merge "DO NOT MERGE - Merge Android 13"
2022-08-16 19:08:26 +00:00
Trevor Radcliffe
061479c528
Merge "Add note to Changes.md about sysprop changes"
2022-08-16 18:26:32 +00:00
Jared Duke
3ca564b047
Suppress R8 warnings for support library annotations
...
Most of these annotations are stripped at dex compile-time, and are not
necessarily present in the generated dex library's classpath. As the
classpath is used to inform R8 about `libraryjars`, this can cause
reference failures during R8 execution when warnings are enabled.
For now, suppress the reference warnings. Unrecognized runtime-visible
annotations will still be kept, and this should unblock efforts to
re-enable R8 warnings for many platform targets. A proper solution will
be to ensure the appropriate annotation libs are fed as `-libraryjars`
to R8.
Bug: 242088131
Test: m + `optimize { ignore_warnings: false }`
Change-Id: Ie92db2a9725ff520b311c6b66a50feae79463925
2022-08-16 08:49:36 -07:00
Xin Li
789597a58b
DO NOT MERGE - Merge Android 13
...
Bug: 242648940
Merged-In: Id4aaefbc53b4250b7308701493d151f9408f47f1
Change-Id: Ibbf423b395e45fb552c9d0b993378afac28b4a25
2022-08-15 21:59:09 -07:00
Treehugger Robot
236488f3ad
Merge "Fix a bug in unsigned OTA generation" am: 2abfe5f3a3
am: 81994f0b27
am: c26da4e2d5
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2185088
Change-Id: Id6d46aabaf2393ae9ef889e0563ba2bb9694e0dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-16 04:38:48 +00:00
Steve Berbary
763c03967e
Update Security String to 2022-10-05
...
Bug: 242323332
Change-Id: If4e16c8a7ab84076c129e1a6ed1e7c31b46164db
2022-08-16 03:39:28 +00:00
Treehugger Robot
c26da4e2d5
Merge "Fix a bug in unsigned OTA generation" am: 2abfe5f3a3
am: 81994f0b27
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2185088
Change-Id: Iaeb2ed32616f2cee4a420d8478e5e62119dc1cb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-16 03:23:19 +00:00
Treehugger Robot
81994f0b27
Merge "Fix a bug in unsigned OTA generation" am: 2abfe5f3a3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2185088
Change-Id: Id6180edf4f57ccabe4ffb072a7eebaa4d6f07ccf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-16 02:55:33 +00:00
Treehugger Robot
2abfe5f3a3
Merge "Fix a bug in unsigned OTA generation"
2022-08-16 02:27:34 +00:00