Commit Graph

30687 Commits

Author SHA1 Message Date
Nikita Dubrovsky
0eac02491d Merge "Update ReceiveContentDemo to follow the API docs for URI permissions" into sc-dev 2021-05-22 05:06:06 +00:00
Nikita Dubrovsky
522bfd9e79 Update ReceiveContentDemo to follow the API docs for URI permissions
Bug: 186122267
Test: Manual
Change-Id: I2720a5856222220849502ccc017a9c8c22f23fd4
2021-05-19 22:30:25 -07:00
Roland Levillain
a9018531f6 Merge "Fix adb root invocations in script acov-llvm.py." am: 97988980d0 am: a0c4af18c3 am: f6fc60c2be
Original change: https://android-review.googlesource.com/c/platform/development/+/1706846

Change-Id: I3cc40f2ae2fb5ef158361036b2a11a6dfc99248c
2021-05-14 18:19:45 +00:00
Roland Levillain
f6fc60c2be Merge "Fix adb root invocations in script acov-llvm.py." am: 97988980d0 am: a0c4af18c3
Original change: https://android-review.googlesource.com/c/platform/development/+/1706846

Change-Id: I74cb744717d5ce2b4306345fd1e6249b15c1fa76
2021-05-14 17:49:55 +00:00
Roland Levillain
a0c4af18c3 Merge "Fix adb root invocations in script acov-llvm.py." am: 97988980d0
Original change: https://android-review.googlesource.com/c/platform/development/+/1706846

Change-Id: I980c026ce0d0b0ee5133ff32b61e0b3e72eeba7f
2021-05-14 17:19:06 +00:00
Roland Levillain
97988980d0 Merge "Fix adb root invocations in script acov-llvm.py." 2021-05-14 16:35:08 +00:00
Treehugger Robot
c8401b6819 Merge "Add support for vndk llndk libraries in Android.bp" am: f205499be8 am: 9b98a3668c am: 7f9d3ffd32
Original change: https://android-review.googlesource.com/c/platform/development/+/1706410

Change-Id: I03bd385a47d52f7202b33424816bc90bcf81bd1f
2021-05-14 10:06:17 +00:00
Treehugger Robot
7f9d3ffd32 Merge "Add support for vndk llndk libraries in Android.bp" am: f205499be8 am: 9b98a3668c
Original change: https://android-review.googlesource.com/c/platform/development/+/1706410

Change-Id: Id71d7cee80d81539a5a41e76c625ea5498a0d942
2021-05-14 09:36:41 +00:00
Treehugger Robot
9b98a3668c Merge "Add support for vndk llndk libraries in Android.bp" am: f205499be8
Original change: https://android-review.googlesource.com/c/platform/development/+/1706410

Change-Id: Ia3c4388f6e2c26885197611b737fa5fdb4946ae5
2021-05-14 08:42:31 +00:00
Treehugger Robot
f205499be8 Merge "Add support for vndk llndk libraries in Android.bp" 2021-05-14 07:55:48 +00:00
Bill Peckham
dba5e0f214 Add support for vndk llndk libraries in Android.bp
Now that the vndk includes llndk libraries, we must also create the
modules for them in the generated Android.bp files.
llndk must not define `vndk.enabled: true` and will not be included
vndk apexes.
No changes on vndk v30 and earlier snapshot versions.

Bug: 187963715
Bug: 181815415
Test: python3 development/vndk/snapshot/update.py --use-current-branch --local <dir> <ver>
Change-Id: Ic33d169cc089199e5a742990f6ecfb08c1858288
2021-05-14 11:53:05 +09:00
Roland Levillain
d203b9e692 Fix adb root invocations in script acov-llvm.py.
Test: acov-llvm.py clean-device
Bug: 160401633
Change-Id: Ie41e13a7ab81994b8fed91ac07e32c6b90b91e74
2021-05-13 16:20:54 +01:00
Hongwei Wang
d1cc26450c Fix flicker in ApiDemos when auto enter PiP from landscape
Video: http://recall/-/aaaaaabFQoRHlzixHdtY/cNwi8qI0qukRlaIwutzclD
Bug: 179720719
Test: auto enter PiP from landscape using ApiDemos app, see video
Change-Id: Ic421b3766fbc15bf699885863710a14c3178867f
2021-05-12 19:39:23 -07:00
Treehugger Robot
a7556ccb2a [automerger skipped] Merge "Add <uses-library> information." am: 37f061b11a am: 4cece5365b am: f75d86ae54 -s ours
am skip reason: Merged-In Ie5e36dd60040a1e7653acdf882e006de513f5367 with SHA-1 247d38afd5 is already in history

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

Change-Id: I12ec6b1b4d8e0b8ab901ddd3502b678d4a2e0be4
2021-05-11 17:34:33 +00:00
Treehugger Robot
f75d86ae54 Merge "Add <uses-library> information." am: 37f061b11a am: 4cece5365b
Original change: https://android-review.googlesource.com/c/platform/development/+/1701947

Change-Id: I845495305f3e66c5ccb4d3848bd14d87ade6fea1
2021-05-11 17:11:33 +00:00
Treehugger Robot
4cece5365b Merge "Add <uses-library> information." am: 37f061b11a
Original change: https://android-review.googlesource.com/c/platform/development/+/1701947

Change-Id: Iac3d56f6844ce04e5e7d3bf7058e5073eab18e67
2021-05-11 16:51:13 +00:00
Treehugger Robot
37f061b11a Merge "Add <uses-library> information." 2021-05-11 16:06:39 +00:00
Ulya Trafimovich
bca9632895 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
Merged-In: Ie5e36dd60040a1e7653acdf882e006de513f5367
(cherry picked from commit 247d38afd5)
2021-05-11 14:27:46 +01:00
Treehugger Robot
876a1b7826 Merge "monkey: Use java_binary" am: 4b4bf9f755 am: 914371f674 am: bd944df7b4
Original change: https://android-review.googlesource.com/c/platform/development/+/1699169

Change-Id: If62276c4a0d909b0101002b703ac273998d340dd
2021-05-09 02:46:47 +00:00
Treehugger Robot
bd944df7b4 Merge "monkey: Use java_binary" am: 4b4bf9f755 am: 914371f674
Original change: https://android-review.googlesource.com/c/platform/development/+/1699169

Change-Id: Id9c03a3ccf560d80255c76a7272db73683533558
2021-05-09 02:17:18 +00:00
Treehugger Robot
914371f674 Merge "monkey: Use java_binary" am: 4b4bf9f755
Original change: https://android-review.googlesource.com/c/platform/development/+/1699169

Change-Id: I6c89aa3fde6ae33f9005ba8a96c2c0945c9720bb
2021-05-09 01:59:56 +00:00
Treehugger Robot
4b4bf9f755 Merge "monkey: Use java_binary" 2021-05-09 01:42:11 +00:00
Luca Stefani
5f4839eb99 monkey: Use java_binary
* cc_prebuilt_binary triggers strip and fails

* Currently it's only printing to stdout but
  it may later on be a build failure

Change-Id: I6a6751a7c9abad8ef76b531f9c0dc38cb0c12689
2021-05-08 11:27:44 +02: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
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
1d6a084cc9 Merge "5/ Show Flicker properties on Winscope (WM)" into sc-dev 2021-05-05 17:51:20 +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
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
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
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
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