Commit Graph

21079 Commits

Author SHA1 Message Date
Alan Viverette
c644754416 Merge "Allow passing custom checks to checkstyle" am: 32abb71122
am: d5f8802f6c

Change-Id: I4808fba588df2790379c5aab88e75675bae55db9
2016-12-05 19:41:04 +00:00
Alan Viverette
d5f8802f6c Merge "Allow passing custom checks to checkstyle"
am: 32abb71122

Change-Id: If6634fcab836edcf5f30fe5e9f0ac8f929f326ad
2016-12-05 19:38:03 +00:00
Treehugger Robot
32abb71122 Merge "Allow passing custom checks to checkstyle" 2016-12-05 19:33:18 +00:00
Alan Viverette
50fb0a915b Allow passing custom checks to checkstyle
Bug: 32998581
Change-Id: Icf349a8ff47ebc434958b872f5729b126e67bcbb
2016-12-05 12:44:23 -05:00
Yohann Roussel
32e1696537 Merge "Deliver android-support-multidex.jack in SDK" am: da07dcd7f9
am: d29421db99

Change-Id: I324b5572e68b64378ae70076258f677a64a1d0ab
2016-12-05 15:43:21 +00:00
Yohann Roussel
d29421db99 Merge "Deliver android-support-multidex.jack in SDK"
am: da07dcd7f9

Change-Id: I7e9e51ade83f3cc2b7d141a45ec1a43fac804b4e
2016-12-05 15:36:50 +00:00
Yohann Roussel
da07dcd7f9 Merge "Deliver android-support-multidex.jack in SDK" 2016-12-05 15:32:59 +00:00
Aurimas Liutikas
c114d50846 Merge "Removing pre-push.py git hook for checkstyle." am: fff72bd810
am: 3475b7f16d

Change-Id: I9428a2169d6577df820189d3233d9db90e491bf7
2016-11-30 22:15:59 +00:00
Aurimas Liutikas
3475b7f16d Merge "Removing pre-push.py git hook for checkstyle."
am: fff72bd810

Change-Id: I76b9cfe873b62836ffa059ded35045831fad3d7f
2016-11-30 22:12:31 +00:00
Aurimas Liutikas
fff72bd810 Merge "Removing pre-push.py git hook for checkstyle." 2016-11-30 22:02:31 +00:00
Yin-Chia Yeh
d7aeef17c7 Merge "Camera: update NDK LSC header" am: 6d59728432
am: bc15a9e321

Change-Id: I046afc32456c3cc4196aa2ff8bd19217b8a7be71
2016-11-30 20:10:53 +00:00
Yin-Chia Yeh
bc15a9e321 Merge "Camera: update NDK LSC header"
am: 6d59728432

Change-Id: I2a343edb2c23f9008ecc2fea18f3b229afd6df6a
2016-11-30 20:05:24 +00:00
Nasir Khan
8dc5ea8f13 Update the Notepad sample app to: 1. Show that any application state should be saved in onStop() versus onPause(). 2. Remove the deprecated methods and start using CursorLoader instead of any managedQuery. 3. Remove deprecated LiveFolders usage. am: 3468e63e12
am: ed5495cdee

Change-Id: Id3794178b8ded31df2cbb167c14224218a3b231f
2016-11-30 20:05:21 +00:00
Nasir Khan
ed5495cdee Update the Notepad sample app to: 1. Show that any application state should be saved in onStop() versus onPause(). 2. Remove the deprecated methods and start using CursorLoader instead of any managedQuery. 3. Remove deprecated LiveFolders usage.
am: 3468e63e12

Change-Id: If24749c61a5f30d47e730047a5c620fd9a7babdf
2016-11-30 20:00:20 +00:00
Yin-Chia Yeh
6d59728432 Merge "Camera: update NDK LSC header" 2016-11-30 19:56:05 +00:00
Yohann Roussel
19b848f707 Deliver android-support-multidex.jack in SDK
Bug: https://code.google.com/p/android/issues/detail?id=224026
Test: make PRODUCT-sdk-win_sdk sdk_repo
Change-Id: Iecc0f7bc5c3518d9ac81111a52f8a7b3ecbcc717
2016-11-30 20:07:04 +01:00
Paul Duffin
445c41ff48 Merge "Use junit-host instead of junit" am: 06c7276db4
am: 189889b554

Change-Id: I349a99a8499a28a28a79846f53d1562ea72cf59a
2016-11-29 11:27:37 +00:00
Paul Duffin
189889b554 Merge "Use junit-host instead of junit"
am: 06c7276db4

Change-Id: Ie24435c4ee41174c00f5af3127d81779f47b8b5d
2016-11-29 11:22:36 +00:00
Paul Duffin
06c7276db4 Merge "Use junit-host instead of junit" 2016-11-29 11:12:11 +00:00
Paul Duffin
f171d02a9b Use junit-host instead of junit
Bug: 30188076
Test: make checkbuild
Change-Id: I81cbfc9d380576442d8877b61a25c4dc5ac62205
2016-11-29 11:04:58 +00:00
Nasir Khan
3468e63e12 Update the Notepad sample app to:
1. Show that any application state should be saved in onStop() versus
   onPause().
2. Remove the deprecated methods and start using CursorLoader instead
   of any managedQuery.
3. Remove deprecated LiveFolders usage.

Change-Id: I65be6b91ee1d4d0980494fb8455ce0906691dc21
2016-11-28 15:03:26 -08:00
Andreas Gampe
c68e6f0997 Merge "SDK: Add missing tool dependencies" am: d405a14f22
am: 4e84f39c1d

Change-Id: I572a85205bd39390aa5843e7c03b41244d0f1242
2016-11-28 19:59:22 +00:00
Andreas Gampe
4e84f39c1d Merge "SDK: Add missing tool dependencies"
am: d405a14f22

Change-Id: Icf62bb83b2d666a636364b0131170e158df4b864
2016-11-28 19:54:22 +00:00
Treehugger Robot
d405a14f22 Merge "SDK: Add missing tool dependencies" 2016-11-28 19:48:09 +00:00
Aurimas Liutikas
8d7d47941d Merge "Loosen up the checks for test class paths in Checkstyle." am: 2c1ef76cc6
am: 46d5e59b93

Change-Id: I8dd9c92571c9ad919874049d1fd1e37cefe7d955
2016-11-22 23:04:39 +00:00
Aurimas Liutikas
46d5e59b93 Merge "Loosen up the checks for test class paths in Checkstyle."
am: 2c1ef76cc6

Change-Id: Ifdd5747410d850e0598ed24c71a00dfffe89c572
2016-11-22 23:02:39 +00:00
Aurimas Liutikas
2c1ef76cc6 Merge "Loosen up the checks for test class paths in Checkstyle." 2016-11-22 22:57:42 +00:00
Aurimas Liutikas
1253b5accf Loosen up the checks for test class paths in Checkstyle.
This change allows us to skip javadoc checks for such test directories:
- cts/tests/tests/
- /test/src/

Test: none
Change-Id: I6a3bedaed816a3e764ca7e66ee364cd30e16c55b
2016-11-22 14:51:02 -08:00
Aurimas Liutikas
778e216faf Merge "Reland allowing MockitoAnnotations.* as static import." am: 7a00bf40dc
am: 6db2a96c03

Change-Id: I23c40d509dd884003da989d572b8c6df928ba559
2016-11-21 17:59:04 +00:00
Aurimas Liutikas
6db2a96c03 Merge "Reland allowing MockitoAnnotations.* as static import."
am: 7a00bf40dc

Change-Id: I7596362feebd22a724449bd98ccc34f3dbfaf629
2016-11-21 17:53:34 +00:00
Aurimas Liutikas
7a00bf40dc Merge "Reland allowing MockitoAnnotations.* as static import." 2016-11-21 17:47:28 +00:00
Bill Yi
fb31ee8fef Import translations. DO NOT MERGE
am: 76179cb428  -s ours

Change-Id: I39af293d2b7d254f4884b392e25d8c1ad74ec493
2016-11-21 01:21:33 +00:00
Bill Yi
76179cb428 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 32177112
Change-Id: Ib7c37398d508c4229a582880ba0f9ede4a0b4c8f
2016-11-20 16:34:10 -08:00
Aurimas Liutikas
0f2de36ee9 Reland allowing MockitoAnnotations.* as static import.
It was originally added internally in ag/1085881, but then got
reverted via merge when android-styles.xml got split into multiple
files in r.android.com/305437

Bug: None
Test: None
Change-Id: I08bde16212c563a8d43995a97ffe47b2c43ed952
2016-11-18 17:12:12 -08:00
Aurimas Liutikas
44b6f1092b Removing pre-push.py git hook for checkstyle.
Checkstyle is now invoked using repo upload hooks and this script
is no longer needed.

Test: None
Change-Id: I2cdf38cc84c9f65efad76df1d58a5261b954fca8
2016-11-18 17:08:20 -08:00
Aurimas Liutikas
bd219c8a33 Merge "Split android-style.xml into modules for checkstyle." am: 806abc2838
am: 36feb7056c

Change-Id: I7dfb3667b3666a3a1de7beb2adf9ad0afa9cca24
2016-11-19 00:04:42 +00:00
Aurimas Liutikas
4ed3f4a726 Split android-style.xml into modules for checkstyle. am: 36824c93ee
am: 78df77ca74

Change-Id: Id4e422206cb5eeea69c2ec83dc411850391535f3
2016-11-19 00:04:30 +00:00
Aurimas Liutikas
36feb7056c Merge "Split android-style.xml into modules for checkstyle."
am: 806abc2838

Change-Id: Iaf2be8c77e370b421708d53c57706e1f92ea2147
2016-11-19 00:00:33 +00:00
Aurimas Liutikas
78df77ca74 Split android-style.xml into modules for checkstyle.
am: 36824c93ee

Change-Id: If96196352109899cbdac28952f92fb4f987d7ec5
2016-11-19 00:00:32 +00:00
Aurimas Liutikas
806abc2838 Merge "Split android-style.xml into modules for checkstyle." 2016-11-18 23:56:06 +00:00
Aurimas Liutikas
36824c93ee Split android-style.xml into modules for checkstyle.
This will allow teams to reuse parts of checkstyle without having
to worry about missing any checks when they change in the main configs.

Bug: None
Test: Tested locally and checkstyle still verifies the same rules using android-style.xml
Change-Id: I91ca11d3d7089db656bc640549bd7012284a8859
2016-11-18 15:55:15 -08:00
Andreas Gampe
23262e8f0c SDK: Add missing tool dependencies
Add dx to SDK dependencies.

Test: m
Change-Id: If5a6cddd9a72d22ecf8aca11a637fd509ac6e2c1
2016-11-17 23:08:34 -08:00
Aurimas Liutikas
ee86fb2f0e Merge "Skip all the ckecks for test data files." am: 57c81cf7ee
am: 7aad65ea43

Change-Id: Ie76df8be944248b330aeec26cd58cfc243300c6a
2016-11-10 22:12:34 +00:00
Aurimas Liutikas
7aad65ea43 Merge "Skip all the ckecks for test data files."
am: 57c81cf7ee

Change-Id: Ia440768d220f6834573c00687607001007472044
2016-11-10 22:05:49 +00:00
Aurimas Liutikas
57c81cf7ee Merge "Skip all the ckecks for test data files." 2016-11-10 21:46:19 +00:00
Aurimas Liutikas
2ae3a31c44 Skip all the ckecks for test data files.
Test: None
Change-Id: I492f1c7f97455fa08f135b375db7abb9d734c4b7
2016-11-10 13:36:31 -08:00
Dan Albert
79eab99889 Merge "Continue using the legacy zlib headers." am: f5da6805de
am: 8f773caacf

Change-Id: Iffbc608943e08751f3bd97ff9b334acf87db66e8
2016-11-08 22:58:00 +00:00
Dan Albert
8f773caacf Merge "Continue using the legacy zlib headers."
am: f5da6805de

Change-Id: I5f233f26dbfef0a1d55824d65289b4275c8512f0
2016-11-08 22:52:30 +00:00
Treehugger Robot
f5da6805de Merge "Continue using the legacy zlib headers." 2016-11-08 22:35:59 +00:00
Dan Albert
ae52e02b1b Continue using the legacy zlib headers.
Test: make native
      Built an NDK with this and used it to build ffmpeg
Bug: None

Change-Id: Ifa3f861341632ebe6fdeb76ae5e566c6b31ed988
2016-11-08 11:46:54 -08:00