Commit Graph

1074 Commits

Author SHA1 Message Date
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
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
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
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
John Reck
4bcc7282bd Merge "Simplify catapult build" am: 361fa3a8cb
am: 898d8ad498

Change-Id: Iaac09954e3123db7648022add74f9b663bb22ec9
2016-10-21 01:04:31 +00:00
John Reck
898d8ad498 Merge "Simplify catapult build"
am: 361fa3a8cb

Change-Id: I306659ddf2cb3217f273df347c4bf37ffcca5be9
2016-10-21 00:56:01 +00:00
John Reck
4fa3377eab Simplify catapult build
Test: manual, built & ran sdk systrace
Change-Id: I5a5dd840d9bec3a892fdb735f902bb315205f426
2016-10-20 15:41:12 -07:00
Trevor Johns
6b945e5cc6 docs: Add new samples for N MR1 am: 0af1e772c4 am: 2b4561c639 am: fb01ea0180
am: 969d9efc63

Change-Id: I03ae89253e88d8c5f37a07219fe6fa205a641ab5
2016-10-18 17:13:49 +00:00
Trevor Johns
fb01ea0180 docs: Add new samples for N MR1 am: 0af1e772c4
am: 2b4561c639

Change-Id: I9fd2e353866986677a9724931196820afabd6dc2
2016-10-18 17:00:31 +00:00
Trevor Johns
2b4561c639 docs: Add new samples for N MR1
am: 0af1e772c4

Change-Id: Ifb45550dc950204362d88e31901243ddd50ba9ed
2016-10-18 16:55:33 +00:00
Trevor Johns
0af1e772c4 docs: Add new samples for N MR1
- AppShortcuts
- CommitContentSampleApp
- CommitContentSampleIME

Change-Id: I3cefc134839f944b1c0c5efc943fb779c7e7ee70
2016-10-18 03:19:42 -07:00
Trevor Johns
d26accdfec Re-add WearNotifications sample to build/sdk.atree am: ccc3c96cd4 am: bf0ff8fe8a
am: 9f7bceae20

Change-Id: Ib112fd519a74f64bc9b77da59a18a4027070c5de
2016-09-29 18:28:35 +00:00
Trevor Johns
d3835b3f8b Re-add WearNotifications sample to build/sdk.atree am: ccc3c96cd4 am: bf0ff8fe8a
am: c610246491

Change-Id: Ie7c474f75e7723b5acde7305f71800fcb87c796f
2016-09-29 18:23:40 +00:00
Trevor Johns
9f7bceae20 Re-add WearNotifications sample to build/sdk.atree am: ccc3c96cd4
am: bf0ff8fe8a

Change-Id: I7a8a50b92ab5c50e6956aa03f424fa3a437afefe
2016-09-29 18:18:41 +00:00
Trevor Johns
c610246491 Re-add WearNotifications sample to build/sdk.atree am: ccc3c96cd4
am: bf0ff8fe8a

Change-Id: I7b38c0562da06941a4011f66277ae7f56965c299
2016-09-29 18:18:40 +00:00
Trevor Johns
ccc3c96cd4 Re-add WearNotifications sample to build/sdk.atree
Change-Id: I2af96ce2015d05bb189504d944b7dd7cdcf3c065
2016-09-29 17:54:00 +00:00
Trevor Johns
bc6c39b340 Revert "Add WearNotifications sample to sdk.atree" am: e48244707b am: af01474428
am: b2ced86ed5

Change-Id: I94b896ecec79020587203173a00b3195e905a80f
2016-09-29 16:25:20 +00:00
Trevor Johns
2bc3a93371 Revert "Add WearNotifications sample to sdk.atree" am: e48244707b am: af01474428
am: 45fad88225

Change-Id: Id424778fa4c74566516998fd3c94b12bf3108cac
2016-09-29 16:25:17 +00:00
Trevor Johns
b2ced86ed5 Revert "Add WearNotifications sample to sdk.atree" am: e48244707b
am: af01474428

Change-Id: Idd6e0c61ae75e542411e9fbcb0a1173a26416eae
2016-09-29 16:20:50 +00:00
Trevor Johns
45fad88225 Revert "Add WearNotifications sample to sdk.atree" am: e48244707b
am: af01474428

Change-Id: Ic85dea9aaaf4a561b5b7976c5804988a8fcb86c2
2016-09-29 16:20:49 +00:00
Trevor Johns
e48244707b Revert "Add WearNotifications sample to sdk.atree"
This reverts commit f765bdac59.

Change-Id: I59294be08998e945eec99c549ac45a70feef0d04
(cherry picked from commit 8b0e298179)
2016-09-29 16:09:44 +00:00
Trevor Johns
46119e2a2a Add WearNotifications sample to sdk.atree am: f765bdac59 am: ae8eec3f19 am: c407cfe212 am: f48e6ce63a am: af4e7ac1f9
am: b0e713bd13

Change-Id: Ia03906e68c80abb9267b99f6dbbb243de2dd323c
2016-09-29 06:21:43 +00:00
Trevor Johns
a063b5a977 Add WearNotifications sample to sdk.atree am: f765bdac59 am: ae8eec3f19 am: c407cfe212 am: f48e6ce63a am: af4e7ac1f9
am: 55270a9ba5

Change-Id: I441af3d86f7189d743af8c293b4d345a613413a2
2016-09-29 06:17:09 +00:00
Trevor Johns
b0e713bd13 Add WearNotifications sample to sdk.atree am: f765bdac59 am: ae8eec3f19 am: c407cfe212 am: f48e6ce63a
am: af4e7ac1f9

Change-Id: Ic8960fb3ff1647f5c8256a6a04df354a16221471
2016-09-29 06:13:10 +00:00
Trevor Johns
55270a9ba5 Add WearNotifications sample to sdk.atree am: f765bdac59 am: ae8eec3f19 am: c407cfe212 am: f48e6ce63a
am: af4e7ac1f9

Change-Id: I7a890eb2bad9abcee05c5cb54062d301d967a044
2016-09-29 06:13:10 +00:00
Trevor Johns
f48e6ce63a Add WearNotifications sample to sdk.atree am: f765bdac59 am: ae8eec3f19
am: c407cfe212

Change-Id: Ib4fa3b88e0f7275ea7387e13a98725e0430fb5b8
2016-09-29 06:04:40 +00:00
Trevor Johns
f765bdac59 Add WearNotifications sample to sdk.atree
Change-Id: Ic8148afcbc842478624eefc4a414e7a18a6f5a93
2016-09-29 05:18:07 +00:00
Alan Viverette
a20f499a98 Add transition and documents-archive to SDK artifacts am: b7d2614488
am: b0cefe8b9d

Change-Id: Ia5ab4b19023a323c4015f3180e905cb0e1b72adc
2016-09-23 17:51:01 +00:00
Alan Viverette
703cb89fc7 Include android-support-transition library in SDK build am: 52d949c7e8
am: 9ae0c8a436

Change-Id: Ia1791aa02b981dc4c42c35705118905ee0c8fecd
2016-09-22 20:09:07 +00:00
Alan Viverette
b7d2614488 Add transition and documents-archive to SDK artifacts
Bug: 31645726
Test: built the SDK
Change-Id: Iced7fb726ae7ae947de8c860cd47e35639c27978
2016-09-22 15:52:32 -04:00
Alan Viverette
52d949c7e8 Include android-support-transition library in SDK build
Also sorts the list of libraries so that it's easier to see when things
are missing.

Bug: 31645726
Test: built the SDK, verified build artifacts
Change-Id: Ic52e0fd6362087eb4653baf9137ff09b9945d994
2016-09-22 11:18:17 -04:00
Chris Craik
8ff2eeaf8f Support new Systrace dependencies am: 3f1248ae57
am: c469505e8a

Change-Id: I51261f6d1b96582c85f571faaff5a8f3265a6abe
2016-09-19 17:42:40 +00:00
Chris Craik
c469505e8a Support new Systrace dependencies
am: 3f1248ae57

Change-Id: I7f8aaf5b9135fd8dc1518a3d2b663937495059b6
2016-09-19 17:39:40 +00:00
Chris Craik
8c856b732d Support new Systrace dependencies
bug:31252260
bug:31335915
bug:31340203

Change-Id: Ibc315a99bd1c44fe232fdf84836d9305d61a46f3
2016-09-19 10:38:31 -07:00
Chris Craik
2fae223cc6 Merge "Support new Systrace dependencies" into nyc-mr1-dev 2016-09-19 17:33:56 +00:00
Chris Craik
3f1248ae57 Support new Systrace dependencies
bug:31335915
bug:31340203
bug:31551133

Change-Id: Ibc315a99bd1c44fe232fdf84836d9305d61a46f3
2016-09-16 15:35:15 -07:00
Justin Klaassen
af14f03f61 Exclude samples directories am: e44c67ce7b
am: 37f5a04ac4

Change-Id: I8d438c9762176fd4d9cf8e633e2ad62a91fa3f05
2016-09-16 00:40:50 +00:00
Paul Duffin
4e1d395dbc Merge "Remove hard coding of ascii encoding when compiling SDK stubs" am: 00bc4acbd9 am: d6e5737905
am: e0482caf78

Change-Id: Ia90d94a662ac3f3523b63fe8fea89d0c7d368350
2016-09-08 09:20:00 +00:00
Paul Duffin
961e401463 Remove hard coding of ascii encoding when compiling SDK stubs
Hard coding the compiler to treat the Java files as if they
were ASCII is inconsistent with how Java is compiled everywhere
else in the Android build. This causes problems with the upgrade
to ICU 58 which adds copyright symbols in UTF-8 encoding in its
copyright comments.

This change has no discernable effect on the SDK generated from
the existing Java code.

Bug: 31328818
Test: Built the SDK with and without and compared the two.
Change-Id: Ied5ba2fa98e1e0ca6c265ba353b4091892170541
2016-09-07 11:31:21 +01:00
Justin Klaassen
e44c67ce7b Exclude samples directories
Bug: 31202928
Test: Manually verified that sample sources are no longer included.
Change-Id: I28b2b4e4fc57c0f6e787c5b840f3cff03ee543e7
2016-08-31 17:42:17 -07:00
Chris Craik
1dd320ea93 resolve merge conflicts of 3189854 to stage-aosp-master
Change-Id: Ia445d8ecf85ce655862194a21b322457c38471ee
2016-08-23 10:24:46 -07:00
Chris Craik
c5daf027e5 Support new Systrace dependencies
bug:30953297

Also works around leading underscore exclusion behavior by permitting
double underscore files.

Change-Id: I4c8b596da4eed7366b8c0302840281d2f94291b6
2016-08-22 16:52:54 -07:00
Chris Craik
80692e0dc2 Support new Systrace dependencies am: 1073602ff2
am: b367658274

Change-Id: I8edcfcb4bb9621e679f24b6d5316b9b2a65fed17
2016-08-22 23:02:48 +00:00
Chris Craik
1073602ff2 Support new Systrace dependencies
bug:30953297

Also works around leading underscore exclusion behavior by permitting
double underscore files.

Change-Id: I4c8b596da4eed7366b8c0302840281d2f94291b6
2016-08-19 17:58:32 -07:00
Justin Klaassen
87519d1924 Properly exclude hosttests/tools/tests directories am: 631a75eb58
am: 110c28934b

Change-Id: Ic39e5a562fecd68c53393ef63468b407d7b808a6
2016-08-16 23:47:21 +00:00
Justin Klaassen
631a75eb58 Properly exclude hosttests/tools/tests directories
There was a typo that resulted in the ignored directory names being
concatenated rather than included individually in the list. This caused
us to unintentionally publish the "wrong" sources for all releases
since Mar 23, 2012.

Bug: 30798902
Change-Id: I51e3ad48c4487374fe5614d074c1c0f091d430e0
(cherry picked from commit 31dde68d9c361dbdbe9092918f8224da2471b576)
2016-08-16 18:43:37 +00:00
Kirill Grouchnikov
cbf74ef1a7 Point SDK to the split v4 sources
am: 79857cf8a0

Change-Id: Ic7d08c3aa0b3e91400fdef26fc7c8287a2b21516
2016-07-18 21:37:11 +00:00
Kirill Grouchnikov
79857cf8a0 Point SDK to the split v4 sources
Change-Id: I36248c78d1132dd7fdbdc1e1c6c60ce03c2e92d1
(cherry picked from commit 7fd29c5b7744922514b9b10cdc9fd8c1c5271d2f)
2016-07-18 21:16:36 +00:00