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
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
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
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
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
Yuntao Xu
c84d747f03
Merge "Convert IntentPlayground/Android.mk to Android.bp" am: e281d79cff
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1691912
Change-Id: I4ad58285353922b3ff13157a13334c6b2ed18ad9
2021-04-30 17:16:31 +00:00
Yuntao Xu
4472cf6306
Merge "Convert ShortcutSample/Android.mk to Android.bp" am: 16d4d75ae6
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1691910
Change-Id: I09362142f243127951682493c8ce9bf58c8eb2c7
2021-04-30 17:16:17 +00:00
Yuntao Xu
d0e60e25c2
Merge "Convert Development/Android.mk to Android.bp"
2021-04-30 17:15:35 +00:00
Yuntao Xu
e79f478e3c
Merge "Convert monkey/Android.mk to Android.bp"
2021-04-30 17:15:06 +00:00
Yuntao Xu
9e504cc4c5
Merge "Convert MultiDisplay/Android.mk to Android.bp"
2021-04-30 17:04:08 +00:00
Yuntao Xu
64b8511941
Merge "Convert Android.mk to Android.bp"
2021-04-30 17:03:49 +00:00
Yuntao Xu
e281d79cff
Merge "Convert IntentPlayground/Android.mk to Android.bp"
2021-04-30 16:58:56 +00:00
Yuntao Xu
16d4d75ae6
Merge "Convert ShortcutSample/Android.mk to Android.bp"
2021-04-30 16:55:29 +00:00
Yuntao Xu
414db426ae
Convert IntentPlayground/Android.mk to Android.bp
...
Convert the Make file to a Soong one
Bug: 186778349
Test: compared the two apk files built by Make and Soong
Test: TreeHugger
Change-Id: I92d9b412fb3c0ae85dd1a76497cb6cdb359eaae3
2021-04-29 23:41:40 -07:00
Yuntao Xu
3f434c4083
Convert ShortcutSample/Android.mk to Android.bp
...
Convert the Make file to a Soong one
Bug: 186778349
Test: compared the results built by Make and Soong
Test: TreeHugger
Change-Id: I8613fbebc139dcf0f398f048e5716f126e987707
2021-04-29 22:47:32 -07:00
Joel Galenson
6e4fbaaebc
Merge "Do not write out the --no-test-mapping option." am: cedb102822 am: 3b014257fa
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1691526
Change-Id: I2a621de7c298ebc6bb3a59ceab42c9876d7a1173
2021-04-30 00:00:55 +00:00
Joel Galenson
3b014257fa
Merge "Do not write out the --no-test-mapping option." am: cedb102822
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1691526
Change-Id: Ie0c7d08b2570a0225653c0cad63f834e965637a3
2021-04-29 23:44:33 +00:00
Joel Galenson
cedb102822
Merge "Do not write out the --no-test-mapping option."
2021-04-29 23:24:56 +00:00
Joel Galenson
367360cdaf
Do not write out the --no-test-mapping option.
...
This option is only intended to be temporary, so if it is used it
should not "propagate" itself by being added to the Android.bp header
or the config file.
Test: Do not see it in the header or config file.
Change-Id: Ibb18c76bdab26aa47b38ac75ea3c410ddc612856
2021-04-29 14:33:13 -07:00
David Srbecky
bdaf67cf23
Merge "Make the stack script python3.5 compatible." am: ec44e57e10 am: 89b2239085
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1689066
Change-Id: I09635504b6f6cfb2939ed8c30e1696895813562f
2021-04-29 17:21:57 +00:00
David Srbecky
89b2239085
Merge "Make the stack script python3.5 compatible." am: ec44e57e10
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1689066
Change-Id: I3d09ea33052c8bd149938a8ca217bcf1f8e6fc9b
2021-04-29 17:07:38 +00:00
David Srbecky
ec44e57e10
Merge "Make the stack script python3.5 compatible."
2021-04-29 16:48:07 +00:00
Yo Chiang
0ced6ab6d6
Merge "repo-review: Add a 'restore' command line option" am: 6a454c160e am: 2d4c1f67b8
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1686051
Change-Id: I4d0c0188960dc860a7fe082f7f8618affde06583
2021-04-29 05:50:30 +00:00
Yo Chiang
2d4c1f67b8
Merge "repo-review: Add a 'restore' command line option" am: 6a454c160e
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1686051
Change-Id: Ib353b7b0fc7abd191f6ca7ac957a16af2634ed04
2021-04-29 05:33:51 +00:00
Yo Chiang
6a454c160e
Merge "repo-review: Add a 'restore' command line option"
2021-04-29 05:11:23 +00:00
Yuntao Xu
f657275aa4
Convert monkey/Android.mk to Android.bp
...
Convert the Make file to a Soong one
Bug: 186677673
Test: compared the results built by Make and Soong
Test: TreeHugger
Change-Id: Ib850e78443e11ef4834e6567cd447e88627512d3
2021-04-28 17:16:23 -07:00
Yuntao Xu
5ec6ecafd8
Convert Development/Android.mk to Android.bp
...
Convert the Make file to a Soong one
Bug: 186677673
Test: compared the two apk files built by Make and Soong
Test: TreeHugger
Change-Id: I5f9580d82b392d3913bed2c4a888928292aea7ac
2021-04-28 16:30:20 -07:00
Yuntao Xu
10ed0f4b9c
Convert MultiDisplay/Android.mk to Android.bp
...
Convert the Make file to a Soong one
Bug: 186677673
Test: compared the two apk files built by Make and Soong
Test: TreeHugger
Change-Id: I8cbfa4980e3757af5a27a35c255f301b9b5b5be4
2021-04-28 15:51:52 -07:00
Yuntao Xu
8d78ee5666
Convert Android.mk to Android.bp
...
Convert the Make file to a Soong one
Bug: 186677673
Test: compared the two apk files built by Make and Soong
Test: TreeHugger
Change-Id: I4b92172ce1370aebd28c11aaeee8c75f5529a570
2021-04-28 14:58:02 -07:00
Treehugger Robot
350c24d8ed
Merge changes from topic "c2a-apex" am: 2d7bce0b3b am: f9acf16725
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1686814
Change-Id: I355401062f9428ae57e287994d660965d66eb830
2021-04-28 15:27:08 +00:00
Joel Galenson
c5c74033f2
Allow cargo2android.py to use a config file instead of command-line options. am: 0fbdafe016 am: 6c63da7a86
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1686813
Change-Id: I7d06695fc4de90ac2112ef8ad2356475a7c8a344
2021-04-28 15:27:07 +00:00
Treehugger Robot
f9acf16725
Merge changes from topic "c2a-apex" am: 2d7bce0b3b
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1686814
Change-Id: I716ef428d904edc10c63bc8d2dab3ac5377fcf01
2021-04-28 15:08:55 +00:00
Joel Galenson
6c63da7a86
Allow cargo2android.py to use a config file instead of command-line options. am: 0fbdafe016
...
Original change: https://android-review.googlesource.com/c/platform/development/+/1686813
Change-Id: I52e99dde41496cdd19fcb7a0600d114fec8b515a
2021-04-28 15:08:47 +00:00