platform_tools_base, branch studio-master-dev Unnamed repository; edit this file 'description' to name the repository. Merge cherrypicks of [12986203, 12985811] into studio-4.1-release 2020-11-04T15:22:52+00:00 android-build-team Robot android-build-team-robot@google.com 2020-11-04T15:22:52+00:00 4f3dd083ac399c045e774282cfe1f48e6e16f239 Change-Id: If35f32983cf3f28f747a15248e962e61d043bbf9 
Change-Id: If35f32983cf3f28f747a15248e962e61d043bbf9
Fix unit tests when disabling library resources 2020-11-04T15:22:36+00:00 Chris Warrington cmw@google.com 2020-10-30T15:28:27+00:00 216d5e7252168fef3d27f790b9e3bb33f6dc4c8a Fixes: 172055303 Test: Expanded DisableLibraryResourcesTest Change-Id: Ic40bfb328fe9c37b5ce9acc127c4076ce6c17ea6 (cherry picked from commit 211817601659bdb56d3ce65a61a1c2164be650b6) 
Fixes: 172055303
Test: Expanded DisableLibraryResourcesTest
Change-Id: Ic40bfb328fe9c37b5ce9acc127c4076ce6c17ea6
(cherry picked from commit 211817601659bdb56d3ce65a61a1c2164be650b6)
Merge cherrypicks of [12960543, 12960557] into studio-4.1-release 2020-10-31T00:01:10+00:00 android-build-team Robot android-build-team-robot@google.com 2020-10-31T00:01:10+00:00 e647036b895a4765859d926f5f072bbc5cf0a2eb Change-Id: I6a854f408c339da24aa9b15e67fe861461840df6 
Change-Id: I6a854f408c339da24aa9b15e67fe861461840df6
Fix NPE when processing native source files 2020-10-31T00:01:04+00:00 Tianyu Geng tgeng@google.com 2020-10-30T17:30:32+00:00 bf2841e667c8f16ca387097e9ab252c03eb3281a Bug: 171300770 Test: N/A Change-Id: I8c9eef697b97920de62173038e80e81e9d7449a1 (cherry picked from commit a90982d90dfb40a62aca4abfbf74d38442c8ac1b) 
Bug: 171300770
Test: N/A
Change-Id: I8c9eef697b97920de62173038e80e81e9d7449a1
(cherry picked from commit a90982d90dfb40a62aca4abfbf74d38442c8ac1b)
Merge cherrypicks of [12957604] into studio-4.1-release 2020-10-30T17:52:38+00:00 android-build-team Robot android-build-team-robot@google.com 2020-10-30T17:52:38+00:00 466c5e19fb4fdf950eae4914556f109dc22b462a Change-Id: I957eb7f1b4b6c27d9fac4f50dcde9c6c3828f244 
Change-Id: I957eb7f1b4b6c27d9fac4f50dcde9c6c3828f244
Avoid DEX-specific options when running R8 on libaries 2020-10-30T17:52:35+00:00 Ivan Gavrilovic gavra@google.com 2020-10-30T10:47:12+00:00 0d60339246ffb71129c2deebe0623aaffe149a28 When running R8 on library projects we should avoid passing DEX-specific options like main dex list or core library desugaring as these are applicable only when building DEX. Bug: 171364505 Test: MinifyLibTest Change-Id: Ifd6198002b525eeecb281f1245d6fc263715ac11 (cherry picked from commit 8166c944221cc273cd63fb08a4f1dc6bf18e6725) (cherry picked from commit 214f06f3bd4c319d02c403b8c23fac614f84b06d) 
When running R8 on library projects we should avoid passing
DEX-specific options like main dex list or core library desugaring
as these are applicable only when building DEX.

Bug: 171364505
Test: MinifyLibTest
Change-Id: Ifd6198002b525eeecb281f1245d6fc263715ac11
(cherry picked from commit 8166c944221cc273cd63fb08a4f1dc6bf18e6725)
(cherry picked from commit 214f06f3bd4c319d02c403b8c23fac614f84b06d)
Merge cherrypicks of [12922839] into studio-4.1-release 2020-10-26T20:12:50+00:00 android-build-team Robot android-build-team-robot@google.com 2020-10-26T20:12:50+00:00 9c5350de24bf3440b998969d003d7bdbef9b1054 Change-Id: I2dd192b482a17d16c69b04bb7c1e134b23218ade 
Change-Id: I2dd192b482a17d16c69b04bb7c1e134b23218ade
Changing ADB checkAdbVersion timeout to 20s instead of 50m 2020-10-26T20:12:44+00:00 Chester Hsieh dunno@google.com 2020-10-22T16:25:44+00:00 a263c3b30cd22d157a7559c2c64672cb200752c8 In rare occasions where ADB fails to complete a version check, it could lead to a deadlock in the UI thread. This change mitigates this rare issue by reducing the timeout from 50 minutes to 20 seconds. Bug: 166546817 Test: followup in full fix Change-Id: I544af4cd2f622365e14f69f26190dc9ac4175bb2 (cherry picked from commit 45883b70c5c98e1e1b61331a4ad9f40a6bce1c4e) (cherry picked from commit 14e1e26640e567b7ed19c27835a3c79ccc0c55bb) 
In rare occasions where ADB fails to complete a version check, it could
lead to a deadlock in the UI thread. This change mitigates this rare
issue by reducing the timeout from 50 minutes to 20 seconds.

Bug: 166546817
Test: followup in full fix
Change-Id: I544af4cd2f622365e14f69f26190dc9ac4175bb2
(cherry picked from commit 45883b70c5c98e1e1b61331a4ad9f40a6bce1c4e)
(cherry picked from commit 14e1e26640e567b7ed19c27835a3c79ccc0c55bb)
Snap for 6926539 from 25c023cba1778e96a89c78dd055abcb3684e8321 to studio-4.1-release 2020-10-23T18:19:53+00:00 android-build-team Robot android-build-team-robot@google.com 2020-10-23T18:19:53+00:00 e97ea22b390f646e346d50f0035010dfe75d17ac Change-Id: Ie4f13002b61c681fc9889876ee3981ef0971fe0d 
Change-Id: Ie4f13002b61c681fc9889876ee3981ef0971fe0d
Fix resource shrinking in libraries 2020-10-23T11:37:20+00:00 Chris Warrington cmw@google.com 2020-10-21T14:40:23+00:00 25c023cba1778e96a89c78dd055abcb3684e8321 R class fields were being inlined. Going forward, we should treat the R class not as a program class, but for now this small fix works. Fixes: 170922353 Test: Added new Android Gradle Plugin integration test ShrinkLibraryRClassTest Change-Id: I1d084b4d96fe7c78f19e1158eab7f5f3e7c6e021 
R class fields were being inlined.

Going forward, we should treat the R class not as a program class,
but for now this small fix works.

Fixes: 170922353
Test: Added new Android Gradle Plugin integration test ShrinkLibraryRClassTest
Change-Id: I1d084b4d96fe7c78f19e1158eab7f5f3e7c6e021