Commit Graph

30758 Commits

Author SHA1 Message Date
Xin Li
89f9a35d58 [automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." am: d63133de19 -s ours am: a5a45097ac -s ours am: cd8b551fa3 -s ours am: 6b0eccddcc -s ours
am skip reason: Merged-In I9287610ee2ccfec165b0a0bc2e3b24e0eb84ca31 with SHA-1 beb6fb7493 is already in history

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

Change-Id: I6c292a03b2d48912ba5ea1deb43f8e020170dd65
2021-05-11 14:53:55 +00:00
Xin Li
6b0eccddcc [automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." am: d63133de19 -s ours am: a5a45097ac -s ours am: cd8b551fa3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I857476e7dcefe71e430e282a75fd5ec67f4dbda1
2021-05-08 02:37:04 +00:00
Xin Li
cd8b551fa3 [automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." am: d63133de19 -s ours am: a5a45097ac -s ours
am skip reason: Merged-In I9287610ee2ccfec165b0a0bc2e3b24e0eb84ca31 with SHA-1 beb6fb7493 is already in history

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

Change-Id: I5e1a3d6ed6e5d9e3f393270e2851d14ddfcb7b3e
2021-05-08 02:13:46 +00:00
Xin Li
a5a45097ac [automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." am: d63133de19 -s ours
am skip reason: Merged-In I9287610ee2ccfec165b0a0bc2e3b24e0eb84ca31 with SHA-1 beb6fb7493 is already in history

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

Change-Id: I062c0ffda214333e3d4f22dafb7e6a85a66b0200
2021-05-08 01:48:53 +00:00
Xin Li
d63133de19 Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." 2021-05-08 01:28:19 +00:00
Xin Li
170ddc54a7 DO NOT MERGE - Mark RQ2A.210105.001 as merged.
Bug: 180401296
Merged-In: I9287610ee2ccfec165b0a0bc2e3b24e0eb84ca31
Change-Id: I22813c0292bbf0ed2dcb09d17950c7615884bbaf
2021-05-07 14:32:24 -07:00
Ulya Trafimovich
5679b0edff Add <uses-library> information. am: 247d38afd5
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/14468789

Change-Id: Ie34412f1e99df0879e237c68a8910d0d6dd38a57
2021-05-07 16:57:03 +00:00
Ulya Trafimovich
247d38afd5 Add <uses-library> information.
LOCAL_USES_LIBRARIES / LOCAL_OPTIONAL_USES_LIBRARIES should be added to
the app's Android.mk module and should match <uses-library> tags in the
app's manifest, so that the build knows about these libraries and
generates correct class loader context for dexpreopt.

Bug: 132357300
Test: m out/target/common/obj/APPS/Development_intermediates/enforce_uses_libraries.status
Change-Id: Ie5e36dd60040a1e7653acdf882e006de513f5367
2021-05-07 16:13:45 +01:00
Nataniel Borges
ebb993aa97 Merge "5/ Show Flicker properties on Winscope (WM)" into sc-dev am: 1d6a084cc9
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/14294778

Change-Id: I47d6380e68c2609bbae19c6c58689a3bba8ce095
2021-05-05 18:12:52 +00:00
Nataniel Borges
1d6a084cc9 Merge "5/ Show Flicker properties on Winscope (WM)" into sc-dev 2021-05-05 17:51:20 +00:00
TreeHugger Robot
d698246083 Merge "Adding singleInstancePerTask type activity in IntentPlayground" into sc-dev am: 77261d6571
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/14420656

Change-Id: I6dfd12410505d7f5dabae7d12463f332c771e70d
2021-05-04 05:59:44 +00:00
TreeHugger Robot
77261d6571 Merge "Adding singleInstancePerTask type activity in IntentPlayground" into sc-dev 2021-05-04 05:43:55 +00:00
Pirama Arumuga Nainar
dc27b620a8 Merge "Send coverage flush signal to only processes that handle signal 37." am: 4851047a4c am: 67447582a3 am: 75f50e8b02 am: fe0d4acb38
Original change: https://android-review.googlesource.com/c/platform/development/+/1691921

Change-Id: I05ea8988448cbab4e1b0b545bc41f25e65389b14
2021-05-04 05:06:06 +00:00
Pirama Arumuga Nainar
fe0d4acb38 Merge "Send coverage flush signal to only processes that handle signal 37." am: 4851047a4c am: 67447582a3 am: 75f50e8b02
Original change: https://android-review.googlesource.com/c/platform/development/+/1691921

Change-Id: Iab9cc926decdff15fc1187919f901d687e9876ce
2021-05-04 04:48:50 +00:00
Pirama Arumuga Nainar
75f50e8b02 Merge "Send coverage flush signal to only processes that handle signal 37." am: 4851047a4c am: 67447582a3
Original change: https://android-review.googlesource.com/c/platform/development/+/1691921

Change-Id: Ie78ce0805295e55fe61de741c6fc9f3265f5654a
2021-05-04 04:29:18 +00:00
Pirama Arumuga Nainar
67447582a3 Merge "Send coverage flush signal to only processes that handle signal 37." am: 4851047a4c
Original change: https://android-review.googlesource.com/c/platform/development/+/1691921

Change-Id: I07ff7d6a4d983052c4cddaa6974d5a24f268cdaa
2021-05-04 04:13:26 +00:00
Pirama Arumuga Nainar
4851047a4c Merge "Send coverage flush signal to only processes that handle signal 37." 2021-05-04 03:54:46 +00:00
Jeff Chang
193d1ded11 Adding singleInstancePerTask type activity in IntentPlayground
Bug: 187124445
Test: build
Change-Id: I684a9327267273efd7a19df0f0897e597c10543d
2021-05-04 11:38:16 +08:00
Nikita Dubrovsky
41e9588814 Merge "Update demo app for content insertion to save & display images" into sc-dev am: 7bbcbefdda
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/14390778

Change-Id: Ic3d3c39ee73d3a0e4f255bfaf6459a3432789d0d
2021-05-03 23:25:15 +00:00
Nikita Dubrovsky
7bbcbefdda Merge "Update demo app for content insertion to save & display images" into sc-dev 2021-05-03 23:09:10 +00:00
Nikita Dubrovsky
132d5ebd30 Update demo app for content insertion to save & display images
Bug: 186892438
Test: Manual
Change-Id: I8aed85cfeaabdfa5558d11822d156fb84388b1cf
2021-04-30 16:16:39 -07:00
Pirama Arumuga Nainar
beb6fb7493 Send coverage flush signal to only processes that handle signal 37.
Bug: http://b/160401633

Also:
- fix regexp to find clang prebuilt version to allow a suffix.
- call `adb root` before any operation.

Test: acov-llvm.py flush
Change-Id: I9287610ee2ccfec165b0a0bc2e3b24e0eb84ca31
2021-04-30 15:06:39 -07:00
Yuntao Xu
1b56cbe1eb Merge "Revert "Convert Development/Android.mk to Android.bp"" am: 056344fcf6 am: 8d9b8f017a am: fd54ed89ab am: c7930a90a8
Original change: https://android-review.googlesource.com/c/platform/development/+/1691914

Change-Id: I1ef70bc8221b6f3c00b81fead5c53bf1ee82f112
2021-04-30 21:12:45 +00:00
Yuntao Xu
c7930a90a8 Merge "Revert "Convert Development/Android.mk to Android.bp"" am: 056344fcf6 am: 8d9b8f017a am: fd54ed89ab
Original change: https://android-review.googlesource.com/c/platform/development/+/1691914

Change-Id: Iaab029e6b836a5e7bfcacedb37934596cc298e20
2021-04-30 20:49:29 +00:00
Yuntao Xu
fd54ed89ab Merge "Revert "Convert Development/Android.mk to Android.bp"" am: 056344fcf6 am: 8d9b8f017a
Original change: https://android-review.googlesource.com/c/platform/development/+/1691914

Change-Id: Icf463dd2214ed720d1c9eba7a8b8461a19c3659c
2021-04-30 20:31:02 +00:00
Yuntao Xu
8d9b8f017a Merge "Revert "Convert Development/Android.mk to Android.bp"" am: 056344fcf6
Original change: https://android-review.googlesource.com/c/platform/development/+/1691914

Change-Id: I4653808dcbf1701eae49c5238d746e6dd60cf4a5
2021-04-30 20:15:55 +00:00
Yuntao Xu
056344fcf6 Merge "Revert "Convert Development/Android.mk to Android.bp"" 2021-04-30 20:01:33 +00:00
Yuntao Xu
bdf46bdb5d Revert "Convert Development/Android.mk to Android.bp"
This reverts commit 5ec6ecafd8.

Reason for revert: <cause build breakage>

Change-Id: Ib761f8675b3f09a53f33b786101022de287ac4ea
2021-04-30 18:41:41 +00:00
Yuntao Xu
05072c0b13 Merge "Convert Development/Android.mk to Android.bp" am: d0e60e25c2 am: 14b78ea954 am: 9e20f8da4a am: 3a947d831d
Original change: https://android-review.googlesource.com/c/platform/development/+/1688703

Change-Id: I1787e6a33448265431f2dc4594b4b2b3bd41cf7c
2021-04-30 18:15:17 +00:00
Yuntao Xu
fe14e1e124 Merge "Convert monkey/Android.mk to Android.bp" am: e79f478e3c am: 23769afd33 am: c52930e6a0 am: c15925d160
Original change: https://android-review.googlesource.com/c/platform/development/+/1690286

Change-Id: I87f5418635302486daee10a50ee76748f28458aa
2021-04-30 18:15:11 +00:00
Yuntao Xu
20ffbe35db Merge "Convert MultiDisplay/Android.mk to Android.bp" am: 9e504cc4c5 am: 45950f4fc4 am: 7dfe30b1ae am: 59dd88d490
Original change: https://android-review.googlesource.com/c/platform/development/+/1689115

Change-Id: I15fcaadb38396ad80b3f001b205e1fb91cd3794b
2021-04-30 18:15:00 +00:00
Yuntao Xu
5cdc1d9b3d Merge "Convert Android.mk to Android.bp" am: 64b8511941 am: 880a6ba188 am: 859f63e840 am: 6d94d1116b
Original change: https://android-review.googlesource.com/c/platform/development/+/1689112

Change-Id: If95d5b2fca331786d8b4c105e6775888c3ea0476
2021-04-30 18:14:52 +00:00
Yuntao Xu
0a2f6f31e9 Merge "Convert IntentPlayground/Android.mk to Android.bp" am: e281d79cff am: c84d747f03 am: bc9b86f776 am: 8ce6b456d6
Original change: https://android-review.googlesource.com/c/platform/development/+/1691912

Change-Id: I2870b225c5fe84c7107a15b2eb536b066cef2fe6
2021-04-30 18:14:40 +00:00
Yuntao Xu
7e372e5e24 Merge "Convert ShortcutSample/Android.mk to Android.bp" am: 16d4d75ae6 am: 4472cf6306 am: 825c1c2b43 am: b0c776c35d
Original change: https://android-review.googlesource.com/c/platform/development/+/1691910

Change-Id: Ia39de4408f97e85a86428ba032b206d85d76d230
2021-04-30 18:14:11 +00:00
Yuntao Xu
3a947d831d Merge "Convert Development/Android.mk to Android.bp" am: d0e60e25c2 am: 14b78ea954 am: 9e20f8da4a
Original change: https://android-review.googlesource.com/c/platform/development/+/1688703

Change-Id: Iff74b686ec591b477fe949003f3b7bfe398576ed
2021-04-30 17:50:08 +00:00
Yuntao Xu
c15925d160 Merge "Convert monkey/Android.mk to Android.bp" am: e79f478e3c am: 23769afd33 am: c52930e6a0
Original change: https://android-review.googlesource.com/c/platform/development/+/1690286

Change-Id: I0d4097c5c650cc05383451fd5be4efe3b0ec9b5e
2021-04-30 17:50:04 +00:00
Yuntao Xu
59dd88d490 Merge "Convert MultiDisplay/Android.mk to Android.bp" am: 9e504cc4c5 am: 45950f4fc4 am: 7dfe30b1ae
Original change: https://android-review.googlesource.com/c/platform/development/+/1689115

Change-Id: I626f0bc2b8410b0276f5aa204e8b13e26c7c2236
2021-04-30 17:50:00 +00:00
Yuntao Xu
6d94d1116b Merge "Convert Android.mk to Android.bp" am: 64b8511941 am: 880a6ba188 am: 859f63e840
Original change: https://android-review.googlesource.com/c/platform/development/+/1689112

Change-Id: I713c1a354f33d6fc9e6d140d309c4b8e728c50a2
2021-04-30 17:49:56 +00:00
Yuntao Xu
8ce6b456d6 Merge "Convert IntentPlayground/Android.mk to Android.bp" am: e281d79cff am: c84d747f03 am: bc9b86f776
Original change: https://android-review.googlesource.com/c/platform/development/+/1691912

Change-Id: I5dd79d72b5f412f6c1b62e258520b20706342a0a
2021-04-30 17:49:47 +00:00
Yuntao Xu
b0c776c35d Merge "Convert ShortcutSample/Android.mk to Android.bp" am: 16d4d75ae6 am: 4472cf6306 am: 825c1c2b43
Original change: https://android-review.googlesource.com/c/platform/development/+/1691910

Change-Id: I7db13780c88857d0197d71d4d36aa2bbc9fd4910
2021-04-30 17:47:01 +00:00
Yuntao Xu
9e20f8da4a Merge "Convert Development/Android.mk to Android.bp" am: d0e60e25c2 am: 14b78ea954
Original change: https://android-review.googlesource.com/c/platform/development/+/1688703

Change-Id: I025dc6a47dc1e11e6f01f392c65b6a60b8a0734c
2021-04-30 17:30:43 +00:00
Yuntao Xu
c52930e6a0 Merge "Convert monkey/Android.mk to Android.bp" am: e79f478e3c am: 23769afd33
Original change: https://android-review.googlesource.com/c/platform/development/+/1690286

Change-Id: I972c15d4de58fb8b103eac9117ff99bc8c7c5748
2021-04-30 17:30:39 +00:00
Yuntao Xu
7dfe30b1ae Merge "Convert MultiDisplay/Android.mk to Android.bp" am: 9e504cc4c5 am: 45950f4fc4
Original change: https://android-review.googlesource.com/c/platform/development/+/1689115

Change-Id: I7a24591841b7a54d9ba967cd19452da334686b76
2021-04-30 17:30:36 +00:00
Yuntao Xu
859f63e840 Merge "Convert Android.mk to Android.bp" am: 64b8511941 am: 880a6ba188
Original change: https://android-review.googlesource.com/c/platform/development/+/1689112

Change-Id: I7d9060ed4720e77485eb1773bbfcc56cb2d782e8
2021-04-30 17:30:32 +00:00
Yuntao Xu
bc9b86f776 Merge "Convert IntentPlayground/Android.mk to Android.bp" am: e281d79cff am: c84d747f03
Original change: https://android-review.googlesource.com/c/platform/development/+/1691912

Change-Id: Id20bc821b6235f14c499ff0bc1176ee7c8ed5c13
2021-04-30 17:30:28 +00:00
Yuntao Xu
825c1c2b43 Merge "Convert ShortcutSample/Android.mk to Android.bp" am: 16d4d75ae6 am: 4472cf6306
Original change: https://android-review.googlesource.com/c/platform/development/+/1691910

Change-Id: Ic3915e4611926ebfc0c24b8d3cb15d1612642194
2021-04-30 17:30:23 +00:00
Yuntao Xu
14b78ea954 Merge "Convert Development/Android.mk to Android.bp" am: d0e60e25c2
Original change: https://android-review.googlesource.com/c/platform/development/+/1688703

Change-Id: Ie067dc83485f84653a654fa1db657ab9369e6e96
2021-04-30 17:16:56 +00:00
Yuntao Xu
23769afd33 Merge "Convert monkey/Android.mk to Android.bp" am: e79f478e3c
Original change: https://android-review.googlesource.com/c/platform/development/+/1690286

Change-Id: I77a2377912a52cb760b3d44848fb07fc4e75ad2d
2021-04-30 17:16:50 +00:00
Yuntao Xu
45950f4fc4 Merge "Convert MultiDisplay/Android.mk to Android.bp" am: 9e504cc4c5
Original change: https://android-review.googlesource.com/c/platform/development/+/1689115

Change-Id: Idf6755a90a95fb2180842da9dc704c45d8d9176a
2021-04-30 17:16:44 +00:00
Yuntao Xu
880a6ba188 Merge "Convert Android.mk to Android.bp" am: 64b8511941
Original change: https://android-review.googlesource.com/c/platform/development/+/1689112

Change-Id: I8a4c4bd0590aba47449d7c6212d2b81c086f4337
2021-04-30 17:16:38 +00:00