History log of /development/build/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
f22b170c9c94c93488ab58ed70be0db12bc5c240 12-Jan-2017 Trevor Johns <trevorjohns@google.com> samples: Update sdk.atree for nyc-mr1-dev

Syncing with latest sample prebuilts. Renamed
ActionBarCompat-ShareActionProvider to ShareActionProvider.

Change-Id: I50e566e35a01ad82c5faa5ab112b999c8407021a
dk.atree
fb01ea01803a0dccafeb3daaa96f18ab4adbf44b 18-Oct-2016 Trevor Johns <trevorjohns@google.com> docs: Add new samples for N MR1 am: 0af1e772c4
am: 2b4561c639

Change-Id: I9fd2e353866986677a9724931196820afabd6dc2
2b4561c639f819e2694058d5775cddbbb6422605 18-Oct-2016 Trevor Johns <trevorjohns@google.com> docs: Add new samples for N MR1
am: 0af1e772c4

Change-Id: Ifb45550dc950204362d88e31901243ddd50ba9ed
0af1e772c478d145b554be76fbc00dd83548ec3b 18-Oct-2016 Trevor Johns <trevorjohns@google.com> docs: Add new samples for N MR1

- AppShortcuts
- CommitContentSampleApp
- CommitContentSampleIME

Change-Id: I3cefc134839f944b1c0c5efc943fb779c7e7ee70
dk.atree
d3835b3f8be275530ffaaa5115acc772c08bbd42 29-Sep-2016 Trevor Johns <trevorjohns@google.com> Re-add WearNotifications sample to build/sdk.atree am: ccc3c96cd4 am: bf0ff8fe8a
am: c610246491

Change-Id: Ie7c474f75e7723b5acde7305f71800fcb87c796f
c61024649112b2983778d12f0490bd60223b9a1f 29-Sep-2016 Trevor Johns <trevorjohns@google.com> Re-add WearNotifications sample to build/sdk.atree am: ccc3c96cd4
am: bf0ff8fe8a

Change-Id: I7b38c0562da06941a4011f66277ae7f56965c299
ccc3c96cd45a5dc3e777e2481e6cdc709de079e9 29-Sep-2016 Trevor Johns <trevorjohns@google.com> Re-add WearNotifications sample to build/sdk.atree

Change-Id: I2af96ce2015d05bb189504d944b7dd7cdcf3c065
dk.atree
2bc3a93371075cc5218528b19a661ef2203fa38d 29-Sep-2016 Trevor Johns <trevorjohns@google.com> Revert "Add WearNotifications sample to sdk.atree" am: e48244707b am: af01474428
am: 45fad88225

Change-Id: Id424778fa4c74566516998fd3c94b12bf3108cac
45fad88225b3d5a5874b52c29ee66cd397d3fc14 29-Sep-2016 Trevor Johns <trevorjohns@google.com> Revert "Add WearNotifications sample to sdk.atree" am: e48244707b
am: af01474428

Change-Id: Ic85dea9aaaf4a561b5b7976c5804988a8fcb86c2
e48244707bb2517fccee755d0df5285e5e43b5d2 29-Sep-2016 Trevor Johns <trevorjohns@google.com> Revert "Add WearNotifications sample to sdk.atree"

This reverts commit f765bdac593cc8602089250856e148fd0190cc71.

Change-Id: I59294be08998e945eec99c549ac45a70feef0d04
(cherry picked from commit 8b0e2981799ee0e42c61d214ae67e7fd86219528)
dk.atree
a063b5a977772dcff32d19618f2ebb52d641271e 29-Sep-2016 Trevor Johns <trevorjohns@google.com> Add WearNotifications sample to sdk.atree am: f765bdac59 am: ae8eec3f19 am: c407cfe212 am: f48e6ce63a am: af4e7ac1f9
am: 55270a9ba5

Change-Id: I441af3d86f7189d743af8c293b4d345a613413a2
55270a9ba531d7bf4b04b63167b59d995fedc981 29-Sep-2016 Trevor Johns <trevorjohns@google.com> Add WearNotifications sample to sdk.atree am: f765bdac59 am: ae8eec3f19 am: c407cfe212 am: f48e6ce63a
am: af4e7ac1f9

Change-Id: I7a890eb2bad9abcee05c5cb54062d301d967a044
f48e6ce63aa462b4ec6194d92a6006bc7d07a3e8 29-Sep-2016 Trevor Johns <trevorjohns@google.com> Add WearNotifications sample to sdk.atree am: f765bdac59 am: ae8eec3f19
am: c407cfe212

Change-Id: Ib4fa3b88e0f7275ea7387e13a98725e0430fb5b8
f765bdac593cc8602089250856e148fd0190cc71 29-Sep-2016 Trevor Johns <trevorjohns@google.com> Add WearNotifications sample to sdk.atree

Change-Id: Ic8148afcbc842478624eefc4a414e7a18a6f5a93
dk.atree
b7d26144883e5390daa99d14decc1061a5d9c042 22-Sep-2016 Alan Viverette <alanv@google.com> Add transition and documents-archive to SDK artifacts

Bug: 31645726
Test: built the SDK
Change-Id: Iced7fb726ae7ae947de8c860cd47e35639c27978
dk.atree
52d949c7e8a846633f1a4579e3b229ea44279c29 22-Sep-2016 Alan Viverette <alanv@google.com> 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
ndroid.mk
2fae223cc63c2210f7743f95d3252db45f6536bc 19-Sep-2016 Chris Craik <ccraik@google.com> Merge "Support new Systrace dependencies" into nyc-mr1-dev
3f1248ae57b43ba2da2b12332aed6654d38c49e5 17-Sep-2016 Chris Craik <ccraik@google.com> Support new Systrace dependencies

bug:31335915
bug:31340203
bug:31551133

Change-Id: Ibc315a99bd1c44fe232fdf84836d9305d61a46f3
dk.atree
e44c67ce7b57b28b93012ec202eb55dafe7ea3cd 01-Sep-2016 Justin Klaassen <justinklaassen@google.com> Exclude samples directories

Bug: 31202928
Test: Manually verified that sample sources are no longer included.
Change-Id: I28b2b4e4fc57c0f6e787c5b840f3cff03ee543e7
ools/mk_sources_zip.py
1073602ff2464ded615239aae508e377d73397de 20-Aug-2016 Chris Craik <ccraik@google.com> Support new Systrace dependencies

bug:30953297

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

Change-Id: I4c8b596da4eed7366b8c0302840281d2f94291b6
dk.atree
dk.exclude.atree
631a75eb58a2195f0fa7130b1303f1b885fc949c 11-Aug-2016 Justin Klaassen <justinklaassen@google.com> 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)
ools/mk_sources_zip.py
79857cf8a08b3000b2f76e3fcf273f3cba395f03 18-Jul-2016 Kirill Grouchnikov <kirillg@google.com> Point SDK to the split v4 sources

Change-Id: I36248c78d1132dd7fdbdc1e1c6c60ce03c2e92d1
(cherry picked from commit 7fd29c5b7744922514b9b10cdc9fd8c1c5271d2f)
dk.atree
ce69622596a4004a56ea58a2d19d84897a6d7762 02-May-2016 Kirill Grouchnikov <kirillg@google.com> Merge changes necessary to build refactored support library
ndroid.mk
7999e48357ae233969cabfd6b78fa8d688e624ab 01-Jul-2016 Alan Viverette <alanv@google.com> Remove Support*Demos directories and update sdk.atree

The nyc-support-24.1-dev branch has been successfully moved
ahead of the nyc-mr1-dev branch, so we'll need this to fix
the build.

This reverts commit 52e76badf8842e0c2c8e8145d52cc3f4d465cdd9.

Change-Id: Ib3d6cf5b52f6632854468983d0c2065b1c7e7d8b
dk.atree
52e76badf8842e0c2c8e8145d52cc3f4d465cdd9 01-Jul-2016 Alan Viverette <alanv@google.com> Revert "Remove Support*Demos directories and update sdk.atree" to fix build

Dependency has not landed in frameworks/support yet.

This reverts commit e84ef3afe8aad93285095474897fa023cac42f4b.

Change-Id: I699934121e00b785838e85984d3434ab76609783
dk.atree
e84ef3afe8aad93285095474897fa023cac42f4b 28-Jun-2016 John Reck <jreck@google.com> Remove Support*Demos directories and update sdk.atree

These have been migrated to the frameworks/support project.

Cherry-Pick of 6f266e95578c8e54ef8bec4c97cc3e3af2ba7577

Change-Id: Ice5f95b983bc6e1719cf84f4f564f3fe16af7c95
dk.atree
48e6404e402820e5468de299a6833c17ee30e057 24-May-2016 Joshua Lang <joshualang@google.com> Add arm ranchu kernels to system packages

bug: 28911268
Change-Id: I0fea8b4ef11ec6f55a190ed95f9d6a757ac757a5
(cherry picked from commit e5ab3249709214d06eb1660b67f8db6d7162bf15)
(cherry picked from commit 936ec1b9016c71c2d3feb689e38fe11018da26a1)
dk-android-armeabi-v7a.atree
dk-android-armeabi.atree
9fd4870d1481d6e1ecdefb8ea3706a2d422fc5c2 26-May-2016 Yahan Zhou <yahan@google.com> Feature control config file in system image

This CL adds feature control config file to the system image bundle.

It works with this emulator CL:

https://android-review.googlesource.com/#/c/233279/

Change-Id: I1e0f73f0dc36853d99c2408679aa6706b6489a58
(cherry picked from commit 280091d47054677b358216c8fa0cac106d42a520)
dk-android-arm64-v8a.atree
dk-android-armeabi-v7a.atree
dk-android-armeabi.atree
dk-android-mips.atree
dk-android-mips64.atree
dk-android-x86.atree
dk-android-x86_64.atree
882fd85a9bcac712e49960313b8b255b6c352123 24-May-2016 Sebastien Hertz <shertz@google.com> Add jack-jacoco-plugin.jar to build tools

Bug: 28945296

(cherry picked from commit fa52ee31da8809971d579a2bbaceed687a9f9c3a)

Change-Id: I02692a8f6495c280005130704c46f4620f1fd3e2
ndroid.mk
dk.atree
afdc158c772bf7d45b1e405a7fad39d6c3518d95 24-May-2016 Miao Wang <miaowang@google.com> Merge "[RenderScript] Move BLAS libs to a separate blas/ dir." into nyc-dev
5f0e3ac209b2e3600476c7515ef74a575d13d4ef 24-May-2016 Miao Wang <miaowang@google.com> Merge "Add x86_64 linker to Build-Tools for RenderScript." into nyc-dev
0b79118f35d0cc4464cd55605c101d37825840e0 24-May-2016 Miao Wang <miaowang@google.com> Merge "Add x86_64 RenderScript prebuilts to Build-Tools." into nyc-dev
f8efab30e60f5555f6b102a0cb74aad852af790f 23-May-2016 Miao Wang <miaowang@google.com> [RenderScript] Move BLAS libs to a separate blas/ dir.

Bug: 28861779

- Move support lib BLAS to renderscript/lib/blas/.
- Make it a optional component for the APK.

Change-Id: Id5937745642a268ae73a5a23c75657b0231626c6
dk.atree
7516c05b7685e5fb69358bf278ae807fbf087e65 09-May-2016 Miao Wang <miaowang@google.com> Add x86_64 RenderScript prebuilts to Build-Tools.

Bug: 27972043

Change-Id: Iefcb0f63e72cea0b58b21fc7b9fef8c6e7e8b70d
dk.atree
9c386f79f19d98e80944537838235c9253e6b34d 13-May-2016 Alan Viverette <alanv@google.com> Add documents-archive to list of support libraries

Bug: 28762753
Change-Id: Idb4a22c9eb3de50cc95db3b01070ec291f81f84c
ndroid.mk
b97dd87037d28082cdf550f17b7b770b95f59865 12-May-2016 Ying Wang <wangying@google.com> Delete R.class/etc. in support library jar files shipped in SDK

We need to keep the resoruce generated class files in the support
libraries' built jar files when compiling with javac,
with the introduction of LOCAL_SHARED_ANDROID_LIBRARIES support of aapt2.
We strip them when packaging up the SDK package in this change.

Bug: 28454725
Bug: 22775504
Change-Id: Id5fb30915e698887e5a8d92f26d4ac8f3159613a
ndroid.mk
a62e9d2df1a8d929da1f31a576d001c446b614d8 10-May-2016 Miao Wang <miaowang@google.com> Add x86_64 linker to Build-Tools for RenderScript.

Bug: 27972043
Change-Id: Icc4213d16f43019fe731690656c95cb5b6a74430
dk-darwin-x86.atree
dk-linux-x86.atree
dk-windows-x86.atree
7c30e934a82ab9a1095e6edc0b3df707e7edf070 20-Apr-2016 Bo Hu <bohu@google.com> Merge "Emulator: add kernel-ranchu to system-image.zip for arm64" into nyc-dev
6db71f0c8d63ad83428c6fbd53018c8903fe614e 20-Apr-2016 bohu <bohu@google.com> Emulator: add kernel-ranchu to system-image.zip for arm64

Still keep the kernel-qemu for backward compatability, for now.

bug: 28288204

Change-Id: I5a07b08b314b4e437dcbdb20f31afaf3e7dad93f
dk-android-arm64-v8a.atree
09611859c7ae4b245900ff1f27e3316f020b88c8 19-Apr-2016 Adam Lesinski <adamlesinski@google.com> Include AAPT2 in windows SDK

Bug:22775504
Change-Id: Ieb3c22e085713982975af5de6b950c676546462b
dk-windows-x86.atree
cfce74d2a336afe8b32ced924000251cc7db3400 12-Apr-2016 Trevor Johns <trevorjohns@google.com> Resolve merge conflicts of 9aa94df to nyc-dev

Change-Id: Ib0c8e823eec8036bdda59aed5ee96c8807571542
c7ba81850d2b5ce11cc7bf9481980ca2f20e37ac 06-Apr-2016 Sebastien Hertz <shertz@google.com> Merge "Add jack-jacoco-reporter.jar to build tools" into nyc-dev
3fdbc213d306c854623b986933c9e9a8fbf5bb3e 06-Apr-2016 Feng Lu <fenglu@google.com> Merge "Add Link Capacity Estimation (LCE) demo app." into nyc-dev
9aa94df6227f2349c15b054eb456261d7c36db76 06-Apr-2016 Trevor Johns <trevorjohns@google.com> Merge branch 'mnc-mr-docs' into mnc-ub-dev

Large merge to reconnect automerger for docs branch to mainline.

Issue: 28000173
Change-Id: Ie403bcaf1c148c59be3a514613f7f1605146e66a
524a11ef81d033682213aaf50a384607ff4a90a2 04-Apr-2016 Sebastien Hertz <shertz@google.com> Add jack-jacoco-reporter.jar to build tools

Bug: 27989323

(cherry picked from commit c0f1caa598c8aa4077dc350439ecfae9259c7079)

Change-Id: Iab1e4ae3283ea0a4e09536916d09f96962371cf9
ndroid.mk
dk.atree
3d6864c2cec1e9844dab0f3dd35f54318aeee276 31-Mar-2016 Chris Craik <ccraik@google.com> Update systrace capture script layout

bug:27860073

Change-Id: I0a10456578353099f33f90db5c90f7b8931d0b79
dk.atree
a442d40246b468923075db7eb4385dc6fc04a53e 10-Mar-2016 fenglu <fenglu@google.com> Add Link Capacity Estimation (LCE) demo app.

Change-Id: I42f6a4fa5c989559db75d6d658081b44f7850b7a
dk.atree
0ad0d0b279615339511af809c8cba35d9601746c 25-Mar-2016 Aurimas Liutikas <aurimas@google.com> Merge "Remove -Xlint:unchecked flag for android_system_stubs compilation." into nyc-dev
4e348921b15897f2cae7d59bd920c10d2b621475 21-Mar-2016 Yohann Roussel <yroussel@google.com> Set min api level when compiling stubs current

Bug: 27371864
Bug: 27763423

(cherry picked from commit 9120adfa4c5ff425997279ba0413ee5317000092)

Change-Id: I936d2d690960f369a23076cf46c92f772df62dcc
uild_android_stubs.mk
26707bffbfbc85ecd0d236bba45ad9a94518f29c 17-Mar-2016 Yohann Roussel <yroussel@google.com> Package Jack and Jill directly from prebuilt

Instead of taking it from out.

Bug: 27372042

(cherry picked from commit 6f5779692a37a0261f0d1e224ce3b9a1a4579751)

Change-Id: I9cc798e37655c8e86bf781c42c7b57b76070a1fd
ndroid.mk
dk.atree
7641d18a1288820a1dd94c62c843265ad57b132f 17-Mar-2016 Aurimas Liutikas <aurimas@google.com> Remove -Xlint:unchecked flag for android_system_stubs compilation.

There is not need to print out unchecked warnings when compiling system stubs.

Bug: 27148500
Change-Id: I689bf316b5167e5d4dd8523297f3fb7a95a7dd9b
uild_android_stubs.mk
7c02764a198c5c4042e39eef21295e6b263f6c6b 12-Mar-2016 Miao Wang <miaowang@google.com> [RenderScript] Use librsrt_ARCH.bc instead of libclcore.bc

Bug: 19800082

- Use librsrt_ARCH.bc for bcc-compat
- Rename librsrt_ARCH.bc to libclcore.bc when packaging BuildTools, to
maintain compatibility with old gradle-plugin.

Change-Id: I567935bd6ec8f6c3b91510b2a7db6d05ec895a92
dk.atree
355f971d42c4a997ecba3f6aef56f6e993c50d5c 11-Mar-2016 Adam Lesinski <adamlesinski@google.com> Add AAPT2 to SDK build

Change-Id: I5e4072385ad7cbf86b435571b5e6149270c5eb1e
roduct_sdk.mk
dk.atree
ools/windows_sdk.mk
67731bcc0742abe80a79206c6a9172f33711383e 10-Mar-2016 Teng-Hui Zhu <ztenghui@google.com> Add the VDC and AVDC to the SDK zip file
am: 9429d9f590

* commit '9429d9f590d413063a2b76b14b4e4c1215853b54':
Add the VDC and AVDC to the SDK zip file
9429d9f590d413063a2b76b14b4e4c1215853b54 08-Mar-2016 Teng-Hui Zhu <ztenghui@google.com> Add the VDC and AVDC to the SDK zip file

b/27522762

Change-Id: Iff9d72f6dcda57064a2310e57323ebd283b21198
ndroid.mk
dk.atree
4a3b43c4574f2fd1f61cabe12092c90b4193406e 18-Feb-2016 Tor Norbye <tnorbye@google.com> Use api-generator 25 when buiding api-versions.xml

The new api-generator prebuilt fixes a bug where adding
"implements Interface" where Interface is already implemented
by a parent class would be treated as a newly added interface
on this class in the API version the subclass added the implements
statement. (This caused LinkedHashMap to be shown as only adding
the Map interface in API 24.)

Change-Id: I8a9e3971d8be3c4af2a2f68380486e77fe828444
ndroid.mk
75b8fb738fec3fc3e740ca791c58c7c8fd8b2017 13-Feb-2016 Miao Wang <miaowang@google.com> [RenderScript] Add arm64 prebuilts to BuildTools am: 4d6b8c48b6 am: c01d0fc70e am: 356d779616
am: b82c47c128

* commit 'b82c47c1285676e6127510d9afbe593c01172cb1':
[RenderScript] Add arm64 prebuilts to BuildTools
b82c47c1285676e6127510d9afbe593c01172cb1 13-Feb-2016 Miao Wang <miaowang@google.com> [RenderScript] Add arm64 prebuilts to BuildTools am: 4d6b8c48b6 am: c01d0fc70e
am: 356d779616

* commit '356d779616784da5e0103652bb223208b1c0e0f4':
[RenderScript] Add arm64 prebuilts to BuildTools
e54bbd8e64faa4684113862e3f4bfc26523c0241 05-Feb-2016 Narayan Kamath <narayan@google.com> Include source jar for generated stubs in the SDK.

(cherry picked from commit b6e4261bc200c17986a753eb239f313e4b4ef2f8)

Change-Id: I6675d023a9270afac83e8fc1313b114b722d9712
ndroid.mk
uild_android_stubs.mk
dk.atree
a945326badde68e0c9e8ebb0ce564209bdffeda7 05-Feb-2016 Narayan Kamath <narayan@google.com> Include libcore / ojluni licensing info in stubs jar.

(cherry picked from commit d2e36837b012f7f73b1aece724a0672adfe76086)

Change-Id: I21ab7f5e9053dfce98bc4e6820aa039dbdc0e7bd
uild_android_stubs.mk
51cc7ee42e5f6679dbc62ef4203fca2c597d009c 11-Feb-2016 Chris Banes <chrisbanes@google.com> Copy res-public in AppCompat + Design lib into JAR targets
am: 6893be043e

* commit '6893be043ef4e259f751009459ffc5a7858c9458':
Copy res-public in AppCompat + Design lib into JAR targets
6893be043ef4e259f751009459ffc5a7858c9458 11-Feb-2016 Chris Banes <chrisbanes@google.com> Copy res-public in AppCompat + Design lib into JAR targets

BUG: 26297204

Change-Id: I78a6a9e2445e3693e0d9cceab7ab11a4e768cf7c
dk.atree
4d6b8c48b695b8837762c0cd69ef19e351cc9faa 10-Feb-2016 Miao Wang <miaowang@google.com> [RenderScript] Add arm64 prebuilts to BuildTools

Bug: 27107290

- Fix arm64 RS compat mode compilation.

Change-Id: I6cdcb86e412e490ca159132d41d99d0d4ae75c15
dk-darwin-x86.atree
dk-linux-x86.atree
dk-windows-x86.atree
dk.atree
bbf6a7909165e478dab9540eefe50f9ad0062322 09-Feb-2016 Miao Wang <miaowang@google.com> Add arm64 runtime prebuilts for RenderScript am: 01a78dbf40 am: 70984008ae am: 173e51a4f1
am: 5699b65a56

* commit '5699b65a5657a84341f79081ddd44c575100ada5':
Add arm64 runtime prebuilts for RenderScript
5699b65a5657a84341f79081ddd44c575100ada5 09-Feb-2016 Miao Wang <miaowang@google.com> Add arm64 runtime prebuilts for RenderScript am: 01a78dbf40 am: 70984008ae
am: 173e51a4f1

* commit '173e51a4f144d4d344dbb53a65a7c0b5a0c893b7':
Add arm64 runtime prebuilts for RenderScript
5e7e71c4519875ba1a7a3c6da7d4cb8eaec9b90c 05-Feb-2016 Neil Fuller <nfuller@google.com> Merge "Enable Java 1.8 language features in stubs"
9ea978bff6dfdae846f2917b8ec9ddb122248071 03-Feb-2016 Tor Norbye <tnorbye@google.com> Merge "Update to api-generator 22.9.4."
1d7a69a635f6beb4cf678a307b516e6f4447ed5a 03-Feb-2016 Tor Norbye <tnorbye@google.com> Update to api-generator 22.9.4.

The new API generator uses ASM 5.0.4 instead of 4.0, which makes
it capable of handling class files format 52. It also drops the
dependency on the SDK common jar and only depends on Guava (and
ASM), using the offline Maven repository directly.

Change-Id: I2978d514fe7653465200612943593e10662327c9
ndroid.mk
0f151d8043413429a9ce3b6139d7d93b2816cd86 16-Jan-2016 Neil Fuller <nfuller@google.com> Enable Java 1.8 language features in stubs

Bug: 26753820
Change-Id: I43a50d1edc1cbbc9ec0e883c344e95cff70e1de3
uild_android_stubs.mk
988445c4198785acb0d52a10c0ead5307f42a76f 16-Jan-2016 Neil Fuller <nfuller@google.com> Explicitly keep stubs as v51 / 1.7 class files

Without this change an associated change to the build
files will switch the Android stubs to v52 class files.
There are tools that are not quite ready yet. The target
will later be switched to "1.8" when the build is ready
and there are public classes using default / static
interface methods.

Bug: 26753820
Change-Id: I85e3f8ed0bb153af8ae0e83b0971b2ce408bf5b0
uild_android_stubs.mk
e73ff42040cbcc92460f92a3d609a6b61f9059e9 29-Oct-2015 bohu <bohu@google.com> kernel-ranchu: add ranchu kernel for sdk builds

For x86 and x86_64, sdk images will include kernel-ranchu that will
boot ranchu devices by qemu2 emulator; kernel-qemu will still be kept
to boot goldfish devices by classic emulator.

Change-Id: Ie2ada109cade730d03e709168802db826442b8d8
(cherry picked from commit eefafd91041967c0c08cb12e7dfbbcf670257d55)
(cherry picked from commit aacab1d961baaf1d1278a64b248361b21ddd2df0)
dk-android-x86.atree
dk-android-x86_64.atree
e2bb1af5e7fe362ff4a5dad24dd349591d0c3d67 09-Jan-2016 Trevor Johns <trevorjohns@google.com> Add RuntimePermissionsWear to sdk.atree

Change-Id: Ibf8082694c8007b7fe2b7d55b9ad2cf5bde98613
dk.atree
ef8789ea4759d6bc2756ed1493c1735787603eb3 08-Jan-2016 Yohann Roussel <yroussel@google.com> Merge "Build android-stubs-current.jack with Jack" am: 1328b856dd
am: 17cf210d64

* commit '17cf210d64809c6a10faec6c3f912d4c7f2254e4':
Build android-stubs-current.jack with Jack
e9dcc69da9a32a750477770a8a7a49f7542ce90e 06-Jan-2016 Yohann Roussel <yroussel@google.com> Build android-stubs-current.jack with Jack

Instead of using Jill.

Bug: 26415660

Change-Id: I316f013a16458fa8201fba6695d974b9afa0cc3c
uild_android_stubs.mk
16d3beadd979c73d40412d5c796d77f40fed82ce 09-Dec-2015 Yohann Roussel <yroussel@google.com> Ensure Jack server is running before any use

Change-Id: I6748c9c31e1df305c7dcc2568dbba50be4348e07
uild_android_stubs.mk
1147731080166a2df03ddcc8cbc9cdf6158aeafb 09-Dec-2015 Yohann Roussel <yroussel@google.com> Ensure Jack server is running before any use

Change-Id: I6748c9c31e1df305c7dcc2568dbba50be4348e07
uild_android_stubs.mk
4cf68b066a523234a01bf9ecbc851528cf25c384 16-Dec-2015 Shinichiro Hamaji <hamaji@google.com> Merge "Enable .toc optimization for SDK stub" am: c51d71ec48
am: 19b605e77b

* commit '19b605e77b2b4aee6dbf883e30564876d4c45cdf':
Enable .toc optimization for SDK stub
8b09785ad21c00a0542e622cec0b44af3e13f3ae 15-Dec-2015 Shinichiro Hamaji <hamaji@google.com> Enable .toc optimization for SDK stub

As we don't build .dex file for SDK stub, use .jar.toc even for
the .jack file. This should be safe we are building the .jack
file from .jar file.

This was actually necessary to achieve performance improvement
mentioned in https://android-review.googlesource.com/#/c/186470/

Bug: 24597504
Change-Id: I7d4518421b64510ce83229d9f19a654888753a84
uild_android_stubs.mk
f1c9df1bddfaf76c749da0a8f482797a08dd20f5 15-Dec-2015 Shinichiro Hamaji <hamaji@google.com> Merge "Define a rule to build a dummy .dex.toc file" am: 3578bf1c87
am: 4f959f7826

* commit '4f959f78260ee583592093c026dcac560be89720':
Define a rule to build a dummy .dex.toc file
ee81f7eb90607c23c0db43415850c564427a50d7 10-Dec-2015 Shinichiro Hamaji <hamaji@google.com> Define a rule to build a dummy .dex.toc file

This is a preparation of
https://android-review.googlesource.com/#/c/186470/

Bug: 24597504
Change-Id: I5b403f4b3ae29579d11653103464819c61063b3e
uild_android_stubs.mk
01a78dbf4038722e00c9d4d04760e561a779bbcd 03-Dec-2015 Miao Wang <miaowang@google.com> Add arm64 runtime prebuilts for RenderScript

- Only librsjni.so and libRSSupport.so will be bundled.
- Since current gradle version only accept renderScriptTargetAPI < 21
This will work on 64bit arm devices.

Bug: 25672969
Change-Id: Id860614b74341c91e94b01331a8a8a497ea51edd
dk.atree
a2595fc6e2683f54dbd2ff31ffb88dd88c6257c7 06-Nov-2015 Michael Wright <michaelwr@google.com> Add new test API stub jar for building CTS against.

Bug: 25608286
Change-Id: I996745b2ace09d5287b1eccd02662aefdb7eba4d
ndroid.mk
477d5d17709c0a95064f6ac17eeaa6d46a40b777 21-Nov-2015 Shinichiro Hamaji <hamaji@google.com> Merge "Generate .toc for android_stubs_current.jar"
am: 6cf9ae5b6b

* commit '6cf9ae5b6bc8b3bebd9769617c06845402b0a7a5':
Generate .toc for android_stubs_current.jar
6198f0718911dd338ec976de125c5450c2fd139f 13-Nov-2015 Shinichiro Hamaji <hamaji@google.com> Generate .toc for android_stubs_current.jar

This should be landed before we merge the main change, which
defines define-jar-to-toc-rule.

https://android-review.googlesource.com/#/c/181833/

Bug: 24597504
Change-Id: Icc3394690fb7949cfb89eff951ce3c394d273205
uild_android_stubs.mk
d2a66e73548538af484be639a9e67ca20ab993a4 18-Nov-2015 Trevor Johns <trevorjohns@google.com> Add WearSpeakerSample to sdk.atree

Change-Id: Ibcb9b9fcb85a03174f4e06ce0d80b0ada141054b
dk.atree
208bec884221c409a42bde8556da16dd8f321660 22-Oct-2015 Yohann Roussel <yroussel@google.com> Merge "Change jack/dex target dependency to jack script" am: 865c462b1a
am: fb3e9e0582

* commit 'fb3e9e05822dca74c81744da389227bbaec53bf2':
Change jack/dex target dependency to jack script
fb3e9e05822dca74c81744da389227bbaec53bf2 22-Oct-2015 Yohann Roussel <yroussel@google.com> Merge "Change jack/dex target dependency to jack script"
am: 865c462b1a

* commit '865c462b1a5d30c745309196f49d25d64236697d':
Change jack/dex target dependency to jack script
bf579123c5b8dfe767be3fad2526117c253bb8e7 03-Jul-2015 Yohann Roussel <yroussel@google.com> Change jack/dex target dependency to jack script

Instead of jack.jar.

(cherry picked from commit 1d489a33332baaf434e90a04bded127e855e1850)

Change-Id: I92b4183feb50189a994603f35444ff1bc4872da8
uild_android_stubs.mk
28c210b844dd626b3912b6f9a8400bea34a54d0e 21-Aug-2015 Tor Norbye <tnorbye@google.com> Pass in current android.jar to api-generator

This ensures that the api-versions.xml shipped with
the SDK always includes the correct latest API
data (see http://b.android.com/183500)

(cherry picked from commit fbe6c8105a6cbd880ff50d9799e23cf1790f1301)

(cherry picked from commit 82336df0c11445ba7ce6228bb4983a914328c710)

Change-Id: Ied1441430f023f7680ef4fe43e45eeda5162fa60
ndroid.mk
050c66aa7d52f0f0203c59d1a5020570d28ae687 14-Oct-2015 Miao Wang <miaowang@google.com> resolved conflicts for 3db22d4d to mnc-dr-dev-plus-aosp

Change-Id: I2baac9e5b218fba7ec7cc4df9b518b6b90a343d2
3db22d4d147221c7bf467ffcb9b4bd37d8346140 14-Oct-2015 Miao Wang <miaowang@google.com> am c0781cd7: am 10b385c0: am afe2d242: Fix llvm-rs-cc.exe crash for windows

* commit 'c0781cd7744ee4ae2a8f95c14724a9b05698174b':
Fix llvm-rs-cc.exe crash for windows
afe2d2420480e93f3364e0deac3082c11cceb689 13-Oct-2015 Miao Wang <miaowang@google.com> Fix llvm-rs-cc.exe crash for windows

- Move the dlls needed by llvm-rs-cc to the same folder as the
executable.

Bug: 23315748
Change-Id: I2d306684fcfd1c600c1bdb6f7050d671601c6b17
dk-windows-x86.atree
ad3d3452baa094d2f77ef74df45382cbd0c43c42 03-Oct-2015 Trevor Johns <trevorjohns@google.com> Add AsymmetricFingerprintDialog sample to sdk.atree

Change-Id: Ifca3b42b51eb2fe4dcf6df88dc8496bd0b01cea0
dk.atree
82336df0c11445ba7ce6228bb4983a914328c710 21-Aug-2015 Tor Norbye <tnorbye@google.com> Pass in current android.jar to api-generator

This ensures that the api-versions.xml shipped with
the SDK always includes the correct latest API
data (see http://b.android.com/183500)

Change-Id: I96a6b0218abeaf3865a49de0fdd2be933f88c469
(cherry picked from commit fbe6c8105a6cbd880ff50d9799e23cf1790f1301)
ndroid.mk
eeaccc2291967ef3cf20d8827207dbc39bf75014 15-Sep-2015 Yohann Roussel <yroussel@google.com> am 03ae930a: am 9e2e8392: Merge "Pick installed Jack & Jill for the sdk"

* commit '03ae930a7382b0c58640449dd115d4fcc33970e6':
Pick installed Jack & Jill for the sdk
03ae930a7382b0c58640449dd115d4fcc33970e6 15-Sep-2015 Yohann Roussel <yroussel@google.com> am 9e2e8392: Merge "Pick installed Jack & Jill for the sdk"

* commit '9e2e8392ae22051d775e093e6faba721d8b919eb':
Pick installed Jack & Jill for the sdk
9e2e8392ae22051d775e093e6faba721d8b919eb 15-Sep-2015 Yohann Roussel <yroussel@google.com> Merge "Pick installed Jack & Jill for the sdk"
a81bc96be3b0149b215d120e0c469a136a6c7479 09-Sep-2015 Dan Willemsen <dwillemsen@google.com> am 033ea23f: am 7ad271e7: Merge "Update windows sdk to build non-recursively"

* commit '033ea23f59f78e253affbc0d2745083339ca1fd7':
Update windows sdk to build non-recursively
033ea23f59f78e253affbc0d2745083339ca1fd7 09-Sep-2015 Dan Willemsen <dwillemsen@google.com> am 7ad271e7: Merge "Update windows sdk to build non-recursively"

* commit '7ad271e7742a904485c8fdf51206ba068bf5160f':
Update windows sdk to build non-recursively
7ad271e7742a904485c8fdf51206ba068bf5160f 09-Sep-2015 Dan Willemsen <dwillemsen@google.com> Merge "Update windows sdk to build non-recursively"
264843a896d7fe6cb36b203a411b4fe778b25f11 02-Sep-2015 Chris Craik <ccraik@android.com> am 7126aedf: am 8ae499e1: Merge "Support new systrace file structure after switching to catapult"

* commit '7126aedfb2f907e34b14ed63d90eb24326ed7521':
Support new systrace file structure after switching to catapult
7126aedfb2f907e34b14ed63d90eb24326ed7521 02-Sep-2015 Chris Craik <ccraik@android.com> am 8ae499e1: Merge "Support new systrace file structure after switching to catapult"

* commit '8ae499e1d3bf7915cd53b410eb8debda66595b86':
Support new systrace file structure after switching to catapult
c2d8765eacbde625336ff33e4b18ea49d6fc3b04 01-Sep-2015 Tony Mantler <nicoya@google.com> am 3dd5d840: Fix typo in SDK generation

* commit '3dd5d840f875e9a28e5b113e3bffc2efb343d653':
Fix typo in SDK generation
3dd5d840f875e9a28e5b113e3bffc2efb343d653 01-Sep-2015 Tony Mantler <nicoya@google.com> Fix typo in SDK generation

Change-Id: I5658bcfc1910562f17d094e81dc60a7c74a4467c
dk.atree
d9c89cbcfe49cd7af5b3a820e9f3cf66f2616bb2 29-Aug-2015 Trevor Johns <trevorjohns@google.com> Add additional samples to sdk.atree

- content/DirectShare
- media/MidiScope
- media/MidiSynth

Change-Id: Iabdb8057a6597ad4d879d51f752d84d700923487
dk.atree
013441f2965fecad98ad3b57251bee75c09aac99 29-Aug-2015 Tony Mantler <nicoya@google.com> resolved conflicts for merge of fab9a1f2 to mnc-dr-dev-plus-aosp

Change-Id: I5cd69798c3880b835cdebf45dcaf90a8b26a1d4d
349f891d94221b43ccbc91a80af7b3fef2a33142 19-Aug-2015 Dan Willemsen <dwillemsen@google.com> Update windows sdk to build non-recursively

Now the build system can support a HOST_CROSS_OS to build both linux and
windows binaries at the same time.

Bug: 23566667
Change-Id: I82b497c2621fbfbe493d0568fca42863c5fe9433
ools/windows_sdk.mk
indows_sdk_whitelist.mk
fab9a1f2672ca4e1a47845d68cc787811c50338b 28-Aug-2015 Tony Mantler <nicoya@google.com> Add preference and recommendation libs to SDK build

Change-Id: I00c716c42ffbd04b382b1b3016fcc19e9321ae48
ndroid.mk
dk.atree
fe9acde0a22cb6f65ec7136b904391e0ded931a9 28-Aug-2015 Zhen Wang <zhenw@google.com> Support new systrace file structure after switching to catapult

Change-Id: Ib7e99ff8d5679e32673a62ada7a9e1d9ad2e75cb
Signed-off-by: Zhen Wang <zhenw@google.com>
dk.atree
d0a7cb4a175913859f11e3ab598f9037dc9f1bf1 27-Aug-2015 Yusuf Ozuysal <yusufo@google.com> am 517a2f27: Revert "Add customtabs support lib to extras/android/support/"

* commit '517a2f27bfd997a09679126a78e3d1a8a0e58dd1':
Revert "Add customtabs support lib to extras/android/support/"
7615d828163653f0260bb384b95ec4d06f61fb22 27-Aug-2015 Yusuf Ozuysal <yusufo@google.com> am ac16badc: am e226a0f5: Add customtabs support lib to extras/android/support/

* commit 'ac16badc765571198fbafa7694c991c927643ed7':
Add customtabs support lib to extras/android/support/
517a2f27bfd997a09679126a78e3d1a8a0e58dd1 27-Aug-2015 Yusuf Ozuysal <yusufo@google.com> Revert "Add customtabs support lib to extras/android/support/"

This reverts commit 53ad2de7f6677c31eb42dbd117b4857f38fc36f4.

Change-Id: Ia9831d344e6e0b12c55544b02254daae109f09c5
(cherry picked from commit 04a6dcacf0a86b6b0d243a88c8bcf87f24516045)
dk.atree
ac16badc765571198fbafa7694c991c927643ed7 27-Aug-2015 Yusuf Ozuysal <yusufo@google.com> am e226a0f5: Add customtabs support lib to extras/android/support/

* commit 'e226a0f56949b1d6ab97a31ed987adb7f7513be9':
Add customtabs support lib to extras/android/support/
51397c4b4434d5a375382237ce5fc40db18deb9a 27-Aug-2015 Tor Norbye <tnorbye@google.com> am 1f2c59af: Merge "Pass in current android.jar to api-generator" into mnc-ub-dev

* commit '1f2c59aff8691075606294dc8feb6d3979d46a7b':
Pass in current android.jar to api-generator
e226a0f56949b1d6ab97a31ed987adb7f7513be9 26-Aug-2015 Yusuf Ozuysal <yusufo@google.com> Add customtabs support lib to extras/android/support/

Currently the only way to get access to customtabs library through
download m2repository and using the aar file whereas all other
support libs are also present in extras/android/support/ with
the corresponding resources and jar file.

This adds the jar and manifest to the corresponding folder to avoid
the confusion to developers.

This is relanding
https://googleplex-android-review.git.corp.google.com/#/c/756492/
after it was reverted due to not having the corresponding Android.mk
change.

Change-Id: I21969994e1dd0bb4f9abbfa395cf284e3cfc396d
ndroid.mk
dk.atree
e98b87f3fb5df7218ddbd8d2dcb62afb1d9c5949 27-Aug-2015 Yusuf Ozuysal <yusufo@google.com> am c3d6f680: am 04a6dcac: Revert "Add customtabs support lib to extras/android/support/"

* commit 'c3d6f6802950a70cd6ed241b67563da3b0f41e99':
Revert "Add customtabs support lib to extras/android/support/"
04a6dcacf0a86b6b0d243a88c8bcf87f24516045 27-Aug-2015 Yusuf Ozuysal <yusufo@google.com> Revert "Add customtabs support lib to extras/android/support/"

This reverts commit 53ad2de7f6677c31eb42dbd117b4857f38fc36f4.

Change-Id: Ia9831d344e6e0b12c55544b02254daae109f09c5
dk.atree
9df340b17590d4acaba408d715cd2456b4e75def 26-Aug-2015 Yusuf Ozuysal <yusufo@google.com> am 1c6e1387: am 53ad2de7: Add customtabs support lib to extras/android/support/

* commit '1c6e1387a2b8c956fe356557e6ee7e2249778721':
Add customtabs support lib to extras/android/support/
31338f7196f904345f18085a1c0a47b49d6c0328 26-Aug-2015 Yusuf Ozuysal <yusufo@google.com> am 53ad2de7: Add customtabs support lib to extras/android/support/

* commit '53ad2de7f6677c31eb42dbd117b4857f38fc36f4':
Add customtabs support lib to extras/android/support/
fbe6c8105a6cbd880ff50d9799e23cf1790f1301 21-Aug-2015 Tor Norbye <tnorbye@google.com> Pass in current android.jar to api-generator

This ensures that the api-versions.xml shipped with
the SDK always includes the correct latest API
data (see http://b.android.com/183500)

Change-Id: I96a6b0218abeaf3865a49de0fdd2be933f88c469
ndroid.mk
53ad2de7f6677c31eb42dbd117b4857f38fc36f4 26-Aug-2015 Yusuf Ozuysal <yusufo@google.com> Add customtabs support lib to extras/android/support/

Currently the only way to get access to customtabs library through
download m2repository and using the aar file whereas all other
support libs are also present in extras/android/support/ with
the corresponding resources and jar file.

This adds the jar and manifest to the corresponding folder to avoid
the confusion to developers.

Change-Id: Id6d71e4071c0725257cadb539cd47230d6727914
dk.atree
128cd0c33b92731d92e8cba4f253af11e61c79aa 13-Aug-2015 Dan Willemsen <dwillemsen@google.com> am 283439c7: am d592f8c7: Merge "Remove the mingw package check"

* commit '283439c70091ab77daa566884db2c0f20bcac5c9':
Remove the mingw package check
ab842478d40a6fd10307c40956ad20090321e3b3 13-Aug-2015 Dan Willemsen <dwillemsen@google.com> am 283439c7: am d592f8c7: Merge "Remove the mingw package check"

* commit '283439c70091ab77daa566884db2c0f20bcac5c9':
Remove the mingw package check
283439c70091ab77daa566884db2c0f20bcac5c9 13-Aug-2015 Dan Willemsen <dwillemsen@google.com> am d592f8c7: Merge "Remove the mingw package check"

* commit 'd592f8c716ec53b65cb9c046ae5b57a75082a929':
Remove the mingw package check
cb994dd0192df47013449de2867fb80467eff82f 13-Aug-2015 Dan Willemsen <dwillemsen@google.com> Remove the mingw package check

We're using mingw prebuilts checked into the tree now, the external
package is no longer necessary.

Change-Id: I349f9605d3d09decc3ec5df3ba595728c0a2727c
ools/windows_sdk.mk
8c61bb43f32d8ed7f2b073748ef7d1752e2a928e 21-Jul-2015 Yohann Roussel <yroussel@google.com> Pick installed Jack & Jill for the sdk

(cherry picked from commit 7ca5ad69db03b1a205926cc673f12c252fa21b8a)

Change-Id: Ied8d420f05012e2072f11bb7c63fd3c53afa664e
ndroid.mk
dk.atree
896afb075d043e4b54103ceb2d59e5e5a4142ff6 03-Aug-2015 Ying Wang <wangying@google.com> resolved conflicts for merge of 0f32d65d to mnc-dr-dev-plus-aosp

Change-Id: I5be45feb780c67c08dbef035f2f6481ae6338f90
87108c8530cd7f8297c40fa99a50fbc0e1f983cf 01-Aug-2015 Ying Wang <wangying@google.com> resolved conflicts for merge of 0f32d65d to mnc-dev-plus-aosp

Change-Id: I7da3ba971ccaf566be3e490846e5e306cdd2cf28
0f32d65d6c4b4c6af73b71bcda4e671902f699db 01-Aug-2015 Ying Wang <wangying@android.com> am f6b91cf3: Merge "Switch to 64-bit host tools in Linux/Mac SDK build."

* commit 'f6b91cf39b54e0a6f59e53f4de968b0745350d7e':
Switch to 64-bit host tools in Linux/Mac SDK build.
fca823453b7bb1c4c13c012c789addb25df0d4e8 31-Jul-2015 Ying Wang <wangying@google.com> Switch to 64-bit host tools in Linux/Mac SDK build.

Bug: 22776595
Change-Id: Iadf56f045f6920d4e97c8b1219b1b3907213b12b
dk-darwin-x86.atree
dk-linux-x86.atree
dk-windows-x86.atree
0b562725a716cee3a6632512210d955823d869c0 28-Jul-2015 Miao Wang <miaowang@google.com> am b5102aaa: am 04a194c0: For RenderScript support lib use libblasV8.so instead of libblas.so

* commit 'b5102aaa7987f48fc3022fef75bc938bf8674e82':
For RenderScript support lib use libblasV8.so instead of libblas.so
d71980d941bc8cc6826d82a82c89712456547cff 28-Jul-2015 Miao Wang <miaowang@google.com> am 04a194c0: For RenderScript support lib use libblasV8.so instead of libblas.so

* commit '04a194c0c92f9dd93500065d9c8eb02fa983bcbb':
For RenderScript support lib use libblasV8.so instead of libblas.so
04a194c0c92f9dd93500065d9c8eb02fa983bcbb 28-Jul-2015 Miao Wang <miaowang@google.com> For RenderScript support lib use libblasV8.so instead of libblas.so

fix the sdk build.

Bug: 22693954

Change-Id: Ie283ed6834520c74c5e0f2dcdc18dbeb79e2c428
dk.atree
9d78bc10c85d84ca1b9e9c65d9ebbf5ca141e9d9 21-Jul-2015 Chris Craik <ccraik@google.com> Support new systrace file structure

bug:22636165

Change-Id: I5c5b634df4350da68f5dc2ee5018fd90654adc70
dk.atree
61bd4a36d15b05cc3c94283cb7396c1c1f0ba872 26-Jun-2015 Stephen Hines <srhines@google.com> am ca884910: am b85e0a9e: Merge "Remove unnecessary clang from product_sdk.mk."

* commit 'ca8849100316519138d3674dfa05d44e4ae83c1a':
Remove unnecessary clang from product_sdk.mk.
ca8849100316519138d3674dfa05d44e4ae83c1a 26-Jun-2015 Stephen Hines <srhines@google.com> am b85e0a9e: Merge "Remove unnecessary clang from product_sdk.mk."

* commit 'b85e0a9e59c27a56ac788235547a003039b44980':
Remove unnecessary clang from product_sdk.mk.
cfa3da6aae4684370eeb94f16420c851f384c4dd 25-Jun-2015 Stephen Hines <srhines@google.com> am 5cf9df16: am 2ca0c6f9: Merge "Add clang.exe to Windows SDK build."

* commit '5cf9df169626377218d86ee2bc1c464c9791741c':
Add clang.exe to Windows SDK build.
27241e70561bf1eb17e284c2baa9c8058f4cd25d 25-Jun-2015 Stephen Hines <srhines@google.com> Remove unnecessary clang from product_sdk.mk.

It is sufficient to just have this exist in windows_sdk.mk.

Change-Id: I33e4b41622bd7891f5e4868ba0e5138f3d83fa1f
roduct_sdk.mk
5cf9df169626377218d86ee2bc1c464c9791741c 25-Jun-2015 Stephen Hines <srhines@google.com> am 2ca0c6f9: Merge "Add clang.exe to Windows SDK build."

* commit '2ca0c6f9b6b3bbe53490af5a07cb9599761123e3':
Add clang.exe to Windows SDK build.
eb8b46d7a72a0cc04450adbd49fb2ee2a4142544 25-Jun-2015 Stephen Hines <srhines@google.com> Add clang.exe to Windows SDK build.

Bug: 22044739

This is needed as part of the NDK itself, now that we are shipping the
platform Clang as the one true Clang. It can be built by doing:

make winsdk-tools

Change-Id: I3363f46b5dcc52258aa92b42b5a92a96bf868e73
roduct_sdk.mk
ools/windows_sdk.mk
4697e4fbeffe63454c47fb90298db7b146470bbf 23-Jun-2015 Chris Craik <ccraik@android.com> am d7ad7710: am 400ae3d4: Merge "Support new systrace file structure after refactor"

* commit 'd7ad7710dd4f0299623650308f27f22dec6fedc2':
Support new systrace file structure after refactor
d7ad7710dd4f0299623650308f27f22dec6fedc2 23-Jun-2015 Chris Craik <ccraik@android.com> am 400ae3d4: Merge "Support new systrace file structure after refactor"

* commit '400ae3d4e7aebae8476bdc0dc688d454f6917a21':
Support new systrace file structure after refactor
05819dbf055a34afd7aa59a5d57dc8c4ccc0302b 23-Jun-2015 Zhen Wang <zhenw@google.com> Support new systrace file structure after refactor

This is needed for
https://android-review.googlesource.com/#/c/154850/

Change-Id: Ibd5f33d0c038bfba37d81b23234945b9033c210a
Signed-off-by: Zhen Wang <zhenw@google.com>
dk.atree
4ca3aa6a609cdac81aec9446de4b50afe99407a2 18-Jun-2015 Miao Wang <miaowang@google.com> [RenderScript] update sdk.atree to include libblas.so

bug: 21902810

Change-Id: Ia2ffb4ccfbba5201d4811919acfc37b6f13812b0
dk.atree
b5c9450d7fa8c5269867fc540f2da0b1b06bdcd5 02-Jun-2015 bohu <bohu@google.com> Merge "Fix size and sha1sum for some sdk targets" into mnc-dev
f4c73da84f32504a2b39b1e958a1a19110fdb88a 02-Jun-2015 Xavier Ducrohet <xav@google.com> Update structure for the build-tools/plat-tools.

Change-Id: Idf0d8cd41812ca92d8bb6910c4bd7d64eaaff51a
dk-darwin-x86.atree
dk-linux-x86.atree
dk-windows-x86.atree
dk.atree
52e0bf39674f9adf884a8fb1f92ee3327d67784f 02-Jun-2015 bohu <bohu@google.com> Fix size and sha1sum for some sdk targets

Targets such as sdk_google_phone_{x86,arm,...}-sdk
have wrong size and sha1sum in the repo-sys-img.xml,
because the sdk_repo.mk file incorrectly over-writes
the final images zip.

bug: 20927015

Change-Id: I151c8759c299d4a943f00ca2734ef65dea727262
ools/sdk_repo.mk
c5bbbe3c68a6f4231418fee052413ec308b27cfa 27-May-2015 Trevor Johns <trevorjohns@google.com> Add MNC samples to sdk.atree

Change-Id: I8e7493f5da88fe0f7711df5b2ee31877bd88a0c3
dk.atree
a0de890405f7c354dd9c7d07f154d89d59a7c4dc 21-May-2015 Xavier Ducrohet <xav@google.com> Fix build breakage again.

Forgot to change the new location of llvm-rs-cc

Change-Id: Ief422e11cdb9a5205032afb1c47de97af95d80c1
dk-windows-x86.atree
19b0ecb1201ada24ac780a404ca6a769e3ba3b9d 21-May-2015 Xavier Ducrohet <xav@google.com> Fix build breakage.

The windows build needs to delete build tools from the new location.

Change-Id: Ifb77a5e4558734dba7eeca6c784d5fa8aeb391d4
dk-windows-x86.atree
5fb89112f66d78e97227891f79dd2c6fc89af139 20-May-2015 Xavier Ducrohet <xav@google.com> Merge "Fix build tools packaging." into mnc-dev
7d6d0d4ebb3d59965325ed618024a543ff3014cc 20-May-2015 Xavier Ducrohet <xav@google.com> Fix build tools packaging.

Move exe under bin/ and the libraries under lib/

Change-Id: Id9fa6bf921e69810f92876623bd69302e85f7a61
dk-darwin-x86.atree
dk-linux-x86.atree
dk-windows-x86.atree
dk.atree
bae9765fd048749c1ed9fb459470624a486fb058 19-May-2015 Tor Norbye <tnorbye@google.com> Install SDK annotations as platform-tools/api/annotations.zip

Change-Id: I091ab3e41e927f2dd0ecb195155cb2d6d61f5ed3
dk.atree
cfaf1bffea88307b7375dc66673d7eb662cfcb70 08-Sep-2014 Yohann Roussel <yroussel@google.com> [DO NOT MERGE] Compile using Jack

Declare target to allow compilation to Jack files.

This includes cherry-picks of the following changes:
83efd5e421870602f3da5c8fa82a606687bfcc27
491a3adb8de2f19fbeed86dd5331f970c3377d7b

Change-Id: Ia1bb627debb87c413ab2a184bd50d8510fd5cd45
uild_android_stubs.mk
22e1a9ab033119848c0c83b7961110e800b81c34 14-May-2015 Deepanshu Gupta <deepanshu@google.com> Merge "Remove ICU from LayoutLib." into mnc-dev
38c6c69da21bce58634510045afc097d34d2df37 14-May-2015 Filip Gruszczynski <gruszczy@google.com> am ab748c01: Merge "Sample for percent support library." into lmp-mr1-ub-dev

* commit 'ab748c0115a72c44c22baca1db961c9a35b1c277':
Sample for percent support library.
28c034b08fce49578aecf156c39ec7726c716aa9 12-May-2015 Deepanshu Gupta <deepanshu@google.com> Remove ICU from LayoutLib.

Android now has its own version of ICU bundled. There's no need to
bundle a separate ICU jar.

Change-Id: Ic6a4decc4c4de3a095718e379952908208306784
dk.atree
9c30464eb1229813d6db187bb6407468d64f37f1 09-May-2015 Tor Norbye <tnorbye@google.com> Use new api-generator version: extracts deprecation info

This reverts commit 9f09636474ea4b2402d5f49edd1213b0a0e1ea9d.
ndroid.mk
9f09636474ea4b2402d5f49edd1213b0a0e1ea9d 09-May-2015 Tor Norbye <tnorbye@google.com> Revert "Use new api-generator version: extracts deprecation info"

This reverts commit 833bdc79d8bbbf1ad45ccc3847696de7c0c5cd25.

Change-Id: Ib08294a39b03c7831ffebf83487b9c6564401c31
ndroid.mk
a9a9ec6d75bb3689d368a3dbb4d2cd7df2065252 08-May-2015 Filip Gruszczynski <gruszczy@google.com> Sample for percent support library.

Change-Id: Id16bda966b0e2e920385486e8ee956c8beea2268
ndroid.mk
dk.atree
833bdc79d8bbbf1ad45ccc3847696de7c0c5cd25 07-May-2015 Tor Norbye <tnorbye@google.com> Use new api-generator version: extracts deprecation info

Change-Id: Id2e9e30fe5b9ba298f11bee4b07fb11d8a1cb802
ndroid.mk
72f1c9535dad9a522210ef98ecd39cdfa9799039 29-Apr-2015 Xavier Ducrohet <xav@google.com> Ability to generate SDK system-images for mips64

Change-Id: I9547a6059a68d1ae3861c35a328c1ff05ae3fc0f
(cherry picked from commit d63ae3ab1581ee3973f2bd380300568c66fbc503)
dk-android-mips64.atree
83f4d2a1c955bd8f589576b9b38c420d366e0f26 23-Apr-2015 Xavier Ducrohet <xav@google.com> Optional library listing file.

Also update some files for MNC.

Change-Id: I3901b07d72831cdb6557da1696ae4845e4d15be5
ptional.json
dk.atree
f3dc31847e29c7d7ed10be0557f20ac232b6f52e 24-Apr-2015 Ying Wang <wangying@google.com> am 0273c81e: am 4ea82d63: Merge "Update prebuilts path."

* commit '0273c81e01c6c7462af00d9d5323422773bc1aa9':
Update prebuilts path.
0273c81e01c6c7462af00d9d5323422773bc1aa9 23-Apr-2015 Ying Wang <wangying@google.com> am 4ea82d63: Merge "Update prebuilts path."

* commit '4ea82d63dd67e1776885900a28d8f7057ce3c00f':
Update prebuilts path.
87f01085fe4135c67d0b21c0a833bed1ad5f4f3d 15-Apr-2015 Ying Wang <wangying@google.com> Update prebuilts path.

Bug: 20239510
Change-Id: Id2c699fb516d55deceffd8194a485b078564c8de
dk-darwin-x86.atree
dk-linux-x86.atree
dk-windows-x86.atree
a89998d469b4b39968f599aa303e74a2d1b4a559 22-Apr-2015 Ying Wang <wangying@google.com> Add org.apache.http.legacy.jar to the SDK package.

Change-Id: I3da0cb5b907c768615923123715be766f2d0d2a5
ndroid.mk
dk.atree
4daceb87c51578cbdce1df8ef6c8a60ff0af48c6 17-Apr-2015 Deepanshu Gupta <deepanshu@google.com> Add resources to recyclerview dependency.

Change-Id: Ifa9ea3759702a59c09ee4d1e7523d4e954773882
(cherry picked from commit cc8bf5bfaaf388e6a572be65ff9038ff2ee1a47d)
dk.atree
cc8bf5bfaaf388e6a572be65ff9038ff2ee1a47d 17-Apr-2015 Deepanshu Gupta <deepanshu@google.com> Add resources to recyclerview dependency.

Change-Id: Ifa9ea3759702a59c09ee4d1e7523d4e954773882
dk.atree
07dd2eb7e686ed87fc047094bf5fe42578459b18 15-Apr-2015 Ying Wang <wangying@google.com> Update prebuilts path.

Bug: 20239510
Change-Id: Id2c699fb516d55deceffd8194a485b078564c8de
dk-darwin-x86.atree
dk-linux-x86.atree
dk-windows-x86.atree
64d5a34e1242c6f36d4fbb06599e2eeec7a805d5 09-Apr-2015 Chris Banes <chrisbanes@google.com> am c5522cae: Merge "Revert "Disable the design support library and demos"" into lmp-mr1-ub-dev

* commit 'c5522cae8872dd761c4fe0289b63500328717e12':
Revert "Disable the design support library and demos"
f9cd4395a25df2b01f7214a29bb19d82ac2ff119 09-Apr-2015 Chris Banes <chrisbanes@google.com> am 5fdbf918: Merge "Revert "Disable design lib in master build file"" into lmp-mr1-ub-dev

* commit '5fdbf91821442faab51330f69d5a3c20bf4793bb':
Revert "Disable design lib in master build file"
b859e355e54d8b0f7d60caed080b5ccafdb6f9a6 09-Apr-2015 Chris Banes <chrisbanes@google.com> Revert "Disable the design support library and demos"

This reverts commit 97930fc88bed4240b23fdca24b7817cad888367a.

Change-Id: I363014ddaa19db82f076875a36b4c3c8697eb9cb
dk.atree
5fdbf91821442faab51330f69d5a3c20bf4793bb 09-Apr-2015 Chris Banes <chrisbanes@google.com> Merge "Revert "Disable design lib in master build file"" into lmp-mr1-ub-dev
d1723b40dd2502617ba248290badfe57251a51a3 09-Apr-2015 Chris Banes <chrisbanes@google.com> Revert "Disable design lib in master build file"

This reverts commit 988f263d5abef3488a5757f8f688953061d9403e.

Change-Id: Ieec3403b2f5976115aa9afe662bd6617ec86dd38
ndroid.mk
3911fb90edf048714081ebf9f04f0d9c8b4a8934 08-Apr-2015 Chris Banes <chrisbanes@google.com> am 4f10c76a: Merge "Disable design lib in master build file" into lmp-mr1-ub-dev

* commit '4f10c76afced740a62b1e60a62be0314db5f02fb':
Disable design lib in master build file
4f10c76afced740a62b1e60a62be0314db5f02fb 08-Apr-2015 Chris Banes <chrisbanes@google.com> Merge "Disable design lib in master build file" into lmp-mr1-ub-dev
a8460253ae8c3d5048b385a81e080cc8cf704af0 08-Apr-2015 Chris Banes <chrisbanes@google.com> am 97930fc8: Disable the design support library and demos

* commit '97930fc88bed4240b23fdca24b7817cad888367a':
Disable the design support library and demos
988f263d5abef3488a5757f8f688953061d9403e 08-Apr-2015 Chris Banes <chrisbanes@google.com> Disable design lib in master build file

Change-Id: I60a42f56b62fa68987e277ce5045d3d672dcf441
ndroid.mk
97930fc88bed4240b23fdca24b7817cad888367a 07-Apr-2015 Chris Banes <chrisbanes@google.com> Disable the design support library and demos

Change-Id: Ia0247179d3230d0ec2a198d458bc417fe3102d9d
dk.atree
625dde7bdf6726b967733bb8b506734824cd6b5a 01-Apr-2015 Chris Craik <ccraik@android.com> am 630b075c: Merge "Fix build - support new systrace file structure"

* commit '630b075cdb4299e72d26d8cb355a28c342479201':
Fix build - support new systrace file structure
6941c574cf6b20e70957a85253f122a87cbd200c 07-Mar-2015 Chris Craik <ccraik@google.com> Fix build - support new systrace file structure

Change-Id: Ifcd97179b9d724ad8df6e623b492517d509d82dc
dk.atree
edcf97efa7d796b1dd0136eeb0893c970da45cc2 31-Mar-2015 Trevor Johns <trevorjohns@google.com> am b2c35d15: am 2298d3b4: am 0d473ea1: am 721cd1b8: am 77b5d394: Update sdk.atree and samples/browseable for lastest samples release

* commit 'b2c35d1597aace199282148142249a3b14bd95f3':
Update sdk.atree and samples/browseable for lastest samples release
2298d3b48d5bdbb1b6b3e1ea081fede26af7bae0 31-Mar-2015 Trevor Johns <trevorjohns@google.com> am 0d473ea1: am 721cd1b8: am 77b5d394: Update sdk.atree and samples/browseable for lastest samples release

* commit '0d473ea178b5120ae45249c4d644cd00e876e63e':
Update sdk.atree and samples/browseable for lastest samples release
721cd1b86ac6638b55b0fb20f12695aa32916dd9 31-Mar-2015 Trevor Johns <trevorjohns@google.com> am 77b5d394: Update sdk.atree and samples/browseable for lastest samples release

* commit '77b5d394ff91872896c69f5cee93a126f3aed92e':
Update sdk.atree and samples/browseable for lastest samples release
77b5d394ff91872896c69f5cee93a126f3aed92e 31-Mar-2015 Trevor Johns <trevorjohns@google.com> Update sdk.atree and samples/browseable for lastest samples release

Synced to developers/samples/android commit
97b2cfe5ba6d8fa8daaf3273141b321b5fe9e910.

Change-Id: I360cfa147e71dd519b841df41b4e878f86b9b27b
dk.atree
99ad31c6863c1f9470fdaff509a5b913faf90429 30-Mar-2015 Dan Albert <danalbert@google.com> am e1915bdd: am 3ba45f78: am 2474617f: Merge "Allow libbase to be used on Windows."

* commit 'e1915bdd6302e4ea6abe363d04ad8eba9bbf3df8':
Allow libbase to be used on Windows.
3ba45f7871ff9705ed6e994304c44b724feed2a2 30-Mar-2015 Dan Albert <danalbert@google.com> am 2474617f: Merge "Allow libbase to be used on Windows."

* commit '2474617f0162c7de1c359321071706540983cd2d':
Allow libbase to be used on Windows.
2474617f0162c7de1c359321071706540983cd2d 30-Mar-2015 Dan Albert <danalbert@google.com> Merge "Allow libbase to be used on Windows."
d95f8c708c90191d59db9eed5e13227020321a6e 24-Mar-2015 Narayan Kamath <narayan@google.com> am d3b57a16: am 8a9dd8d1: am 05bbd6dd: Merge "Remove reference to libzipfile."

* commit 'd3b57a16b2330fcf29eeb7b00ad189da01dddb54':
Remove reference to libzipfile.
8a9dd8d124f2b4c1d89576895057009da729a4e1 23-Mar-2015 Narayan Kamath <narayan@google.com> am 05bbd6dd: Merge "Remove reference to libzipfile."

* commit '05bbd6dd357e242ec09d169d219b0b018d258f72':
Remove reference to libzipfile.
08857b6268c6a222341aec68bbba536874a87d49 20-Mar-2015 Narayan Kamath <narayan@google.com> Remove reference to libzipfile.

This target has been deleted.

Change-Id: I0a79c41eda1b325d3e61066dd6842812c5d1d582
indows_sdk_whitelist.mk
23c2bb52b3d1a8c86293a480244bb9cf15d42766 20-Mar-2015 Dan Albert <danalbert@google.com> Allow libbase to be used on Windows.

Change-Id: I9182f42393438d722f4ad33548c262d8405c1cba
indows_sdk_whitelist.mk
a489ea0141fdaf146d244d4f7db1a8e260fa6879 14-Mar-2015 Dan Albert <danalbert@google.com> am 73b3f5cd: am 80dd2ac9: Merge "Fix SDK library paths for Windows and Darwin too."

* commit '73b3f5cde4bfdebbe4893f0234d1b0a9ddd09640':
Fix SDK library paths for Windows and Darwin too.
73b3f5cde4bfdebbe4893f0234d1b0a9ddd09640 14-Mar-2015 Dan Albert <danalbert@google.com> am 80dd2ac9: Merge "Fix SDK library paths for Windows and Darwin too."

* commit '80dd2ac93d4e89c419eb9c57ddf3178212180564':
Fix SDK library paths for Windows and Darwin too.
d4a1f0619bc6a83d75c7b6686f9015eb7b3cec6c 14-Mar-2015 Dan Albert <danalbert@google.com> Fix SDK library paths for Windows and Darwin too.

Change-Id: Ibaae6fd4089c804f50f8065e614c5de1b71c242b
dk-darwin-x86.atree
dk-windows-x86.atree
89f9ff889318c4f50f387a9366864831b5340f86 14-Mar-2015 Dan Albert <danalbert@google.com> am e0f3196e: am 170b153b: Merge "Fix library paths for SDK tools."

* commit 'e0f3196e3a65d06874c21639ae4d5db7d82f0f78':
Fix library paths for SDK tools.
e0f3196e3a65d06874c21639ae4d5db7d82f0f78 14-Mar-2015 Dan Albert <danalbert@google.com> am 170b153b: Merge "Fix library paths for SDK tools."

* commit '170b153b3e3b087f77d806323a685ca0b4597561':
Fix library paths for SDK tools.
b7125622c8e5272c9b031b947ddad218f1326475 13-Mar-2015 Dan Albert <danalbert@google.com> Fix library paths for SDK tools.

The rpath for the binaries is ../lib but the libraries were being
installed to the same directory as the executables.

Bug: 19617220
Change-Id: I5c4158698b6703843b67543d4396e2bffc5fb313
dk-linux-x86.atree
1447a4987b199bba2129d5a4382c8d095214af87 07-Mar-2015 Chris Craik <ccraik@google.com> Fix build - support new systrace file structure

Change-Id: Ifcd97179b9d724ad8df6e623b492517d509d82dc
dk.atree
2068c6a59a59defa6a0b3c9f157abc834a3866f0 27-Feb-2015 Chris Banes <chrisbanes@google.com> Remove the old ActionBarCompat sample

Change-Id: I04dfe8dd38e153ae8f28c3044a7e6d37f1a7d562
dk.atree
2d44f6664925eed9d39aea1853a2fa2ff446fd3d 24-Feb-2015 Chris Banes <chrisbanes@google.com> am abdd0b39: am c841e38f: am 9ad1e854: Update sdk.atree for new Palette dir structure

* commit 'abdd0b39b75e440e70f144b3d2f4405cccefd372':
Update sdk.atree for new Palette dir structure
abdd0b39b75e440e70f144b3d2f4405cccefd372 24-Feb-2015 Chris Banes <chrisbanes@google.com> am c841e38f: am 9ad1e854: Update sdk.atree for new Palette dir structure

* commit 'c841e38f88db355c93c8e7372b15de3ae3d05715':
Update sdk.atree for new Palette dir structure
9ad1e8546680a70e05e5cff315da2428bf5e1548 22-Feb-2015 Chris Banes <chrisbanes@google.com> Update sdk.atree for new Palette dir structure

Change-Id: I7776f4d843aac8496240a54d0982525039b91469
dk.atree
c1c9431a3655075f71e4dc60e9b821efedc8cac6 28-Jan-2015 Ying Wang <wangying@google.com> am 2d0ce7b8: am 214797ac: Merge "Update the winsdk-tools prerequisites."

* commit '2d0ce7b832d1c6e76a53ba6475858181a7beac95':
Update the winsdk-tools prerequisites.
ef0f60ea9a8f7c2e82715078ce52cccaffdc7321 28-Jan-2015 Chris Banes <chrisbanes@google.com> am 40ef0a61: am 219e5f1c: Merge "Add design support lib to sdk.atree" into lmp-mr1-ub-dev

* commit '40ef0a61b140b3933e97b06fd7ab136277376814':
Add design support lib to sdk.atree
2d0ce7b832d1c6e76a53ba6475858181a7beac95 27-Jan-2015 Ying Wang <wangying@google.com> am 214797ac: Merge "Update the winsdk-tools prerequisites."

* commit '214797acbe66390a012d2ba47200f6e8330d5c33':
Update the winsdk-tools prerequisites.
b6549fd3fcdb3a0363cba1435d45f34de4c28f41 27-Jan-2015 Ying Wang <wangying@google.com> Update the winsdk-tools prerequisites.

To build the windows SDK tools, we need only the Linux llvm-tblgen and
clang-tblgen, but not llvm-rs-cc or bcc_compat.
This reduces significantly build time if you want run only "make
winsdk-tools".

Bug: 19149444
Change-Id: I971dd6a6e1a7dd11a968ee8be8cd02085055c262
ools/windows_sdk.mk
40ef0a61b140b3933e97b06fd7ab136277376814 27-Jan-2015 Chris Banes <chrisbanes@google.com> am 219e5f1c: Merge "Add design support lib to sdk.atree" into lmp-mr1-ub-dev

* commit '219e5f1c489b8664447abf567fdb04efcc0826fc':
Add design support lib to sdk.atree
35bdfca5ad370069bf4820cacf4fa6902050f56d 26-Jan-2015 Chris Banes <chrisbanes@google.com> Add design support lib to sdk.atree

Change-Id: I0ca9f2d4ec64b8d455cec1fe10c4351497bf263a
ndroid.mk
dk.atree
c80d9e6c608de460af12f795c65ce36f4a5a44e8 16-Dec-2014 Trevor Johns <trevorjohns@google.com> am a6aa0a4a: am 659e1ca0: am 23e2194c: am 2f3095d9: am cee6440c: am babfe028: Add new samples to sdk.atree

* commit 'a6aa0a4aedbc2724b424e5644345b3baba0cfc7e':
Add new samples to sdk.atree
a6aa0a4aedbc2724b424e5644345b3baba0cfc7e 16-Dec-2014 Trevor Johns <trevorjohns@google.com> am 659e1ca0: am 23e2194c: am 2f3095d9: am cee6440c: am babfe028: Add new samples to sdk.atree

* commit '659e1ca0c74d25df65aa761ce705273de33e0cc3':
Add new samples to sdk.atree
23e2194cf94b213aed40a3106071c8c90895d15c 16-Dec-2014 Trevor Johns <trevorjohns@google.com> am 2f3095d9: am cee6440c: am babfe028: Add new samples to sdk.atree

* commit '2f3095d93b5ef30d89ab3d939676f03918d76227':
Add new samples to sdk.atree
cee6440c2ae07d53d382b2972a228d7d6651d2f5 12-Dec-2014 Trevor Johns <trevorjohns@google.com> am babfe028: Add new samples to sdk.atree

* commit 'babfe02866d84a457381a7d4c895596c8ec75165':
Add new samples to sdk.atree
babfe02866d84a457381a7d4c895596c8ec75165 12-Dec-2014 Trevor Johns <trevorjohns@google.com> Add new samples to sdk.atree

- PermissionRequest
- DirectorySelection
- AppUsageStatistics
- ScreenCapture

Change-Id: I78d70f47dab54bc40a0e4e320ce6f8799b2cc785
dk.atree
491a3adb8de2f19fbeed86dd5331f970c3377d7b 25-Nov-2014 Yohann Roussel <yroussel@google.com> Add jack.jar dependency when using transform-jar-to-jack

(cherry picked from commit 7324414107678ab1bcc3ed94b3c92aa36686d71d)

Change-Id: I7b3aadc1e12c31d5e88dc0c38e95e367103bc55f
uild_android_stubs.mk
c5ed3d9628ec6701a1c6757966c2c8df069f949e 05-Dec-2014 Yohann Roussel <yroussel@google.com> Merge "Declare target to allow compilation to Jack files."
e4067e0dadc80141cee1119dd5184227f23840b8 04-Dec-2014 Deepanshu Gupta <deepanshu@google.com> am 0407e185: am 9247e323: am 154cfd7a: am 7dd11bd0: am ca15c415: Merge "Add tzdata to SDK build" into lmp-dev

* commit '0407e185d7ff7e46f735f9be739096daaf3625d3':
Add tzdata to SDK build
0407e185d7ff7e46f735f9be739096daaf3625d3 04-Dec-2014 Deepanshu Gupta <deepanshu@google.com> am 9247e323: am 154cfd7a: am 7dd11bd0: am ca15c415: Merge "Add tzdata to SDK build" into lmp-dev

* commit '9247e32376b0f1d715f176317d15e9c1f1fdc34a':
Add tzdata to SDK build
154cfd7a55e432f38c2550cecc2e142fd8d8d782 04-Dec-2014 Deepanshu Gupta <deepanshu@google.com> am 7dd11bd0: am ca15c415: Merge "Add tzdata to SDK build" into lmp-dev

* commit '7dd11bd0664f7e43c049eba632e390451ddeb64d':
Add tzdata to SDK build
ca15c4153285d2eb587b0d026c47f57ff36d2fe1 03-Dec-2014 Deepanshu Gupta <deepanshu@google.com> Merge "Add tzdata to SDK build" into lmp-dev
56e258d2ebbed7407845022b5eefafb2e114f37c 22-Nov-2014 Trevor Johns <trevorjohns@google.com> am 0b1eeb9e: am 9445329c: am 6276d0ac: am d9911fa7: am cdf2a929: am 82ea8a02: Add WatchFace sample to sdk.atree

* commit '0b1eeb9e81d5133b63082b5464daf0747532dddb':
Add WatchFace sample to sdk.atree
0b1eeb9e81d5133b63082b5464daf0747532dddb 21-Nov-2014 Trevor Johns <trevorjohns@google.com> am 9445329c: am 6276d0ac: am d9911fa7: am cdf2a929: am 82ea8a02: Add WatchFace sample to sdk.atree

* commit '9445329cd92b16a48c25ffce870021fdeaa0560a':
Add WatchFace sample to sdk.atree
6276d0ac33299e1f3c3d96865ec9c1c7abc9cb03 21-Nov-2014 Trevor Johns <trevorjohns@google.com> am d9911fa7: am cdf2a929: am 82ea8a02: Add WatchFace sample to sdk.atree

* commit 'd9911fa7af9f185e39a9e2d8fb4882a65903d9e5':
Add WatchFace sample to sdk.atree
a16c2df188b5718079aac57349cf99b0b73c3fdc 21-Nov-2014 Deepanshu Gupta <deepanshu@google.com> Add tzdata to SDK build

Bundle tzdata with SDK, needed by LayoutLib.

Bug: http://b.android.com/79160
Change-Id: Ibdd13ee4dddaf4881aee9f0d5de8e6bccf7c512d
dk.atree
82ea8a020f864d5ff59f0bb66c0400e673a2ae7a 21-Nov-2014 Trevor Johns <trevorjohns@google.com> Add WatchFace sample to sdk.atree

Change-Id: I24a3e34674a02c0909f5cea60ea9465f4f3395f2
dk.atree
07382d51075f84883b92ba5d6ffbe0eeb504f4b8 14-Nov-2014 Trevor Johns <trevorjohns@google.com> am e140f8dd: am c3c6324e: am f78c6348: am f83bd1f8: am 41478596: am c6b0eb1a: Merge "Revert "sdk.atree: Disable Wear samples for lmp branches"" into lmp-docs

* commit 'e140f8ddce04e4313e7d12d94ae781ab90e17947':
Revert "sdk.atree: Disable Wear samples for lmp branches"
e140f8ddce04e4313e7d12d94ae781ab90e17947 13-Nov-2014 Trevor Johns <trevorjohns@google.com> am c3c6324e: am f78c6348: am f83bd1f8: am 41478596: am c6b0eb1a: Merge "Revert "sdk.atree: Disable Wear samples for lmp branches"" into lmp-docs

* commit 'c3c6324ebeaa17a0975f5acf9f129382808086d5':
Revert "sdk.atree: Disable Wear samples for lmp branches"
f78c6348f7a7aa556cd6805432bdd17d8197e565 13-Nov-2014 Trevor Johns <trevorjohns@google.com> am f83bd1f8: am 41478596: am c6b0eb1a: Merge "Revert "sdk.atree: Disable Wear samples for lmp branches"" into lmp-docs

* commit 'f83bd1f88165b73f122a769c4366083f84ff9e28':
Revert "sdk.atree: Disable Wear samples for lmp branches"
41478596aedb31e43565f1a085803d72d0f8fd59 13-Nov-2014 Trevor Johns <trevorjohns@google.com> am c6b0eb1a: Merge "Revert "sdk.atree: Disable Wear samples for lmp branches"" into lmp-docs

* commit 'c6b0eb1ac163fb65c17b397600079748c4d3901b':
Revert "sdk.atree: Disable Wear samples for lmp branches"
c6b0eb1ac163fb65c17b397600079748c4d3901b 13-Nov-2014 Trevor Johns <trevorjohns@google.com> Merge "Revert "sdk.atree: Disable Wear samples for lmp branches"" into lmp-docs
b124012eac0749ce1df3b6928272d70ce6ff2f99 13-Nov-2014 Trevor Johns <trevorjohns@google.com> Revert "sdk.atree: Disable Wear samples for lmp branches"

This reverts commit fcd28181a15ebe95724fe096a8b5198c964b0d7f.

Change-Id: I9e76020676b194917f98c5f8c4ce8c6d6fe6cf5e
dk.atree
400208abf83476dd9530930136f3dd85bc08dd3c 13-Nov-2014 Trevor Johns <trevorjohns@google.com> am 716f9ff5: am 0161ae54: am 705cf850: am 13ce376e: am dff4d5d4: Merge "Add two new samples." into lmp-docs

* commit '716f9ff5a9b69b85ec9a92f63e10d8177acb7185':
Add two new samples.
0161ae549a7a28e1f71c91b82e667c3af0bcdf37 12-Nov-2014 Trevor Johns <trevorjohns@google.com> am 705cf850: am 13ce376e: am dff4d5d4: Merge "Add two new samples." into lmp-docs

* commit '705cf8509d651773275e293c941bf7046074ec87':
Add two new samples.
13ce376eea001a9942dc418323c3fd2980cbf299 12-Nov-2014 Trevor Johns <trevorjohns@google.com> am dff4d5d4: Merge "Add two new samples." into lmp-docs

* commit 'dff4d5d4fd5d06ed281467bff606b51c1afa380b':
Add two new samples.
dff4d5d4fd5d06ed281467bff606b51c1afa380b 12-Nov-2014 Trevor Johns <trevorjohns@google.com> Merge "Add two new samples." into lmp-docs
876d20832921c9f7d64c454a52c000322a1786a8 12-Nov-2014 Renato Mangini <mangini@google.com> Add two new samples.

Added MessagingServices and MediaBrowserService to sdk build.

Bug: 18323953
Change-Id: I6b2d4caae38a42ec2a6673a5b6c02c7f5a21b868
dk.atree
83efd5e421870602f3da5c8fa82a606687bfcc27 08-Sep-2014 Yohann Roussel <yroussel@google.com> Declare target to allow compilation to Jack files.

(cherry picked from commit d45df2b75a37813ff03ae79a62c76f9dca7a0003)

Change-Id: I091ef988aa395ff9cf28dbbe4c1834f6c1ba183b
uild_android_stubs.mk
dfc8899c9e33056027b1999c2c4dc290c0290bcb 12-Nov-2014 Trevor Johns <trevorjohns@google.com> am a25be96a: am 8488cdb6: am 5d84789a: am 062a2d1c: am fcd28181: sdk.atree: Disable Wear samples for lmp branches

* commit 'a25be96a521c9d01c031bdad084ead867bfb140c':
sdk.atree: Disable Wear samples for lmp branches
8488cdb6643fba3734244cf486a4ebacd2c09a97 12-Nov-2014 Trevor Johns <trevorjohns@google.com> am 5d84789a: am 062a2d1c: am fcd28181: sdk.atree: Disable Wear samples for lmp branches

* commit '5d84789a68a96237efad9e911dfd97c8d4a85103':
sdk.atree: Disable Wear samples for lmp branches
062a2d1cb9322b6e720e9942565ad152a08ad4e8 12-Nov-2014 Trevor Johns <trevorjohns@google.com> am fcd28181: sdk.atree: Disable Wear samples for lmp branches

* commit 'fcd28181a15ebe95724fe096a8b5198c964b0d7f':
sdk.atree: Disable Wear samples for lmp branches
5e44c8833f54026fca6a821577cebdef086ee356 11-Nov-2014 Adam Lesinski <adamlesinski@google.com> am 94527b09: am ed6aaf3f: Merge "Add split-select tool to SDK build." into lmp-mr1-dev

* commit '94527b094fbcbf73ce00ecfcdc2ee31aa74ccd1e':
Add split-select tool to SDK build.
fcd28181a15ebe95724fe096a8b5198c964b0d7f 06-Nov-2014 Trevor Johns <trevorjohns@google.com> sdk.atree: Disable Wear samples for lmp branches

Wear samples are currently generated for the klp-modular branch only.

Change-Id: I127a75d171a31f334c5006b6ce251ff1d4f35f42
dk.atree
d155da9790f28260f77f60fafdfb85c10c42a93b 04-Nov-2014 Adam Lesinski <adamlesinski@google.com> Add split-select tool to SDK build.

Change-Id: I3889cb62587cdd8479cd91cee2412703f90cd91c
roduct_sdk.mk
dk-windows-x86.atree
dk.atree
ools/windows_sdk.mk
2dcf807247243e0fd0c0e14f943924db138c86b4 01-Nov-2014 Xavier Ducrohet <xav@google.com> am d150e285: am 4aceb725: am 754cfeb6: am 8641d4da: Move mulit-dex files around.

* commit 'd150e285b5097fea8c5e2e7015e723437daf7f9d':
Move mulit-dex files around.
4aceb7250d209b848b44a64984953e0d45c50b3e 01-Nov-2014 Xavier Ducrohet <xav@google.com> am 754cfeb6: am 8641d4da: Move mulit-dex files around.

* commit '754cfeb6f7baf2e5499959ac439a8a95400a9974':
Move mulit-dex files around.
8641d4dada2166c116c7663e33f47b297993038e 31-Oct-2014 Xavier Ducrohet <xav@google.com> Move mulit-dex files around.

This allows the mainDexClasses to work by
finding shrinkedAndroid.jar and proguard (from
the SDK Tools folder) correctly.

Change-Id: Ib3d85f775876b8a487af04bd072f6d8877f31d3b
dk-darwin-x86.atree
dk-linux-x86.atree
dk-windows-x86.atree
dk.atree
bf541eb5107f246782a9ce88f5a460ecb927b851 31-Oct-2014 Xavier Ducrohet <xav@google.com> am f75191cb: am 0d574614: am 25907e2a: am 8361bb0d: Update build-tools and support for multidex.

* commit 'f75191cb3e61886f6666ec238c983263b75be91e':
Update build-tools and support for multidex.
a008a5698a44191f0e5ed4693b9bc06012441727 31-Oct-2014 Xavier Ducrohet <xav@google.com> am 2c799e08: am e67c313e: am 9ccbed21: am 86d28ad8: Add jack/jill/multidex lib to build-tools.

* commit '2c799e0856e4bd9b7ec5071f08fdf074750d05cc':
Add jack/jill/multidex lib to build-tools.
0d574614cf568ec34e0804e6f7210a2d1a502d7f 29-Oct-2014 Xavier Ducrohet <xav@google.com> am 25907e2a: am 8361bb0d: Update build-tools and support for multidex.

* commit '25907e2a994aacf2d45743f23bb8adc54a3d2d44':
Update build-tools and support for multidex.
e67c313ea0781650b7a31308dbe2cc5919425a3e 29-Oct-2014 Xavier Ducrohet <xav@google.com> am 9ccbed21: am 86d28ad8: Add jack/jill/multidex lib to build-tools.

* commit '9ccbed2191c8b8dcca14e69e93b528c5f675f9c4':
Add jack/jill/multidex lib to build-tools.
8361bb0dfa16a3acc7752324e4690598ae0f2320 29-Oct-2014 Xavier Ducrohet <xav@google.com> Update build-tools and support for multidex.

Add the script to run multi-dex manually in build tools
Update non-maven support package to .0.1 to release a version
with the fixed multi-dex support lib.

Change-Id: I78c84e0d999855f9fc20fadfa21647e570a9f8c9
dk-darwin-x86.atree
dk-linux-x86.atree
dk-windows-x86.atree
dk.atree
291e86fb92fd53fb3e2d15fd553280435b5a8242 29-Oct-2014 Adam Lesinski <adamlesinski@google.com> am 23dfdd09: am 56fd4241: Merge "Enable building gtest for Windows" into lmp-mr1-dev

* commit '23dfdd098448e193d63b0dcc4e5ba00b51ca2cff':
Enable building gtest for Windows
86d28ad8c192084fea8926a56fec732d99cfcdbc 28-Oct-2014 Xavier Ducrohet <xav@google.com> Add jack/jill/multidex lib to build-tools.

Change-Id: Id8aad3a7ea808c5b2d1dd5c008f6202aefb7ef3b
dk.atree
42aa7939a61ebe6b1d96a8145ba929f7f194e16d 21-Oct-2014 Adam Lesinski <adamlesinski@google.com> Enable building gtest for Windows

Change-Id: Ib4a865ca7716084498eff32e057865c0ffbced46
indows_sdk_whitelist.mk
cd7097298d42eda1f31d3d65332408cdc18c5747 22-Oct-2014 Joe Fernandez <joefernandez@google.com> am 35828e85: am db9b560e: am d74a44da: am de3f94a0: Merge "Deletes the wear samples that have been commited in the wrong place. Updates the location of wear samples in sdk.atree Adds SpeedTracker wear sample (https://googleplex-android-review.git.corp.google.com/56460

* commit '35828e85bbb1a58d4dde4caef35d506b8ecde1b1':
Deletes the wear samples that have been commited in the wrong place. Updates the location of wear samples in sdk.atree Adds SpeedTracker wear sample (https://googleplex-android-review.git.corp.google.com/564608)
773435f9f07d7d85838b5e540ba56e99f289adbf 22-Oct-2014 Joe Fernandez <joefernandez@google.com> am e054c2b3: am 705a1bb4: am d42d6553: am c789ef84: Merge "sdk.atree: Move JobScheduler sample from \'ui/views\' to \'background\'" into lmp-dev

* commit 'e054c2b35ffcfe643107d65073b6615fde7af828':
sdk.atree: Move JobScheduler sample from 'ui/views' to 'background'
de3f94a00075fa1c24ac66db2e8c743bd9f46eed 22-Oct-2014 Joe Fernandez <joefernandez@google.com> Merge "Deletes the wear samples that have been commited in the wrong place. Updates the location of wear samples in sdk.atree Adds SpeedTracker wear sample (https://googleplex-android-review.git.corp.google.com/564608)" into lmp-dev
83642406f84c147457c6af6cb5b40ae56ea091f4 15-Oct-2014 Takeshi Hagikura <thagikura@google.com> Deletes the wear samples that have been commited in the wrong place.
Updates the location of wear samples in sdk.atree
Adds SpeedTracker wear sample (https://googleplex-android-review.git.corp.google.com/564608)

Change-Id: Icd27de8c7e72ed9508aa1350a0784d627e072154
dk.atree
4b16c84fb076ea6e2ba77a542bfa29d60e3c9ad9 17-Oct-2014 Trevor Johns <trevorjohns@google.com> am c60b2dd6: am 36274ac5: Add additional samples for L to sdk.atree

* commit 'c60b2dd6b5982029b7115da777a1e1eefb2bab53':
Add additional samples for L to sdk.atree
f70fdf3c80ab71304a6640d1bdf1daeaa016f0c9 17-Oct-2014 Trevor Johns <trevorjohns@google.com> sdk.atree: Move JobScheduler sample from 'ui/views' to 'background'

Change-Id: Ibecdf48a2977ce52b198d626947ba71eba1ad2b9
dk.atree
cc763b72d5d630c0212baf2f9536ac51dd068e19 17-Oct-2014 Trevor Johns <trevorjohns@google.com> am 36274ac5: Add additional samples for L to sdk.atree

* commit '36274ac53dfcef9661c5215e9fabf7a6501e0c64':
Add additional samples for L to sdk.atree
84f0d412b6d1e379d296bc5e23cb5cc25ae5d30f 17-Oct-2014 Trevor Johns <trevorjohns@google.com> am 4e09738a: am 66b6f721: Merge "Update sdk.atree and samples_source.prop_template for L SDK release" into lmp-dev

* commit '4e09738a8684cf2ba5ed111764d7804ada2a4298':
Update sdk.atree and samples_source.prop_template for L SDK release
339006dcbd4b15970b048bbf36f36db76fe0c14d 17-Oct-2014 Trevor Johns <trevorjohns@google.com> am 72687bd8: am ca8bc22a: sdk.atree: Fix typo and remove legacy BluetoothChat sample

* commit '72687bd8a7d3629b2ceb3a9fa1cefcd4bbdf4d66':
sdk.atree: Fix typo and remove legacy BluetoothChat sample
36274ac53dfcef9661c5215e9fabf7a6501e0c64 17-Oct-2014 Trevor Johns <trevorjohns@google.com> Add additional samples for L to sdk.atree

- RecyclerView
- CardView
- LNotifications
- DrawableTinting
- InterpolatorPlayground
- PdfRendererBasic
- FloatingActionButtonBasic
- RevealEffectBasic

Change-Id: Icea2e207311d60ad72c349c3a6a17439526661af
dk.atree
e3e839e52b757b29da2674a4cebbb2969c977959 17-Oct-2014 Trevor Johns <trevorjohns@google.com> am 66b6f721: Merge "Update sdk.atree and samples_source.prop_template for L SDK release" into lmp-dev

* commit '66b6f721b7e20911f0764720346caca5c77fb22b':
Update sdk.atree and samples_source.prop_template for L SDK release
8176b9067fcd0f15d331c007905f165a5966d617 17-Oct-2014 Trevor Johns <trevorjohns@google.com> am ca8bc22a: sdk.atree: Fix typo and remove legacy BluetoothChat sample

* commit 'ca8bc22a50c47517e7731a1762ffe39e105462b5':
sdk.atree: Fix typo and remove legacy BluetoothChat sample
66b6f721b7e20911f0764720346caca5c77fb22b 17-Oct-2014 Trevor Johns <trevorjohns@google.com> Merge "Update sdk.atree and samples_source.prop_template for L SDK release" into lmp-dev
b21dca0c15f8e0229016a0426ef08a2863e86709 17-Oct-2014 Trevor Johns <trevorjohns@google.com> Update sdk.atree and samples_source.prop_template for L SDK release

- Add new samples to sdk.atree
- Bump revision for samples_source.prop_template

Change-Id: I592d2457502dbd2458dec7879c5cea7320743378
dk.atree
8dd5fc0f143058b3c56dbcc300f7c6f566dd5cbc 16-Oct-2014 Trevor Johns <trevorjohns@google.com> am 70c55867: am d991bed6: Resolved conflicts for merge of \'9875ec66\' into lmp-dev

* commit '70c55867bc6f30301a660331bbd28948a9ded734':
Add samples to sdk.atree
3beb9eae9a43c579a376b4256e07ff97852ed258 16-Oct-2014 Trevor Johns <trevorjohns@google.com> am d991bed6: Resolved conflicts for merge of \'9875ec66\' into lmp-dev

* commit 'd991bed6f11b830616a967fde54f8d4f1e86eef0':
Add samples to sdk.atree
ca8bc22a50c47517e7731a1762ffe39e105462b5 16-Oct-2014 Trevor Johns <trevorjohns@google.com> sdk.atree: Fix typo and remove legacy BluetoothChat sample

- Fixed typo: Renamed "MediaEffect" sample to "MediaEffects"
- Removed legacy BluetoothChat sample, since the templatized version
has now been checked in.

Change-Id: I1b5e48f41a3daa171d70bac765cfba2ece9dd088
dk.atree
d991bed6f11b830616a967fde54f8d4f1e86eef0 16-Oct-2014 Trevor Johns <trevorjohns@google.com> Resolved conflicts for merge of '9875ec66' into lmp-dev

Conflicts:
build/sdk.atree

Change-Id: Ie195fc75425ccb4ad36e3267627ae66619380505
d36c4dd6464e1bd8e7fb26d2fc638f63030bcaea 03-Oct-2014 Xavier Ducrohet <xav@google.com> am 21af667f: am 3c0cd8cf: Merge "Package libc++.so in the build-tools." into lmp-dev

* commit '21af667faeba1e626e79eb823ea604652dc17cf2':
Package libc++.so in the build-tools.
cb002a83be617ac906514076dc1dc306d0236e5d 03-Oct-2014 Xavier Ducrohet <xav@google.com> am 3c0cd8cf: Merge "Package libc++.so in the build-tools." into lmp-dev

* commit '3c0cd8cf154320a375f971ba1ce3be4497130837':
Package libc++.so in the build-tools.
d515d6c5c4979d5b4856f926187b834cf6b3cd35 02-Oct-2014 Narayan Kamath <narayan@google.com> resolved conflicts for merge of 3f2caae2 to lmp-mr1-dev-plus-aosp

Change-Id: If9f3110e57131f13c55a87169dbdc2cd8cf74660
25feba69803965b2364793057f4c5a0247556a1f 02-Oct-2014 Xavier Ducrohet <xav@google.com> Package libc++.so in the build-tools.

This is needed by llvm-rs-cc.

Bug: 17584627
Change-Id: Id0ee90ccead26d3078f3f25022391d6866152203
dk-darwin-x86.atree
dk-linux-x86.atree
513c112f912494bc81336149014403e65c9ab1d3 02-Oct-2014 Stephen Hines <srhines@google.com> resolved conflicts for merge of 3f2caae2 to lmp-dev-plus-aosp

Change-Id: I540734e15e984d12b81cc47d90430e40cc3d2397
3f2caae206b5d44e83d44b6753ac736171fab9cb 30-Sep-2014 Stephen Hines <srhines@google.com> Restore the ability to build RS-related binaries on Windows.

Bug: 14416410

This change reverts two prior commits (listed below):

Revert "Use renderscript prebuilts for windows."
This reverts commit ebacf02e88f7ec2bf77b671d14e1d524a2786e1b.

Revert "Temporarily disable rs/bcc in win_sdk"
This reverts commit c63c2d31ba050d61594aaa317b6d32f5627ce6fc.
dk-windows-x86.atree
ools/windows_sdk.mk
a9b5dd3bb321cdeea650e4116e7fa69d0091eeef 20-Sep-2014 Naoki Ishihara <naoki@google.com> Add samples to sdk.atree

Change-Id: I34ee63184f2dea6db253bf2ae2b671abb9ab6c4a
dk.atree
a5739c851cc014a20425583fbe7c6dea59098888 12-Sep-2014 Raphael Moll <raphael@google.com> am 130967f3: Merge "SDK Addon multi-sys-img support, part 2." into lmp-dev

* commit '130967f3d3f34fc656dc43e43087d0a0c3ae5439':
SDK Addon multi-sys-img support, part 2.
0d6c5e8ec6178206a39f1688ad4b006b0b656a78 26-Aug-2014 Leandro Gracia Gil <leandrogracia@google.com> am c32e9081: am 4123e088: Merge "Add the protobuf compiler binary to the Windows SDK build."

* commit 'c32e90813965eab51f1494cfabb9d3457c938d85':
Add the protobuf compiler binary to the Windows SDK build.
4123e0886b69fd7ecb91abe1c4ac9bfca1de52e7 26-Aug-2014 Leandro Gracia Gil <leandrogracia@google.com> Merge "Add the protobuf compiler binary to the Windows SDK build."
fa090e240f319e8c7afdfd705f928f9504c95d09 22-Aug-2014 Raphael Moll <raphael@google.com> SDK Addon multi-sys-img support, part 2.

Change the sdk_repo rule to generate a system-image zip package and its
corresponding XML for the addon.

Change-Id: I3c2318d2085362f62784415713b44cc8fe97ea9c
ools/mk_sdk_repo_xml.sh
ools/sdk_repo.mk
00b44e517b9d93360cff32f9b8d4c34b4939a250 18-Aug-2014 Ying Wang <wangying@google.com> Use arm64 kernel-qemu in sdk-android-arm64-v8a.atree.

Bug: 17105204
Change-Id: I80dcad8198926dd0b758d65bd8704eb4c6b39e8d
dk-android-arm64-v8a.atree
e522c95f8f76277624e6758864501c4ad4a167d2 18-Aug-2014 Ying Wang <wangying@google.com> Use arm64 kernel-qemu in sdk-android-arm64-v8a.atree.

Bug: 17105204
Change-Id: I80dcad8198926dd0b758d65bd8704eb4c6b39e8d
dk-android-arm64-v8a.atree
653fe8eb043b7d026f09474f5149d6188cc490e9 29-Jul-2014 Leandro Gracia Gil <leandrogracia@google.com> Add the protobuf compiler binary to the Windows SDK build.

Change-Id: I0acca9fc39b8b5528a1ca4bf25b0bacb32b515e2
ools/windows_sdk.mk
indows_sdk_whitelist.mk
06a0ec0b97451c9b31afb646cb47c557bf8459cb 22-Jul-2014 Ying Wang <wangying@google.com> new installation path of apks.

To fix the SDK build.

Change-Id: I6c401e791bd59367bbd058f323db0d94bf623db5
dk.atree
6fee567b2fea8f4728a9c4ec172ebaf60ceef2cf 16-Oct-2013 Maurice Chu <mochu@google.com> Move multidex support library

Multidex is being moved from frameworks/support/multidex to
frameworks/multidex.

Bug: 10674263

(cherry picked from commit 7b433ee4e4d8a515d2a99f36c6e1fbb655fc9063)

Change-Id: If33387af7b58da2f258eba1240a911483daa9c7e
dk.atree
567a46bf22d89a6e7f566f11a9826cc9784e36d8 18-Jul-2014 Ying Wang <wangying@google.com> 3rd attempt to build and store android_system.jar in sdk builds.

Change-Id: Ica053e3ef6e3190ab4dcc32b3b7d06fc4c619884
ndroid.mk
c39b6ebb2f84a8553935d616c1a49a6a486e6c16 18-Jul-2014 Ying Wang <wangying@google.com> "sdk" is not necessarily on the linux command line.

Bug: 16208466
Change-Id: I29f8763e9763d2b482744d0c7a74c122a299d03b
ndroid.mk
b16fd5a5f4405bea5fa00b61385deb47b1c55b20 06-Sep-2013 Yohann Roussel <yroussel@google.com> Add res folder to multidex SDK projects.

This will fix an error when importing thoses projects with ADT.

(cherry picked from commit 6fa1156b3b98e72952e1281b66af9867205e1954)

Change-Id: Ibcd570a3f4f3bd6c8c4fd263d2d18e2cec18b787
dk.atree
96dc8db6e5d5da58b0f733e11773aef3ec33f171 04-Sep-2013 Yohann Roussel <yroussel@google.com> android-support-multidex-instrumentation in SDK.

(cherry picked from commit 6f57b24889d3bfc2ac1368de53861a4385b50add)

Change-Id: Ic8e609c0025d86c873161b28d99bb0da2b6c2d27
ndroid.mk
dk.atree
ef0e4f5a3bffd94e05cdaf0d774a61de9f2f2320 22-Aug-2013 Yohann Roussel <yroussel@google.com> Add multidex ADT project to SDK.

(cherry picked from commit a6ca3cf29f8e5b3db1d23aa8ffaa35464d4c1019)

Change-Id: I44cf397dbc5649d9d701e2f8524a322d74c2aaa6
dk.atree
604bf1f1857801b6404049383609b0aee7a5f8d9 21-Aug-2013 Yohann Roussel <yroussel@google.com> Include android-support-multidex in SDK libs.

(cherry picked from commit 9e27887b60e2e3ae1ea94a8c093e6e493f72c8e4)

Change-Id: Ieb2901a633a687927a0c5a5db6d17896c3b86449
ndroid.mk
c41276ede6cb95658a3e8cd583df9d946a75cca2 15-Jul-2014 Ying Wang <wangying@google.com> Build and store android_system.jar.

Bug: 16208466
Change-Id: Ibc078339dff56233a9f8f11228f5299ef389f967
ndroid.mk
4391853b56b7fb749d2bb959151d92bd9e241b6c 11-Jul-2014 Ying Wang <wangying@google.com> Fix win_sdk build.

Change-Id: I59ac4789b462f356811d0f7dc20d850bbc16dfaf
indows_sdk_whitelist.mk
6c3cef6e7022157abf2e2fe3d8fdf39f5e067fd0 24-Jun-2014 Griff Hazen <griff@google.com> am b3ae9165: am 96f19c45: Sample showing how to embed a wearable app into a phone

* commit 'b3ae91650a49da7453a95ab8c72461d4897c5ccb':
Sample showing how to embed a wearable app into a phone
59167edab097f93307360043e4f8c2d299ec29fe 24-Jun-2014 Dan Aminzade <monzy@google.com> am 2c603516: am 9fd71d61: Add new SynchronizedNotifications sample.

* commit '2c6035162e1509651871c5d88ff87c434ba6c56e':
Add new SynchronizedNotifications sample.
b3ae91650a49da7453a95ab8c72461d4897c5ccb 24-Jun-2014 Griff Hazen <griff@google.com> am 96f19c45: Sample showing how to embed a wearable app into a phone

* commit '96f19c456f3eafea5ab267b13dfceae1c75964eb':
Sample showing how to embed a wearable app into a phone
2c6035162e1509651871c5d88ff87c434ba6c56e 24-Jun-2014 Dan Aminzade <monzy@google.com> am 9fd71d61: Add new SynchronizedNotifications sample.

* commit '9fd71d61f262bfe238b58c60fab6e6494b028356':
Add new SynchronizedNotifications sample.
96f19c456f3eafea5ab267b13dfceae1c75964eb 24-Jun-2014 Griff Hazen <griff@google.com> Sample showing how to embed a wearable app into a phone

With a keystore present.

Change-Id: I3693f8c4b7ff09fe2fc3023bfe561b929333b8a4
dk.atree
9fd71d61f262bfe238b58c60fab6e6494b028356 23-Jun-2014 Dan Aminzade <monzy@google.com> Add new SynchronizedNotifications sample.

This sample demonstrates how to use DataItems to construct linked
phone- and wearable-side notifications.

Change-Id: I6defa7fad671ba2ec0de25c8913abd66d07846a2
dk.atree
d732021a676b4563520bd80e9b090ecaec84ff19 23-Jun-2014 Xavier Ducrohet <xav@google.com> am 3b024f09: Fix packaging of cardview for non-maven extra package.

* commit '3b024f09a4e7c1bb8a386894de6073e720fed257':
Fix packaging of cardview for non-maven extra package.
3b024f09a4e7c1bb8a386894de6073e720fed257 23-Jun-2014 Xavier Ducrohet <xav@google.com> Fix packaging of cardview for non-maven extra package.

bug: 15770129
Change-Id: I26318b11bf0862c0796729740403c3d729e87ef6
dk.atree
73d0a3759a97d0c242a0448957d344de9c412c47 23-Jun-2014 Mark Renouf <mrenouf@google.com> am 2cba0745: Adds a GridViewPager sample wearable app

* commit '2cba0745a46ee260bfbe303fa89386ab5348604c':
Adds a GridViewPager sample wearable app
2cba0745a46ee260bfbe303fa89386ab5348604c 22-Jun-2014 Mark Renouf <mrenouf@google.com> Adds a GridViewPager sample wearable app

Change-Id: I014670493bb54bc1a6e3c1ecda716b9ea8d83412
dk.atree
9872c0c7c0383c0d940bab2862c9468af26ee638 22-Jun-2014 Griff Hazen <griff@google.com> Move all wearable samples to development/samples/wearable

Update build.gradle to compile them all, and remove
gradle stopships.

Copied from vendor/google_clockwork klp-modular-dev as of:
01930cc85bc1ba974a412db7d3c9d17387702e16

Bug: 15591212
Bug: 15264403

Change-Id: I4d05c35c995e675d92039b1dfb2a33e454285af5
dk.atree
ac21950368a56dbf1a378211e106d7c54056e4cc 21-Jun-2014 Xavier Ducrohet <xav@google.com> Add more tools to platform-tools

- etc1tool
- hprof-conv
- dmtracedump

These are platform tools rather than SDK Tools.

Change-Id: I75eb8ea5404ef7ecf7104ecc9129cf439df0e51c
dk-windows-x86.atree
dk.atree
c788c7955d78de08edb50abcaf621eea0b85b51a 23-Jun-2014 Mark Renouf <mrenouf@google.com> am 73d0a375: am 2cba0745: Adds a GridViewPager sample wearable app

* commit '73d0a3759a97d0c242a0448957d344de9c412c47':
Adds a GridViewPager sample wearable app
7894d8eeac2a05b1d5e0706f306a3b08f5b61a7a 22-Jun-2014 Ji-Hwan Lee <jihwan@google.com> am 5ece703b: Merge "Fix sdk build, really this time" into klp-modular-dev-plus-aosp

* commit '5ece703b190205243f9601a3eddb287ec808a084':
Fix sdk build, really this time
106d4ca41d0a95142c70f7611a23f8dddcdd0f5d 22-Jun-2014 Griff Hazen <griff@google.com> am 5da8165a: am 9872c0c7: Move all wearable samples to development/samples/wearable

* commit '5da8165a4600c62df835e9f59fc61e2d35c7eae4':
Move all wearable samples to development/samples/wearable
5da8165a4600c62df835e9f59fc61e2d35c7eae4 22-Jun-2014 Griff Hazen <griff@google.com> am 9872c0c7: Move all wearable samples to development/samples/wearable

* commit '9872c0c7c0383c0d940bab2862c9468af26ee638':
Move all wearable samples to development/samples/wearable
620a756fcc277617845768b6386d731df1cb64ed 22-Jun-2014 Xavier Ducrohet <xav@google.com> am ac219503: Add more tools to platform-tools

* commit 'ac21950368a56dbf1a378211e106d7c54056e4cc':
Add more tools to platform-tools
1ad24024b3e08805636217d18133c71106934904 21-Jun-2014 Griff Hazen <griff@google.com> am e46688e3: am 2def7d2a: Add first wearable sample to sdk atree

* commit 'e46688e36ed645036d7283be54a9e7a5da311995':
Add first wearable sample to sdk atree
e46688e36ed645036d7283be54a9e7a5da311995 21-Jun-2014 Griff Hazen <griff@google.com> am 2def7d2a: Add first wearable sample to sdk atree

* commit '2def7d2a2a0e9eacf49819c9cba3e5b188b061c3':
Add first wearable sample to sdk atree
b7911835331d1a96c0f524947daa652ad813ec1a 21-Jun-2014 Ji-Hwan Lee <jihwan@google.com> am efbbd1d9: Merge "Fix sdk builds" into klp-modular-dev-plus-aosp

* commit 'efbbd1d98b2e16b8f0e2413460dcde92c77faf5a':
Fix sdk builds
043a8dd414d88ef39176688344fe7ff160080985 21-Jun-2014 Xavier Ducrohet <xav@google.com> am b931fca7: resolved conflicts for merge of f78598f7 to klp-modular-dev-plus-aosp

* commit 'b931fca7ebde805e8f070e25f5d8bda774a4614b':
Fix repo script to ignore tools. DO NOT MERGE.
b931fca7ebde805e8f070e25f5d8bda774a4614b 21-Jun-2014 Xavier Ducrohet <xav@google.com> resolved conflicts for merge of f78598f7 to klp-modular-dev-plus-aosp

Change-Id: I8657c95b169320957629b492fef11994227b3c56
2def7d2a2a0e9eacf49819c9cba3e5b188b061c3 20-Jun-2014 Griff Hazen <griff@google.com> Add first wearable sample to sdk atree

Bug: 15591212

Change-Id: Ic74e8e821d7941d403dc4d83aa33f23cf671c226
dk.atree
4a71ff571da8ceda5cac2874c8342438b689bf48 20-Jun-2014 Trevor Johns <trevorjohns@google.com> am ee811814: Update sdk.atree with new samples for LMP Preview release

* commit 'ee8118144402226bb3fda9c78a27de43140e92ad':
Update sdk.atree with new samples for LMP Preview release
3f3f34dc0e2da2330b5bbd7520450247aa31fca6 03-Jun-2014 Raphael Moll <ralf@android.com> Move SDK system-image source.prop_templates in their own folder. DO NOT MERGE.

This allows to have a different rule to generate the source.properties
based on the templates and place them in a directory that depends on
the current target CPU ABI. In turn this prevents the build from
mixing different source.props when building different targets.

Change-Id: I4a1d9f47426c94f376947ddae8be9f5549331616

Conflicts:
build/sdk-android-arm64-v8a.atree
build/sdk-android-x86.atree
build/sdk-android-x86_64.atree
sys-img/images_arm64-v8a_source.prop_template
sys-img/images_x86_64_source.prop_template
ndroid.mk
dk-android-armeabi-v7a.atree
dk-android-armeabi.atree
dk-android-mips.atree
dk-android-x86.atree
ools/sdk_repo.mk
71ad7c8f4ea7278f48e276c2f232c674b20f7384 03-Jun-2014 Raphael Moll <ralf@android.com> Fix SDK repo to prevent mixing different targets. DO NOT MERGE.

This makes sure that sdk-repo-*.zip doesn't exist to
avoid merging into an existing one.

Also fix a warning when generating the repo.xml files.

(cherry picked from commit 4df9f469f710b4eedde9020f7a35534a795edfb1)

Change-Id: I8ad6763ace0d6075a743b99fd65a5ae8b69bf3d5
ools/mk_sdk_repo_xml.sh
ools/sdk_repo.mk
efbf1a3e284f3ede5fc585efcbab8da961d8697b 25-Apr-2014 Raphael Moll <ralf@android.com> SDK: support generating repository XML with latest XSD. DO NOT MERGE.

The latest version of the repository XSD changes:
- archive attributes (os/arch) are now element (host-os)
- system images are not longer in the repository.xml and
get their own XML file.

(cherry picked from commit ea40d2f4c5af9744f7140a31d551a55dade128d9)

Change-Id: Id0363c446014a96a7f78c8e5500fae6092e97dc3
ools/mk_sdk_repo_xml.sh
ools/sdk_repo.mk
f78598f754e97840011c32e39152d4f744632c8c 08-May-2014 Xavier Ducrohet <xav@google.com> Fix repo script to ignore tools. DO NOT MERGE.

(cherry picked from commit d81eb5d83325a3e06e4b41b5c5f8cca5c62d161f)

Change-Id: I7dbd0db25b84a11c36fcd570935357b0e755555c
ools/sdk_repo.mk
ee8118144402226bb3fda9c78a27de43140e92ad 20-Jun-2014 Trevor Johns <trevorjohns@google.com> Update sdk.atree with new samples for LMP Preview release

Change-Id: I6bbafb05b39ee448bbe8f831bbbb58e364851c79
dk.atree
662133ebc41002834c0a8b8a2aac40a5c3ec27b1 20-Jun-2014 Xavier Ducrohet <xav@google.com> am a9d69c6e: Merge "Package custom hardware.ini with armeabi-v7a images." into lmp-preview-dev

* commit 'a9d69c6e2c26fbd5b9a88a970d9af24abd72fa62':
Package custom hardware.ini with armeabi-v7a images.
a9d69c6e2c26fbd5b9a88a970d9af24abd72fa62 20-Jun-2014 Xavier Ducrohet <xav@google.com> Merge "Package custom hardware.ini with armeabi-v7a images." into lmp-preview-dev
7daf61b9b97f6b037dcacddab05149bbc1632cc3 20-Jun-2014 Xavier Ducrohet <xav@google.com> Package custom hardware.ini with armeabi-v7a images.

Change-Id: I60d88374d0caba57f9ab3c589c758d983c099c2f
dk-android-armeabi-v7a.atree
5cd3de1cc6ec5320793160bf87cbab14dc7baf41 21-Jun-2014 Ji-Hwan Lee <jihwan@google.com> Fix sdk builds

Change-Id: Ifca3f430795bf002ecc7bf77b38c2336e578c5fc
ools/sdk_repo.mk
5ece703b190205243f9601a3eddb287ec808a084 22-Jun-2014 Ji-Hwan Lee <jihwan@google.com> Merge "Fix sdk build, really this time" into klp-modular-dev-plus-aosp
e3e3de0cef3bbc6d3059c463a2a6638dba1b1f40 21-Jun-2014 Ji-Hwan Lee <jihwan@google.com> Fix sdk build, really this time

Change-Id: I5cddf63a6dc30dee5185a3a6a4e352c574a87213
ools/sdk_repo.mk
bb6f104abcf5a10935bcd5ab5903497df0710d6f 18-Jun-2014 Xavier Ducrohet <xav@google.com> am 3e36464b: Fix build: include sqlite3 in sdk builds.

* commit '3e36464bbcccb88906be2cf89d1b323aa83e9c0f':
Fix build: include sqlite3 in sdk builds.
c477cf4124446b65e430f841a12aa6d1f3b83b71 18-Jun-2014 Xavier Ducrohet <xav@google.com> am 4049f60a: Fix windows build.

* commit '4049f60aa764817ea0d70b8292b3503e19762839':
Fix windows build.
20edcd3b339c457c0ba278064633e6d45b6ac7be 18-Jun-2014 Xavier Ducrohet <xav@google.com> am ebacf02e: Use renderscript prebuilts for windows.

* commit 'ebacf02e88f7ec2bf77b671d14e1d524a2786e1b':
Use renderscript prebuilts for windows.
3e36464bbcccb88906be2cf89d1b323aa83e9c0f 18-Jun-2014 Xavier Ducrohet <xav@google.com> Fix build: include sqlite3 in sdk builds.

This just enables sqlite3 to be build, doesn't
mean it gets packaged. (still controlled through
the atree).

Change-Id: Idf762427a0832dcb02586393cf92904d61d663db
roduct_sdk.mk
4049f60aa764817ea0d70b8292b3503e19762839 18-Jun-2014 Xavier Ducrohet <xav@google.com> Fix windows build.

Windows build is based on linux and it needs
to delete the linux executable. sqlite3 moved
from tools to platform-tools so we need to delete it
from the right folder.

Change-Id: Ifae3b0e8972ba7ca316e6e8fd7908f6c8c11a271
dk-windows-x86.atree
ebacf02e88f7ec2bf77b671d14e1d524a2786e1b 18-Jun-2014 Xavier Ducrohet <xav@google.com> Use renderscript prebuilts for windows.

Change-Id: Ie487ff571a8552a166742824ba43c4c445c432f5
dk-windows-x86.atree
e263f439b6cffa0fc8cba5462156049e15741331 18-Jun-2014 Xavier Ducrohet <xav@google.com> am 0f0b786b: Move sqlite3 to platform-tools.

* commit '0f0b786b5af31a7794eacc66eedb252d72490d86':
Move sqlite3 to platform-tools.
0f0b786b5af31a7794eacc66eedb252d72490d86 18-Jun-2014 Xavier Ducrohet <xav@google.com> Move sqlite3 to platform-tools.

This was in the SDK tools before but it's really part of
the platform.

Change-Id: I2a88d288aec6fd1556a28db58976fc1c889efd35
dk-windows-x86.atree
dk.atree
c5e962866b4aaeba414a93a6868aadbff7d239d9 18-Jun-2014 Xavier Ducrohet <xav@google.com> am 9a258bce: Revert "Revert "Add cardview to support extra package.""

* commit '9a258bce2cc829e3e80acc4680d7c7fb361f1435':
Revert "Revert "Add cardview to support extra package.""
40c2c69bd8a6fda34a3ed7d78cf53b092b0ffa67 18-Jun-2014 Deepanshu Gupta <deepanshu@google.com> resolved conflicts for merge of c91c719f to klp-modular-dev-plus-aosp

Change-Id: I0c942398f6acecf072da1a2148fbc900a609e870
c91c719f91fe9b24c136469a34e848899e67b11f 18-Jun-2014 Deepanshu Gupta <deepanshu@google.com> am dd2dac36: am edf631de: Package renamed fonts. [DO NOT MERGE]

* commit 'dd2dac3659cad1594ce3a72f10b1216424b62441':
Package renamed fonts. [DO NOT MERGE]
dd2dac3659cad1594ce3a72f10b1216424b62441 18-Jun-2014 Deepanshu Gupta <deepanshu@google.com> am edf631de: Package renamed fonts. [DO NOT MERGE]

* commit 'edf631dee4edd3c44cd4156ccb7974090c89b65d':
Package renamed fonts. [DO NOT MERGE]
de91aa6a87979ab511ecc0847e0bdf46f8685ded 18-Jun-2014 Xavier Ducrohet <xav@google.com> am fffa1541: Revert "Add cardview to support extra package."

* commit 'fffa1541f10acef428b9b370b4b78b55c72fa306':
Revert "Add cardview to support extra package."
9a258bce2cc829e3e80acc4680d7c7fb361f1435 18-Jun-2014 Xavier Ducrohet <xav@google.com> Revert "Revert "Add cardview to support extra package.""

Also add cardview to the list of support lib in
build/Android.mk

This reverts commit fffa1541f10acef428b9b370b4b78b55c72fa306.

Change-Id: I25bf7ce9d42894933f3cbdf2cc8ae2369945b35b
ndroid.mk
dk.atree
fffa1541f10acef428b9b370b4b78b55c72fa306 18-Jun-2014 Xavier Ducrohet <xav@google.com> Revert "Add cardview to support extra package."

This reverts commit 1e396a59756dd9900d1cacb14c1cd07ac4901453.
dk.atree
af91cc72df801e839fab25449a704e9ae1ad334b 17-Jun-2014 Xavier Ducrohet <xav@google.com> am 1e396a59: Add cardview to support extra package.

* commit '1e396a59756dd9900d1cacb14c1cd07ac4901453':
Add cardview to support extra package.
1e396a59756dd9900d1cacb14c1cd07ac4901453 17-Jun-2014 Xavier Ducrohet <xav@google.com> Add cardview to support extra package.

Change-Id: I796857c19ff466d0d84b9c9901273068510c3fb6
dk.atree
06a5de5e8b2844dc7d90a3c4789dad84477a3e22 17-Jun-2014 Xavier Ducrohet <xav@google.com> am 6c9d1af8: Merge "Remove non-ready support libs. DO NOT MERGE." into klp-modular-dev

* commit '6c9d1af8213394eb9458e71f2e6d62c4de716902':
Remove non-ready support libs. DO NOT MERGE.
78e75a9abf5a1e4c592d121e62244deab4aaf851 03-Jun-2014 Ying Wang <wangying@google.com> Build system API stubs.

Run "make android_system_stubs" to build the system API jar file.

Change-Id: I0c221e110683f9315f4082e68ed3835162f91320
ndroid.mk
uild_android_stubs.mk
edf631dee4edd3c44cd4156ccb7974090c89b65d 30-May-2014 Deepanshu Gupta <deepanshu@google.com> Package renamed fonts. [DO NOT MERGE]

PS names of fonts are renamed to include the version number. This change
packages the fonts from the output directory of the script that modifies
the fonts.

Change-Id: I023fb0dfcf50698f80e26b7d476969c453fc4cc7
(cherry picked from commit 4100ca144dda011d3fbf129b5c88c5461e9981fc)
dk.atree
9e66bc405f64a7e0590cc2d9e7092f0c74ab4bd8 12-Jun-2014 Deepanshu Gupta <deepanshu@google.com> am f7449cdb: Merge "Package renamed fonts again." into lmp-preview-dev

* commit 'f7449cdb18aeef440c8b1e2d7e99ec9970fc7f8a':
Package renamed fonts again.
b4654552c5e02b1a4fa3b13c74bd50a614b61ed0 11-Jun-2014 Raphael Moll <ralf@android.com> am bbd9b96c: am 8235126e: am 9649c415: Merge "Change api-versions.xml generator source order."

* commit 'bbd9b96cd10864554c5f3f9ab5e0e1bbf43442b6':
Change api-versions.xml generator source order.
3016ff6d0a009eb21d16211884610af8a4fa5750 11-Jun-2014 Ying Wang <wangying@google.com> am c8ed8c25: am bcfa67e5: am 1e1b10ac: Merge "Switch to SDK_HOST_ARCH"

* commit 'c8ed8c25bc796cd82fb1df0ea100e320a542eeb3':
Switch to SDK_HOST_ARCH
b6fbb4d0c9274835d31bcec975b6f37a6443956b 11-Jun-2014 Raphael Moll <ralf@android.com> am 9cec99d9: am ea21b816: am 28748be7: Merge "Generate api-versions.xml for lint."

* commit '9cec99d9540822e68559e25b471bbe788352839d':
Generate api-versions.xml for lint.
e2172b71fcece70ebd87a4324d089d807a6bb389 11-Jun-2014 Xavier Ducrohet <xav@google.com> Remove non-ready support libs. DO NOT MERGE.

Change-Id: I319e9cb26e5ebfaafb3aa209732914f90ddf1446
dk.atree
4100ca144dda011d3fbf129b5c88c5461e9981fc 30-May-2014 Deepanshu Gupta <deepanshu@google.com> Package renamed fonts again.

PS names of fonts are renamed to include the version number. This change
packages the fonts from the output directory of the script that modifies
the fonts.

Change-Id: I023fb0dfcf50698f80e26b7d476969c453fc4cc7
dk.atree
14023aeef171624677f95f1a2edb7f251ce30529 03-Jun-2014 Raphael Moll <ralf@android.com> Fix SDK repo to prevent mixing different targets.

This makes sure that sdk-repo-*.zip doesn't exist to
avoid merging into an existing one.

Also fix a warning when generating the repo.xml files.

(cherry picked from commit 4df9f469f710b4eedde9020f7a35534a795edfb1)

Change-Id: Ifeb1234cacf121458bda9d869d7e5df5b5a19673
ools/mk_sdk_repo_xml.sh
ools/sdk_repo.mk
16691097052ccc028e4c1d0b4c20b2111e73c0ad 03-Jun-2014 Raphael Moll <ralf@android.com> Move SDK system-image source.prop_templates in their own folder.

This allows to have a different rule to generate the source.properties
based on the templates and place them in a directory that depends on
the current target CPU ABI. In turn this prevents the build from
mixing different source.props when building different targets.

(cherry picked from commit 26bcf6a51141fa9dec7df8b932835ccd7b1ab182)

Change-Id: I6e424c16fba17f5d2f37742b7d32208b126bea77
ndroid.mk
dk-android-arm64-v8a.atree
dk-android-armeabi-v7a.atree
dk-android-armeabi.atree
dk-android-mips.atree
dk-android-x86.atree
dk-android-x86_64.atree
ools/sdk_repo.mk
e6174a6e974ba01e17c9f7b1037a5fe389b0243a 12-Jun-2014 Chris Banes <chrisbanes@google.com> Merge "DO NOT MERGE Add android-support-v7-palette to build" into lmp-preview-dev
bbd9b96cd10864554c5f3f9ab5e0e1bbf43442b6 10-Jun-2014 Raphael Moll <ralf@android.com> am 8235126e: am 9649c415: Merge "Change api-versions.xml generator source order."

* commit '8235126ebf42ddd9dd1e9d8191be67ae46cb54ae':
Change api-versions.xml generator source order.
8235126ebf42ddd9dd1e9d8191be67ae46cb54ae 10-Jun-2014 Raphael Moll <ralf@android.com> am 9649c415: Merge "Change api-versions.xml generator source order."

* commit '9649c415e7e959b67a8810cd17ab65b7994c0f71':
Change api-versions.xml generator source order.
7d86138caabe289ae9a9bab6448287c1d1ffa965 10-Jun-2014 Raphael Moll <ralf@android.com> Change api-versions.xml generator source order.

The generator now takes files first from prebuilts/tools
and then if not found takes them from prebuilds/sdk.

Change-Id: Ia099c26202292537e92eaaaa5c26ad2916114f1e
ndroid.mk
c8ed8c25bc796cd82fb1df0ea100e320a542eeb3 10-Jun-2014 Ying Wang <wangying@google.com> am bcfa67e5: am 1e1b10ac: Merge "Switch to SDK_HOST_ARCH"

* commit 'bcfa67e56dd7862d085954d2c4b349f8199c3d28':
Switch to SDK_HOST_ARCH
bcfa67e56dd7862d085954d2c4b349f8199c3d28 10-Jun-2014 Ying Wang <wangying@google.com> am 1e1b10ac: Merge "Switch to SDK_HOST_ARCH"

* commit '1e1b10acd152ae67670587ef1682ba6a3ed8a66c':
Switch to SDK_HOST_ARCH
1e1b10acd152ae67670587ef1682ba6a3ed8a66c 10-Jun-2014 Ying Wang <wangying@google.com> Merge "Switch to SDK_HOST_ARCH"
34d8ff4c6af66fe75fea70c4932c51e3ddb35b03 19-May-2014 Chris Banes <chrisbanes@google.com> DO NOT MERGE Add android-support-v7-palette to build

Change-Id: I22cec92b976645d766441b140a5d5754c4ebbe46
(cherry picked from commit 8028b3925294a477d3fa44d948d8aba89b9efc50)
ndroid.mk
dk.atree
9cec99d9540822e68559e25b471bbe788352839d 10-Jun-2014 Raphael Moll <ralf@android.com> am ea21b816: am 28748be7: Merge "Generate api-versions.xml for lint."

* commit 'ea21b8169062fecf0bf32abafc5892ad3beb8238':
Generate api-versions.xml for lint.
ea21b8169062fecf0bf32abafc5892ad3beb8238 10-Jun-2014 Raphael Moll <ralf@android.com> am 28748be7: Merge "Generate api-versions.xml for lint."

* commit '28748be7e5a95ca32fd4b930be05ad4bdd365a43':
Generate api-versions.xml for lint.
4f8a38ed7ac976c8e911479ccdbd39f85da7a02e 05-Jun-2014 Raphael Moll <ralf@android.com> Generate api-versions.xml for lint.

Depends on:
- tools/base I747d27e998c6dbd61dd17c44bfc747c9542e33d1
- tools/buildSrc I400f4b6c146836ba30e6e7985ca6c9894985a8cb
- prebuilts/tools Ia4b0c477cf6f4788de610be017a9f5b43d73486c

Change-Id: I3f791d5e1d0ea893cdb5969854d9ae99d5fbb5b7
ndroid.mk
dk.atree
e7db94431e813195bff41d73ff9db9ddc234379b 10-Jun-2014 Ying Wang <wangying@google.com> Switch to SDK_HOST_ARCH

SDK_HOST_ARCH will be x86 if we are doing 32-bit host multilib build,
in which HOST_ARCH is actually x86_64.

Bug: 13751317
Change-Id: I8b7893b10cc4d0e71076b3b3625ec2f352aa8602
ools/windows_sdk.mk
a4a83ccba1537a2ae112a5144315e765b4cbb7f6 09-Jun-2014 Erik Pasternak <roboerik@android.com> am 0b7a8dbd: Merge "Revert "Package renamed fonts."" into lmp-preview-dev

* commit '0b7a8dbde8b006aef349f75f4837b7f1c9e498fd':
Revert "Package renamed fonts."
177e561e401eeab1a52687ec307c40a4f3d9322f 09-Jun-2014 Deepanshu Gupta <deepanshu@google.com> am cde7418e: Merge "Package renamed fonts." into lmp-preview-dev

* commit 'cde7418ead103db609dbee8e43b2b91992f3a74a':
Package renamed fonts.
cdee35f78849e3266919655bdb3af67aed5b55a0 08-Jun-2014 Erik Pasternak <roboerik@android.com> Revert "Package renamed fonts."

This change broke the SDK builds.

This reverts commit ef43acc413bfb63d34db3844edfacae049922949.

Change-Id: I84af70750f72792cd2e509677c398faefa6e8d91
dk.atree
df72a54f9cb629ed9bc91960a97301dffa38658e 05-Jun-2014 Raphael Moll <ralf@android.com> am adcf12ed: am 4000df93: am 6ab8ef21: Merge "Move SDK system-image source.prop_templates in their own folder."

* commit 'adcf12ed0864d17937a358b18a609a611cfa8bf5':
Move SDK system-image source.prop_templates in their own folder.
adcf12ed0864d17937a358b18a609a611cfa8bf5 04-Jun-2014 Raphael Moll <ralf@android.com> am 4000df93: am 6ab8ef21: Merge "Move SDK system-image source.prop_templates in their own folder."

* commit '4000df931bb1b0f9a9e37430212124a9c37e6972':
Move SDK system-image source.prop_templates in their own folder.
4000df931bb1b0f9a9e37430212124a9c37e6972 04-Jun-2014 Raphael Moll <ralf@android.com> am 6ab8ef21: Merge "Move SDK system-image source.prop_templates in their own folder."

* commit '6ab8ef21b8826b19e92a47f70d3ba30e04ba66cc':
Move SDK system-image source.prop_templates in their own folder.
6ab8ef21b8826b19e92a47f70d3ba30e04ba66cc 04-Jun-2014 Raphael Moll <ralf@android.com> Merge "Move SDK system-image source.prop_templates in their own folder."
23a8adf276448f68efb049a2f2ef3409af59dd1c 06-Feb-2014 Steve Moyer <smoyer@google.com> DO NOT MERGE: Add SmsTest and mege emulator smoke tests

Picked Changes:
Add SMS test to verify emulator can receive sms from DDMS
Adding test tag to sms test
Add up to 6 10 second delays to wait for sms
Merging emulator smoke test projects
Combining SmsTest, GpsLocationTests, and ConnectivityTest

Conflicts:
build/sdk.atree

Change-Id: I1343c59418a69b2f5e1eb0c6cde54f2bc09300ac
dk.atree
32b5e338b5a1c8c4186fd65d959ddba87dfbad23 04-Jun-2014 Raphael Moll <ralf@android.com> am 95a5c56c: am 728f321c: Merge "Add Build-Tools runtime.properties file."

* commit '95a5c56c8f6d87bb9a3c4d08b94c13c409c6ea74':
Add Build-Tools runtime.properties file.
95a5c56c8f6d87bb9a3c4d08b94c13c409c6ea74 04-Jun-2014 Raphael Moll <ralf@android.com> am 728f321c: Merge "Add Build-Tools runtime.properties file."

* commit '728f321cb94220e1f7d1d72759b6c6b342152c15':
Add Build-Tools runtime.properties file.
26bcf6a51141fa9dec7df8b932835ccd7b1ab182 03-Jun-2014 Raphael Moll <ralf@android.com> Move SDK system-image source.prop_templates in their own folder.

This allows to have a different rule to generate the source.properties
based on the templates and place them in a directory that depends on
the current target CPU ABI. In turn this prevents the build from
mixing different source.props when building different targets.

Change-Id: I4a1d9f47426c94f376947ddae8be9f5549331616
ndroid.mk
dk-android-arm64-v8a.atree
dk-android-armeabi-v7a.atree
dk-android-armeabi.atree
dk-android-mips.atree
dk-android-x86.atree
dk-android-x86_64.atree
ools/sdk_repo.mk
37433ac223c1298ea359a5e72b6d17837106c89f 03-Jun-2014 Raphael Moll <ralf@android.com> Add Build-Tools runtime.properties file.

Change-Id: I5addf44a2ea3dbb91df5a49f6fcb10e75047fa82
dk.atree
5ea71acfddab96fa3124481ce153365ec83d7ef8 03-Jun-2014 Raphael Moll <ralf@android.com> am e9555599: am 087ccb01: Merge "Fix SDK repo to prevent mixing different targets."

* commit 'e9555599da16c3e40d0d359f6e46fedfc1f03b1d':
Fix SDK repo to prevent mixing different targets.
e9555599da16c3e40d0d359f6e46fedfc1f03b1d 03-Jun-2014 Raphael Moll <ralf@android.com> am 087ccb01: Merge "Fix SDK repo to prevent mixing different targets."

* commit '087ccb01527d9d7e8981751639c65b1eb6369534':
Fix SDK repo to prevent mixing different targets.
087ccb01527d9d7e8981751639c65b1eb6369534 03-Jun-2014 Raphael Moll <ralf@android.com> Merge "Fix SDK repo to prevent mixing different targets."
4df9f469f710b4eedde9020f7a35534a795edfb1 03-Jun-2014 Raphael Moll <ralf@android.com> Fix SDK repo to prevent mixing different targets.

This makes sure that sdk-repo-*.zip doesn't exist to
avoid merging into an existing one.

Also fix a warning when generating the repo.xml files.

Change-Id: I645ad13936b83c5c33bd84c046b60b77488b9113
ools/mk_sdk_repo_xml.sh
ools/sdk_repo.mk
ef43acc413bfb63d34db3844edfacae049922949 30-May-2014 Deepanshu Gupta <deepanshu@google.com> Package renamed fonts.

PS names of fonts are renamed to include the version number. This change
packages the fonts from the output directory of the script that modifies
the fonts.

Change-Id: Iac2a34475b095ed38f8706420acda40c5d53364b
dk.atree
8028b3925294a477d3fa44d948d8aba89b9efc50 19-May-2014 Chris Banes <chrisbanes@google.com> Add android-support-v7-palette to build

Change-Id: I22cec92b976645d766441b140a5d5754c4ebbe46
ndroid.mk
dk.atree
267ddd50d75c86410ace6537ad3315b1eaaf730b 28-May-2014 Raphael Moll <raphael@google.com> am 937cfb42: am 6e56697c: Merge "Ability to generate SDK system-images for arm64 and x86_64"

* commit '937cfb42602c081143e1854ba5f67e18b2f97b46':
Ability to generate SDK system-images for arm64 and x86_64
937cfb42602c081143e1854ba5f67e18b2f97b46 28-May-2014 Raphael Moll <raphael@google.com> am 6e56697c: Merge "Ability to generate SDK system-images for arm64 and x86_64"

* commit '6e56697cb229cd8c163583a03259a6787f60a84a':
Ability to generate SDK system-images for arm64 and x86_64
4986fd4fdd45c54cb341030eaa6d17f2cd33b94e 16-May-2014 Raphael Moll <raphael@google.com> Ability to generate SDK system-images for arm64 and x86_64

(Cherry-picked from 40c7126e7cfe4680cadd11b90774f9996a8e2d37)

Change-Id: I2715a668271ed88fcd0c8c97ac35d05fcdd34a06
ndroid.mk
dk-android-arm64-v8a.atree
dk-android-x86.atree
dk-android-x86_64.atree
6f2b61441854c1a1d10ea7c7e8ef14f7403a46dc 21-May-2014 Raphael Moll <raphael@google.com> am f7863319: am 261307be: resolved conflicts for merge of bf164835 to stage-aosp-master

* commit 'f786331925d50c2235f298e39880a9a05670b0dd':
Fix SDK build.
f786331925d50c2235f298e39880a9a05670b0dd 21-May-2014 Raphael Moll <raphael@google.com> am 261307be: resolved conflicts for merge of bf164835 to stage-aosp-master

* commit '261307bebe8986599055bb97d5587977c8da53eb':
Fix SDK build.
261307bebe8986599055bb97d5587977c8da53eb 21-May-2014 Raphael Moll <raphael@google.com> resolved conflicts for merge of bf164835 to stage-aosp-master

Change-Id: I3c380b1ddae5e088985513398d7eb6274d8426eb
e9a7920ca440478c204c3798bc7460380fb4d268 20-May-2014 Raphael Moll <ralf@android.com> Fix SDK build.

development's sdk.atree depends on the generated file
/sdk/files/sdk_files_NOTICE.txt which was accumulating
all the tools notices.

However this file isn't generated anymore.
This replaces it by a static file.

This is only good as a temporary measure to fix the build.
The proper fix is to recreate the SDK rule to generate the
combined NOTICE.txt and move it in development.git

Change-Id: I27e4f38e756b81b002d16dfac5ccaa54a4463786
dk.atree
40c7126e7cfe4680cadd11b90774f9996a8e2d37 16-May-2014 Raphael Moll <raphael@google.com> Ability to generate SDK system-images for arm64 and x86_64

Change-Id: I2715a668271ed88fcd0c8c97ac35d05fcdd34a06
ndroid.mk
dk-android-arm64-v8a.atree
dk-android-x86.atree
dk-android-x86_64.atree
136f00c23463996f979db92d28572b031ea3ad4e 16-May-2014 Raphael Moll <ralf@android.com> am 7401fa16: am 8aa49aef: am f9f829e5: Merge "SDK: support generating repository XML with latest XSD."

* commit '7401fa161f9f6bf66965cc71528ae1cdeb99b620':
SDK: support generating repository XML with latest XSD.
7401fa161f9f6bf66965cc71528ae1cdeb99b620 16-May-2014 Raphael Moll <ralf@android.com> am 8aa49aef: am f9f829e5: Merge "SDK: support generating repository XML with latest XSD."

* commit '8aa49aef8adb24a1b977d89b60a48a781e4e6674':
SDK: support generating repository XML with latest XSD.
8aa49aef8adb24a1b977d89b60a48a781e4e6674 16-May-2014 Raphael Moll <ralf@android.com> am f9f829e5: Merge "SDK: support generating repository XML with latest XSD."

* commit 'f9f829e51afe3906458a81cb4efb75a051c64c04':
SDK: support generating repository XML with latest XSD.
ea40d2f4c5af9744f7140a31d551a55dade128d9 25-Apr-2014 Raphael Moll <ralf@android.com> SDK: support generating repository XML with latest XSD.

The latest version of the repository XSD changes:
- archive attributes (os/arch) are now element (host-os)
- system images are not longer in the repository.xml and
get their own XML file.

Change-Id: If5820a84d5c754b816b17b5713bbdb2597736eff
ools/mk_sdk_repo_xml.sh
ools/sdk_repo.mk
10163e76fcce84d636edd65938b13bff8d086d51 13-May-2014 Evan Charlton <evanc@google.com> am 311e3662: Merge "Merging emulator smoke test projects" into master-nova

* commit '311e3662bdaec82c621fd3b04c4505ce60d2df15':
Merging emulator smoke test projects
31078f7fbd0c6045c93aeddf52f5ae40af7b2d18 13-May-2014 Baligh Uddin <baligh@google.com> am 3b842a86: keep history after reset to master-nova-dev

* commit '3b842a8628da809286b810b6881e382890ead1f6':
be9d36572c0c7669d4e113844db78078d8d67d1e 12-May-2014 Andrew Hsieh <andrewhsieh@google.com> am 106c0c69: am 3d34e652: am 7b004d96: Merge "Add libcxx projects and compiler-rt to windows whitelist."

* commit '106c0c694c9818fd45fee7afa0af33b25407fb25':
Add libcxx projects and compiler-rt to windows whitelist.
106c0c694c9818fd45fee7afa0af33b25407fb25 12-May-2014 Andrew Hsieh <andrewhsieh@google.com> am 3d34e652: am 7b004d96: Merge "Add libcxx projects and compiler-rt to windows whitelist."

* commit '3d34e6524e035c6f55cac6553c73c7b18f9910c3':
Add libcxx projects and compiler-rt to windows whitelist.
3d34e6524e035c6f55cac6553c73c7b18f9910c3 12-May-2014 Andrew Hsieh <andrewhsieh@google.com> am 7b004d96: Merge "Add libcxx projects and compiler-rt to windows whitelist."

* commit '7b004d960657c15145ce1272f7a61c8ca4272cd1':
Add libcxx projects and compiler-rt to windows whitelist.
d7d603fbbbe3758ffe7dddf9a31b45d21a09b58a 26-Apr-2014 Stephen Hines <srhines@google.com> Add libcxx projects and compiler-rt to windows whitelist.

Change-Id: I2d6189b4e9a0440330d1212dae9396b88b66ea3f
indows_sdk_whitelist.mk
580b17036487c0087737431facf9d5d42fd1b3d2 09-May-2014 Xavier Ducrohet <xav@google.com> am 6ee534bf: am 557639cf: am 2567045c: Merge "Remove SDK tools from build."

* commit '6ee534bf5d492e61e03fa863ddfb2142131cad9f':
Remove SDK tools from build.
6ee534bf5d492e61e03fa863ddfb2142131cad9f 09-May-2014 Xavier Ducrohet <xav@google.com> am 557639cf: am 2567045c: Merge "Remove SDK tools from build."

* commit '557639cf1167a32c9601a53fd70af7eb81413556':
Remove SDK tools from build.
557639cf1167a32c9601a53fd70af7eb81413556 09-May-2014 Xavier Ducrohet <xav@google.com> am 2567045c: Merge "Remove SDK tools from build."

* commit '2567045c07dfae87fa53dfdc349681b5311d3522':
Remove SDK tools from build.
ce00253c5b99199b2d743f72d08b0ef63f6b0836 03-Apr-2014 Xavier Ducrohet <xav@google.com> Remove SDK tools from build.

(cherry picked from commit 1678734ef064893f28390fac16f4633d0fb7361a)

Change-Id: Ia689f66868de18341b863e19f2958434eb45ca59
roduct_sdk.mk
f4554e79e0fa2a5b09e636fe5b1765c318d79ce5 08-May-2014 Xavier Ducrohet <xav@google.com> am 40ad715f: am 7fc13d7a: am 1cad9512: Merge "Fix repo script to ignore tools"

* commit '40ad715f74740451e888b336b302f9e8628f3964':
Fix repo script to ignore tools
40ad715f74740451e888b336b302f9e8628f3964 08-May-2014 Xavier Ducrohet <xav@google.com> am 7fc13d7a: am 1cad9512: Merge "Fix repo script to ignore tools"

* commit '7fc13d7ad63eb0fad3d30b4b909baca6651ee303':
Fix repo script to ignore tools
7fc13d7ad63eb0fad3d30b4b909baca6651ee303 08-May-2014 Xavier Ducrohet <xav@google.com> am 1cad9512: Merge "Fix repo script to ignore tools"

* commit '1cad951295f4b7bbd6edd8c1c5c7a791f7078033':
Fix repo script to ignore tools
d81eb5d83325a3e06e4b41b5c5f8cca5c62d161f 08-May-2014 Xavier Ducrohet <xav@google.com> Fix repo script to ignore tools

Change-Id: I80e6d5802f9a4633378d432eff3e91c2fcf83eeb
ools/sdk_repo.mk
438cc639d05117f8af3e8dbb5c341a3d1faf6d4b 05-May-2014 Raphael Moll <ralf@android.com> Revert "win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE."

This reverts commit 4a747f67b05e906a5955b82878bb2a69ea0431f5.
ools/windows_sdk.mk
4a747f67b05e906a5955b82878bb2a69ea0431f5 03-May-2014 Raphael Moll <ralf@android.com> win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE.

This deactivate building all the exe binaries
and prevents atree from running (both for dev.git
and sdk.git). This still results in a win_sdk folder
so that the sdk_repo rule can work, but the generated
sdk will only contain linux binaries and is not to be
used for production, obviously.

Change-Id: I99cd27a050278afae3b62d1ef34a0a1a542bfd1a
ools/windows_sdk.mk
df3914b04c07300558751aba9e7a05474474739a 03-May-2014 Raphael Moll <ralf@android.com> am 257a315e: am 304c8070: am a783fe5f: Merge "Temporarily disable rs/bcc in win_sdk"

* commit '257a315e72d8b878b71f1735c8174cfe69cde8c7':
Temporarily disable rs/bcc in win_sdk
257a315e72d8b878b71f1735c8174cfe69cde8c7 03-May-2014 Raphael Moll <ralf@android.com> am 304c8070: am a783fe5f: Merge "Temporarily disable rs/bcc in win_sdk"

* commit '304c80705867d34b3323350a2cf0412e2931f6d0':
Temporarily disable rs/bcc in win_sdk
304c80705867d34b3323350a2cf0412e2931f6d0 03-May-2014 Raphael Moll <ralf@android.com> am a783fe5f: Merge "Temporarily disable rs/bcc in win_sdk"

* commit 'a783fe5f2c4e053b92b51ea1725fb535eaae7b0b':
Temporarily disable rs/bcc in win_sdk
c63c2d31ba050d61594aaa317b6d32f5627ce6fc 02-May-2014 Raphael Moll <ralf@android.com> Temporarily disable rs/bcc in win_sdk

Change-Id: Ic3c49f14098662c83167151a2abc7f46d847c67f
dk-windows-x86.atree
ools/windows_sdk.mk
23f68632c7f1a368bcc471b9b782f29fb32619ca 29-Apr-2014 Bill Yi <byi@google.com> Merge commit 'd297be2136209cab4edbcf8879520f65fb564103' into HEAD
b9581d5aaebfd6b58432545b80f1c45ce98a0821 12-Apr-2014 Alexander Lucas <alexlucas@google.com> am 229d4df3: am 5bf3d523: am fd5ede91: am f5d4c15b: Added swipe-to-refresh samples to sdk.atree

* commit '229d4df318a4adc0fae28989b8cb0ca277a2f201':
Added swipe-to-refresh samples to sdk.atree
5bf3d5236c5cdb65a2ea21004dfc79ed9795a936 12-Apr-2014 Alexander Lucas <alexlucas@google.com> am fd5ede91: am f5d4c15b: Added swipe-to-refresh samples to sdk.atree

* commit 'fd5ede91e7900da3bbc20b9ef0ca3859ec499e01':
Added swipe-to-refresh samples to sdk.atree
f5d4c15b0ba6ff4eef2b228e5f363d3c1ee4fdbc 12-Apr-2014 Alexander Lucas <alexlucas@google.com> Added swipe-to-refresh samples to sdk.atree

Change-Id: If939f14e90c04d2df8bbe683812d2f01ef5f3399
dk.atree
b015fd0ff011cda0ef6742122473e061ee223c46 11-Apr-2014 Alexander Lucas <alexlucas@google.com> am b020e934: am ad5f0e86: am eb72a600: am 4a25165a: Merge "Updated Samples metadata for April push of samples" into klp-docs

* commit 'b020e934c5584706d7edfa0c0fe24f69f6a6d38b':
Updated Samples metadata for April push of samples
ad5f0e867b9443f587338db8f01ac2d92c19ac7d 11-Apr-2014 Alexander Lucas <alexlucas@google.com> am eb72a600: am 4a25165a: Merge "Updated Samples metadata for April push of samples" into klp-docs

* commit 'eb72a6002c8ebdeeb94e432dadc828d7d158cbf2':
Updated Samples metadata for April push of samples
c7ad654960bfc2d88dbf7f57507c30e53b353e65 10-Apr-2014 Alexander Lucas <alexlucas@google.com> Updated Samples metadata for April push of samples

Change-Id: Ie4136c1cb9051bead3c73a93ccf646577d721a50
dk.atree
f3ff0296c96a81a6ebb053bf39f7484d03dc4678 03-Apr-2014 Xavier Ducrohet <xav@google.com> Move ZipAlign to build-tools. DO NOT MERGE.

(cherry picked from commit 76510e2dd2d8a6854f6ee52f8e56ba966d5ffe27)

Change-Id: I2262795c0dfe9b103fda8c9a50a80d688ece5a12
roduct_sdk.mk
dk-windows-x86.atree
dk.atree
0b1a1f7b38f6fdfa4de35238529036d2a6230615 04-Apr-2014 Steve Moyer <smoyer@google.com> Merge "DO NOT MERGE: Add SmsTest and mege emulator smoke tests"
8821b239d175f441c1631f9ce04f9b0109dd3a72 04-Apr-2014 Xavier Ducrohet <xav@google.com> am d6ccbcd2: am 47eadf1e: Merge "Move ZipAlign to build-tools."

* commit 'd6ccbcd253d34feb75cba4cbd98f520dfa789757':
Move ZipAlign to build-tools.
d6ccbcd253d34feb75cba4cbd98f520dfa789757 04-Apr-2014 Xavier Ducrohet <xav@google.com> am 47eadf1e: Merge "Move ZipAlign to build-tools."

* commit '47eadf1ecef5e898d63863edaa644615942ad0fd':
Move ZipAlign to build-tools.
6ded79d696edc8abbb95c5453d922919e7f61f9d 06-Feb-2014 Steve Moyer <smoyer@google.com> DO NOT MERGE: Add SmsTest and mege emulator smoke tests

Picked Changes:
Add SMS test to verify emulator can receive sms from DDMS
Adding test tag to sms test
Add up to 6 10 second delays to wait for sms
Merging emulator smoke test projects
Combining SmsTest, GpsLocationTests, and ConnectivityTest

Conflicts:
build/sdk.atree

Change-Id: I1343c59418a69b2f5e1eb0c6cde54f2bc09300ac
dk.atree
76510e2dd2d8a6854f6ee52f8e56ba966d5ffe27 03-Apr-2014 Xavier Ducrohet <xav@google.com> Move ZipAlign to build-tools.

Change-Id: Id83a8dc86946bcde78e9eaaab009a06a59fccbd0
roduct_sdk.mk
dk-windows-x86.atree
dk.atree
6ee68fe3433d3b51a42cd4b526c880f17527ce2c 26-Mar-2014 Xavier Ducrohet <xav@google.com> am 6e211383: am 459fdbce: am dcb2c538: Add annotation support lib to SDK.

* commit '6e21138341dde9036675737cdfa8baa76cb70c5d':
Add annotation support lib to SDK.
459fdbcee88c1085f64b009bfcc93c84496dfeb2 26-Mar-2014 Xavier Ducrohet <xav@google.com> am dcb2c538: Add annotation support lib to SDK.

* commit 'dcb2c538b88b84ba33dd2dd3a4afaab79a05608a':
Add annotation support lib to SDK.
dcb2c538b88b84ba33dd2dd3a4afaab79a05608a 26-Mar-2014 Xavier Ducrohet <xav@google.com> Add annotation support lib to SDK.

Change-Id: If9faed19abc14fe6af288494c688a80789215a3b
ndroid.mk
dk.atree
cdb09c943ea2de51c2ecad805e76dc59684a0d84 24-Mar-2014 Tim Kilbourn <tkilbourn@google.com> am 56c1077d: am c9d6af6b: Merge "Add the stub src dir to the leanback extras." into klp-modular-dev

* commit '56c1077d131cf807563eb7b8e8bc2263f8bb1748':
Add the stub src dir to the leanback extras.
61c46959b5a4a7cde0c78caba12b32bf53d204e8 16-Mar-2014 Tim Kilbourn <tkilbourn@google.com> Add the stub src dir to the leanback extras.

Change-Id: I614bcdd9f9061917fb2c4721cbe1752fd56f6c12
dk.atree
ab05cdfb7200afdb34bcac097eebb6f2c2741716 14-Mar-2014 Alexander Lucas <alexlucas@google.com> am dd7dda23: am 964fa100: am 7ae2eca4: am 7a80e034: Merge "Added new samples to sdk.atree for march push" into klp-docs

* commit 'dd7dda23a56844b706bd20c752b0696571fc582d':
Added new samples to sdk.atree for march push
964fa100beb6108f7cfc5c8a1eaa7be55bbab0c9 14-Mar-2014 Alexander Lucas <alexlucas@google.com> am 7ae2eca4: am 7a80e034: Merge "Added new samples to sdk.atree for march push" into klp-docs

* commit '7ae2eca4a0762f347e2a1981dc1becbc16a5c4bc':
Added new samples to sdk.atree for march push
9e924b6820782b391252bb98470d08a12dd6cc05 14-Mar-2014 Alexander Lucas <alexlucas@google.com> am 7ae2eca4: am 7a80e034: Merge "Added new samples to sdk.atree for march push" into klp-docs

* commit '7ae2eca4a0762f347e2a1981dc1becbc16a5c4bc':
Added new samples to sdk.atree for march push
7ae2eca4a0762f347e2a1981dc1becbc16a5c4bc 13-Mar-2014 Alexander Lucas <alexlucas@google.com> am 7a80e034: Merge "Added new samples to sdk.atree for march push" into klp-docs

* commit '7a80e034839e02c295cb75c59c6af75e17dad238':
Added new samples to sdk.atree for march push
957fa659c23ed74b9d3f18b25fdf162339ee6742 13-Mar-2014 Tim Kilbourn <tkilbourn@google.com> resolved conflicts for merge of 9eecf3fc to master

Change-Id: If38c80cd560d8b419420fc05a872c31b6031d90a
349ba5258754aa0dd5511ed89006c2f43dd23895 12-Mar-2014 Tim Kilbourn <tkilbourn@google.com> Add new support libs into the sdk build.

android-support-v7-recyclerview
android-support-v17-leanback

Change-Id: I6538bb30204aeaeac0b0ea34f0a5951e09f58866
ndroid.mk
dk.atree
c4a6ecf00dcabb894aae39276d558c97daee926c 10-Mar-2014 Alexander Lucas <alexlucas@google.com> Added new samples to sdk.atree for march push

Change-Id: Ic138c1ff32c86ebb48375cc07d0c138829c8a3f7
dk.atree
97c8590ca8cf9273e35d1902ea8b02a16c53a752 08-Mar-2014 Alexander Lucas <alexlucas@google.com> Updating build metadata for march sample push.

Change-Id: Ic8f6e2adce61c76cfb3e3c6db96f13c915be7a63
dk.atree
b99f97d38ec986e90b15ea96961cf0f9f911ba93 13-Feb-2014 Steve Moyer <smoyer@google.com> Merging emulator smoke test projects

Combining SmsTest, GpsLocationTests, and ConnectivityTest

Change-Id: I7a9b8e787af37704e6af43b93f169ef90980cb2d
dk.atree
138d520cf738afdefba4de4493a765fbd31f9445 13-Feb-2014 Steve Moyer <smoyer@google.com> Merging emulator smoke test projects

Combining SmsTest, GpsLocationTests, and ConnectivityTest

Change-Id: I7a9b8e787af37704e6af43b93f169ef90980cb2d
dk.atree
a775c5a05d2c707a31e15840b3ca1900a9529870 11-Feb-2014 Steve Moyer <smoyer@google.com> Merge "Adding SmsTest to emulator"
5db4928a4598d7df743b125ffc95c99568de6ebe 07-Feb-2014 Steve Moyer <smoyer@google.com> Adding SmsTest to emulator

Change-Id: I0820ec25550debab3755db569e0e4fb6a9c62e94
dk.atree
93ca68b5fa6d8410701ea75bdde65fb3da6b6412 10-Feb-2014 Alexander Lucas <alexlucas@google.com> am 862cb15a: am 213b633f: am b58b3103: am 47be1a3b: am fc1c6987: Updated sdk.atree to include new samples for feb sample launch

* commit '862cb15a018472241b93310caa0918e77f7513ac':
Updated sdk.atree to include new samples for feb sample launch
b58b31037ae5fa19dd0b2d1b12485cbd9ea6e02e 08-Feb-2014 Alexander Lucas <alexlucas@google.com> am 47be1a3b: am fc1c6987: Updated sdk.atree to include new samples for feb sample launch

* commit '47be1a3bea5be0317e8af71f202cd37e16302c76':
Updated sdk.atree to include new samples for feb sample launch
fc1c69874c3edb0c9ea9ba0dbbec1507a3268a96 06-Feb-2014 Alexander Lucas <alexlucas@google.com> Updated sdk.atree to include new samples for feb sample launch

Change-Id: I71af239a0bf0f146345e243720d9e4300c5ed1f6
dk.atree
819f19e62fa1159edae23865ce54476afb299e5c 06-Feb-2014 Deepanshu Gupta <deepanshu@google.com> am c6b9cf1d: am 25f6b164: am 31936361: am ce8ddf4f: am 0363ab1f: Merge "Bundle Noto fonts with the SDK" into klp-dev

* commit 'c6b9cf1dddff4b3c8a9574cac5efbbcc334300b3':
Bundle Noto fonts with the SDK
319363611c44320a263e5bce675f2eb558862550 06-Feb-2014 Deepanshu Gupta <deepanshu@google.com> am ce8ddf4f: am 0363ab1f: Merge "Bundle Noto fonts with the SDK" into klp-dev

* commit 'ce8ddf4f8af5228e3d36987a8d0d5a9b030e785d':
Bundle Noto fonts with the SDK
0363ab1f746943cd78a439d891e8f9b0a0b92214 06-Feb-2014 Deepanshu Gupta <deepanshu@google.com> Merge "Bundle Noto fonts with the SDK" into klp-dev
bc0b4a804f3a51919dfb9c7acff9c03416622c7d 07-Jan-2014 Deepanshu Gupta <deepanshu@google.com> Bundle Noto fonts with the SDK

Change-Id: I28c48b3b5dbd761ef0391497e834f315ac83cae4
dk.atree
39c7e520bc9df1907ceff3020ce8a80348baa341 07-Jan-2014 Xavier Ducrohet <xav@google.com> am 699fdf70: am c7e44de1: am cd171fd3: am 7f15ddd5: Properly package the RS support bc file.

* commit '699fdf70319ed2f5842216c0ade4118b9f236f49':
Properly package the RS support bc file.
c7e44de1962a3c9e56645213d6b58bc08cf4597e 07-Jan-2014 Xavier Ducrohet <xav@google.com> am cd171fd3: am 7f15ddd5: Properly package the RS support bc file.

* commit 'cd171fd352aa8e6e1d1bc903038a81b7702f6d7a':
Properly package the RS support bc file.
7f15ddd546be5203f8de654ff36885f629490813 03-Jan-2014 Xavier Ducrohet <xav@google.com> Properly package the RS support bc file.

Change-Id: Ia55b597085c97cb07029b812392a618a4670ff36
dk.atree
10e82353220a477e014d24541c94338bf89922a9 11-Dec-2013 Narayan Kamath <narayan@google.com> am 7d3b1cc2: am 4ebf0371: am 1e18a584: Merge "Whitelist libziparchive for windows."

* commit '7d3b1cc2cfec31110394ef5760f39d2570f327ed':
Whitelist libziparchive for windows.
4ebf03711a8e34479f35941f2cc595e2b7283808 11-Dec-2013 Narayan Kamath <narayan@google.com> am 1e18a584: Merge "Whitelist libziparchive for windows."

* commit '1e18a584efe16cd387c603738c47c0591532e8d9':
Whitelist libziparchive for windows.
a4ea4f1843971bc98dfef8a856560d5aa86c7d32 11-Dec-2013 Narayan Kamath <narayan@google.com> Whitelist libziparchive for windows.

Change-Id: I19d527b6b52732057b16367574edc14c7065f256
indows_sdk_whitelist.mk
c04b7aad0df26465d80775d8dd893fdc7a484b16 30-Sep-2013 Raphael Moll <ralf@android.com> SDK Repository: switch to sdk addon revision 6.

addon-6.xsd changes <extra><revision> from an int (major only)
to a full <revision> element with major.micro.minor (but not
preview part.)

(cherry picked from commit 7657a590830cfe87fb2dc6ff03c0dcb7589c0bdf)

Change-Id: Iedff23a757dd3fd8d9e8006a2aec072ce2c71e8d
ools/mk_sdk_repo_xml.sh
a4571dc35148b03ec65e2d5f1e49ee0bece85898 21-Nov-2013 Alexander Lucas <alexlucas@google.com> am 607b0da6: am f044ac48: am b734f1b5: Updating sdk.atree to reflect new set of samples

* commit '607b0da6372cc033eb52684fbfd425c2298984b2':
Updating sdk.atree to reflect new set of samples
607b0da6372cc033eb52684fbfd425c2298984b2 21-Nov-2013 Alexander Lucas <alexlucas@google.com> am f044ac48: am b734f1b5: Updating sdk.atree to reflect new set of samples

* commit 'f044ac485dd60ac075b31f81db3922b2d3780119':
Updating sdk.atree to reflect new set of samples
b734f1b5905c0f49e2dd8d73333ac5b003e15fa9 21-Nov-2013 Alexander Lucas <alexlucas@google.com> Updating sdk.atree to reflect new set of samples

Change-Id: I1308d65f77783fc7f43fdc36bf90a59a137ec73f
dk.atree
7b433ee4e4d8a515d2a99f36c6e1fbb655fc9063 16-Oct-2013 Maurice Chu <mochu@google.com> Move multidex support library

Multidex is being moved from frameworks/support/multidex to
frameworks/multidex.

GMS Core will be using the multidex library and has gotten special
approval to use the unreleased multidex library (i.e., guinea pig).

Bug: 10674263
Change-Id: Iff895425d4d7b2278641cbe147bd35d0788cadee
dk.atree
3f12dac94da218f6a706a30201ac7bc06fe4b8ae 09-Oct-2013 Siva Velusamy <vsiva@google.com> samples: Do not attempt to clean line endings for *.py DO NOT MERGE

The line endings script changes line endings, but also
removes the executable permissions of the files. We don't
want this to happen for scripts such as systrace.py

(cherry picked from commit de3fa5df078bc751a5c7640d965ed9c57c1d909f)

Change-Id: Icee78118d0d7367176e8561338ae547228ee087d
ools/sdk_clean.sh
0edb7add965f83e0543bc29002b133e5a648285c 10-Oct-2013 Siva Velusamy <vsiva@google.com> am f5eea9d9: am aeccc700: am 777285ce: Merge "samples: Do not attempt to clean line endings for *.py"

* commit 'f5eea9d9cb35df6c20a3b807ae36633bfc71f616':
samples: Do not attempt to clean line endings for *.py
f5eea9d9cb35df6c20a3b807ae36633bfc71f616 10-Oct-2013 Siva Velusamy <vsiva@google.com> am aeccc700: am 777285ce: Merge "samples: Do not attempt to clean line endings for *.py"

* commit 'aeccc7000290f3f2edc59f9ff3a941df0d37ebc3':
samples: Do not attempt to clean line endings for *.py
aeccc7000290f3f2edc59f9ff3a941df0d37ebc3 10-Oct-2013 Siva Velusamy <vsiva@google.com> am 777285ce: Merge "samples: Do not attempt to clean line endings for *.py"

* commit '777285ceedba8cda5fb0fe0843fae6a887522c03':
samples: Do not attempt to clean line endings for *.py
de3fa5df078bc751a5c7640d965ed9c57c1d909f 09-Oct-2013 Siva Velusamy <vsiva@google.com> samples: Do not attempt to clean line endings for *.py

The line endings script changes line endings, but also
removes the executable permissions of the files. We don't
want this to happen for scripts such as systrace.py

Change-Id: I355cbc4c77cfb3c90e4615962863288680389bce
ools/sdk_clean.sh
377d341235d3f273644258dde8d9286f722d0ffe 02-Oct-2013 Raphael Moll <ralf@android.com> am 02e906ed: am 382966f3: am 47605d10: Merge "SDK Repository: switch to sdk addon revision 6."

* commit '02e906edf9838a9f9a6241d861e0b8ccddc677e5':
SDK Repository: switch to sdk addon revision 6.
02e906edf9838a9f9a6241d861e0b8ccddc677e5 01-Oct-2013 Raphael Moll <ralf@android.com> am 382966f3: am 47605d10: Merge "SDK Repository: switch to sdk addon revision 6."

* commit '382966f30cdd800a1812d39b790cad8a04527157':
SDK Repository: switch to sdk addon revision 6.
382966f30cdd800a1812d39b790cad8a04527157 01-Oct-2013 Raphael Moll <ralf@android.com> am 47605d10: Merge "SDK Repository: switch to sdk addon revision 6."

* commit '47605d10f9647d21c3b350e944fe0d0f5efdc4e6':
SDK Repository: switch to sdk addon revision 6.
7657a590830cfe87fb2dc6ff03c0dcb7589c0bdf 30-Sep-2013 Raphael Moll <ralf@android.com> SDK Repository: switch to sdk addon revision 6.

addon-6.xsd changes <extra><revision> from an int (major only)
to a full <revision> element with major.micro.minor (but not
preview part.)

Change-Id: Ia37e75a2c8f86f4ecf36edb218f7e243f66a0b36
ools/mk_sdk_repo_xml.sh
6fa1156b3b98e72952e1281b66af9867205e1954 06-Sep-2013 Yohann Roussel <yroussel@google.com> Add res folder to multidex SDK projects.

This will fix an error when importing thoses projects with ADT.

Change-Id: I75d2b0376222b13d630ef7e53386dedf62cc3fec
dk.atree
6f57b24889d3bfc2ac1368de53861a4385b50add 04-Sep-2013 Yohann Roussel <yroussel@google.com> android-support-multidex-instrumentation in SDK.

Change-Id: I6e39034f592f6ad7654ee37970f3367a87b2034f
ndroid.mk
dk.atree
4e21d52071918772b18dfbfd4d3b9d4dfbd4f05d 05-Sep-2013 Deepanshu Gupta <deepanshu@google.com> am a4a7f11e: am 7a63270e: am a3e0ada2: am 7c5fdf32: am 2c3e0af1: Merge "Add ICU jar to SDK" into jb-mr2-dev

* commit 'a4a7f11e117dec76d8a67477c99820d8bd83f3a0':
Add ICU jar to SDK
7a63270eb422d91d8036c7285c584c1872d589c7 05-Sep-2013 Deepanshu Gupta <deepanshu@google.com> am a3e0ada2: am 7c5fdf32: am 2c3e0af1: Merge "Add ICU jar to SDK" into jb-mr2-dev

* commit 'a3e0ada25bb5fbd34fe6ade783bdb61469871ab8':
Add ICU jar to SDK
2c3e0af13c08379895f0ec296f2e5cb7670acb4a 05-Sep-2013 Deepanshu Gupta <deepanshu@google.com> Merge "Add ICU jar to SDK" into jb-mr2-dev
a9dd9cfb71da8731a217e1a5ef0f064dcb191538 02-Sep-2013 Yohann Roussel <yroussel@google.com> Merge "Add multidex ADT project to SDK."
cd10458c787c22a25b77ea8d59e1a07640bf6a84 29-Aug-2013 Mike Lockwood <lockwood@google.com> Add frameworks/tools to windows SDK whitelist

Change-Id: Id418a8784339183bd6b8f5a0abb88b877b9b4ad7
indows_sdk_whitelist.mk
a6ca3cf29f8e5b3db1d23aa8ffaa35464d4c1019 22-Aug-2013 Yohann Roussel <yroussel@google.com> Add multidex ADT project to SDK.

Change-Id: I7d622886441589002da55522ec391f19cae79da0
dk.atree
9e27887b60e2e3ae1ea94a8c093e6e493f72c8e4 21-Aug-2013 Yohann Roussel <yroussel@google.com> Include android-support-multidex in SDK libs.

Change-Id: I6d55e654cfc69276913d2d287211b474a5c3d00f
ndroid.mk
7fb77fa79a43fed5fc9558e69944b29681544cba 16-Aug-2013 Trevor Johns <trevorjohns@google.com> am 092959b2: am 1edc4427: am 6a3067db: Merge "Add common directory to BasicSyncAdapter sample" into jb-mr2-dev

* commit '092959b2a1d876511410cc6a85576545457d1037':
Add common directory to BasicSyncAdapter sample
6a3067db2014f3e582db8243bb82a4c1aad5bd07 16-Aug-2013 Trevor Johns <trevorjohns@google.com> Merge "Add common directory to BasicSyncAdapter sample" into jb-mr2-dev
f6e246a8350492eceab4533e0f91e7f9fa4ae91b 14-Aug-2013 Xavier Ducrohet <xav@android.com> am 40e5d9df: am bc516abe: am 8791785c: Package Renderscript files for support mode.

* commit '40e5d9df5f6f7936ef1b08cfe00d2dfe4c874c8e':
Package Renderscript files for support mode.
8791785cd0e7eec775382d44c3ebfe9edaf54ca6 14-Aug-2013 Xavier Ducrohet <xav@android.com> Package Renderscript files for support mode.

Change-Id: I4eae052b01ae014f3e4d289ba33893dfd9c43309
dk-darwin-x86.atree
dk-linux-x86.atree
dk-windows-x86.atree
dk.atree
87713ed9ad0923621beb30a09c240527e177cfc9 08-Aug-2013 Stephen Hines <srhines@google.com> am c76a715f: am 295fc719: am 94efbd63: Add bcc_compat to sdk.atree to fix build break.

* commit 'c76a715ffab6582b12a3301f9e71fbdbb09fed0f':
Add bcc_compat to sdk.atree to fix build break.
d2d3af652a595b4a43e745efbb2791ecfa9d4292 08-Aug-2013 Stephen Hines <srhines@google.com> am 6a368cd3: am 147fd9b2: am d50554a5: Add bcc_compat to list of required SDK product packages.

* commit '6a368cd3dc44bc6094687a6a77da91ecfc9e0d17':
Add bcc_compat to list of required SDK product packages.
0aaada25aa265e3c3e219ea6b351a646e077dc17 07-Aug-2013 Stephen Hines <srhines@google.com> am d18bec20: am 6ee70b1c: am 4483ade6: Add frameworks/rs and bcc_compat to windows SDK whitelist.

* commit 'd18bec202bf840aba8996c430a6fe7ba9af19a15':
Add frameworks/rs and bcc_compat to windows SDK whitelist.
94efbd635de732a57fc6de360f4ec8080bec8c31 07-Aug-2013 Stephen Hines <srhines@google.com> Add bcc_compat to sdk.atree to fix build break.

Change-Id: Iaccd5654aca64b249e9805844099fc4724b6b07e
dk.atree
d50554a5ca4aa1b046f1e7cfc2fd08a27a30d92a 07-Aug-2013 Stephen Hines <srhines@google.com> Add bcc_compat to list of required SDK product packages.

Change-Id: I890e6461672ffbaf589b72bac02d5c09ef2b370e
roduct_sdk.mk
ools/windows_sdk.mk
8228c4e025c25daeb30016fe764f255a1b5a92d2 02-Aug-2013 Alex Ray <aray@google.com> update win sdk whitelist with libutils

Change-Id: I4243eef2e8a251b8ba2397754de938709c57695e
indows_sdk_whitelist.mk
9ac7637a545028693b68136664a6761bac127534 01-Aug-2013 Ying Wang <wangying@google.com> Fix win_sdk build.

libutils has been moved to system/core/libs/utils.

Change-Id: Ifd75fd7d5bac8aa24be876860eba030c3b5ae3fb
indows_sdk_whitelist.mk
4483ade6b23878e54a5c2932f04310f611420151 31-Jul-2013 Stephen Hines <srhines@google.com> Add frameworks/rs and bcc_compat to windows SDK whitelist.

Change-Id: I81ff95e98bd827051336709d822f953295269d62
dk-windows-x86.atree
ools/windows_sdk.mk
indows_sdk_whitelist.mk
583fc0990bcf055ceccfb31ad8d1f11715982bb8 25-Jul-2013 Xavier Ducrohet <xav@android.com> Merge "Strip dynamic libraries to reduce size." into jb-mr2-dev
cefd49aae65dc85161d08419494071d74ffb982f 25-Jul-2013 Xavier Ducrohet <xav@android.com> Strip dynamic libraries to reduce size.

Change-Id: Ic43c7cc3dfca82e359abf8ef4c3259ac06eaa7dc
dk-darwin-x86.atree
dk-linux-x86.atree
dk-windows-x86.atree
67b7a3a3fc47db88c901bde9ca3c49e6ae7055bc 25-Jul-2013 Xavier Ducrohet <xav@android.com> Merge "Remove .so from the windows build-tools." into jb-mr2-dev
9368498dc375c7c8b2e402f03d763b8ed283b13a 25-Jul-2013 Xavier Ducrohet <xav@android.com> Remove .so from the windows build-tools.

Change-Id: I7c8610a5c4aec36bcdf56607189e273944738124
dk-windows-x86.atree
1fda1889052050ecf5de9c8d5a0b7c70fe0183ad 25-Jul-2013 Xavier Ducrohet <xav@android.com> Merge "Add dynamic libraries for renderscript." into jb-mr2-dev
afda1d33deb01d79d1072bfa3156236fc452600c 25-Jul-2013 Xavier Ducrohet <xav@android.com> Add dynamic libraries for renderscript.

The new llvm-rs-cc compiler is not statically linked
anymore so those libraries are needed.

Also add the new support stuff.

Change-Id: I4d56f0b07f0f0f120b512726689ae4ff07f38322
dk-darwin-x86.atree
dk-linux-x86.atree
dk-windows-x86.atree
dk.atree
2a4aa3cd5dc0f13f676ed1994e6748a156eb5801 24-Jul-2013 Trevor Johns <trevorjohns@google.com> Remove AppRestrictions and BluetoothLeGatt samples

These have been moved to the new samples repository in
developers/samples/android.

Change-Id: I77312ea146ccb47ec8ecf38c9448149ec4c34962
dk.atree
da67d18b5b41c92317d7a60e0e9300394ac00930 24-Jul-2013 Trevor Johns <trevorjohns@google.com> Add common directory to BasicSyncAdapter sample

This directory will be automatically copied over using a
templating system in the future, but for now it needs to
be copied in using sdk.atree.

This also allows us to remove the symlink that was checked
in previously, and which likely won't work on Windows.

Change-Id: If3d78eec7c1b845d1ae1caca59099d3284bdf73a
dk.atree
cea9fb7b4a9e6dd14b1aced1668094c45991b990 22-Jul-2013 Raphael Moll <raphael@google.com> Add bcc_compat to Windows whitelist.

Change-Id: I2b877d9fba8b0dc258a4dfd282bff0d21b77af0f
(cherry picked from commit 2fdc05f83e17cfaf8e4dec9d9b617d09b65e376c)
indows_sdk_whitelist.mk
af0ab077f336b45b1d099941d93c1c0737d4967b 24-Jul-2013 Trevor Johns <trevorjohns@google.com> Remove samples/legacy from sdk.atree

This directory is only on my local machine, and doesn't
really exist. :)

Change-Id: Iea29b3f06fd089a5dca0f990cca058d9c2e7179b
dk.atree
1ffb35074a304a94d343c21f8d1713396d0efe80 24-Jul-2013 Trevor Johns <trevorjohns@google.com> Add new sample tree to SDK build

Old samples will live in samples/${PLATFORM_NAME}/legacy.

New samples are sorted by category, and come from
developers/samples/android.

Change-Id: I573ba4f58d701eac4896ae795d041cae4b9a9794
dk.atree
b7ed7bec1f3276dde7c4e3771dc59a844540d47e 23-Jul-2013 Xavier Ducrohet <xav@android.com> Add support-v4 to the appcompat lib.

Change-Id: I2676ca4705e5dca15388e3759ba3a644fbae2b9b
dk.atree
31cc1650cf4509d0b5e4c236f28b2e7620104e42 22-Jul-2013 Siva Velusamy <vsiva@google.com> Merge "Release systrace into platform-tools" into jb-mr2-dev
b71371d3afe04a9c79f38ddea4ab02664c9b908d 27-Jun-2013 Fred Chung <fchung@google.com> App restriction for restricted profile sample.

This sample demonstrates how to expose restrictions for a restricted user on a multiuser device. This feature is available on Android 4.3 (API level 18) and above platforms.

Change-Id: I4ef1bbda8e530dd8370d754de814fce96eaae1f1
dk.atree
28f992a9cd9f754cdf5415faac0e7d1d6013a1d9 20-Jul-2013 Siva Velusamy <vsiva@google.com> Release systrace into platform-tools

Change-Id: Id05c92f96ecb38c5a056d51ba86ea2e91a45733d
dk.atree
8b51a39fda458039e68b650eb46f90b95f4bddca 10-Jul-2013 Jeff Brown <jeffbrown@google.com> Merge "Revert "Remove mediarouter v7 support library from SDK."" into jb-mr2-dev
a18be3116aeb5f49b4f20d499b260a3ebc6f6cde 09-Jul-2013 Jeff Brown <jeffbrown@google.com> Revert "Remove mediarouter v7 support library from SDK."

This reverts commit 408c1846145bf99a821fe1fafc48ddbb5a2a6ad5.

Bug: 9425325
Change-Id: I340364c43f3040b454894e55a94be236ff999ce6
ndroid.mk
dk.atree
7167a054a8027f75025c865322fa84791a9b3bd1 19-Jun-2013 Fred Chung <fchung@google.com> Bluetooth LE sample.

This sample demonstrates how to communicate with a Generic Attribute Profile (GATT) server over
Bluetooth Low Energy. This feature is available on Android 4.3 (API level 18) and above
platforms.

You can test this sample app using any Bluetooth Low Energy-capable devices. If the device
supports the Heart Rate Profile, the app will parse and display the heart rate.

Change-Id: I69a4955cb9929f837e81ad1c19145ff45bdd27ec
dk.atree
79cc4f92120e2eafb25d9d1bd8b13eb6bba797b1 20-Jun-2013 Deepanshu Gupta <deepanshu@google.com> Add ICU jar to SDK

Bundle the ICU jar with the SDK.

Change-Id: I0773cee58b072f3bf60c2594b6dee251ef101cf0
dk.atree
408c1846145bf99a821fe1fafc48ddbb5a2a6ad5 15-Jun-2013 Jeff Brown <jeffbrown@google.com> Remove mediarouter v7 support library from SDK.

Bug: 9425325
Change-Id: I9459fa005c4801cac0c2e28c5afb414620241ad9
ndroid.mk
dk.atree
73c1230224d4e6e86d9d7244b8dbd375fa030b16 02-Apr-2013 Ying Wang <wangying@google.com> Add host bin modules for explicit dependency

This fixes the build error:
development/build/sdk.atree:66: couldn't locate source file:
bin/llvm-rs-cc
Previously llvm-rs-cc was indirectly required via some intermediate
targets and now the chain is broken.

Change-Id: I722eee80deb03b219a16fe1c18fe87439ac8ff98
roduct_sdk.mk
063f035dd850dacb6a0d63c39e175284339a2c13 25-Mar-2013 Chris Banes <chrisbanes@google.com> Fixes AppCompat build location

Fixes the appcompat build so that the resulting
lib is with the library project.

Change-Id: I9d7c79bc1b7c9e4d0b894d5c9ce2f7e5e901184b
Signed-off-by: Chris Banes <chrisbanes@google.com>
dk.atree
9ca69cf21f1a8f35fcc472f48b3cf7be4b4b959c 12-Feb-2013 Raphael Moll <ralf@android.com> SDK: Generate build-tools package.

(cherry-picked from bc7c8c5fc59ca99481b534b0e152ff360ed1a3bb)

Change-Id: I36e9ee9a9486da18704428ce5225934a6a308029
dk-windows-x86.atree
dk.atree
ools/mk_sdk_repo_xml.sh
ools/patch_windows_sdk.sh
ools/sdk_repo.mk
ools/windows_sdk.mk
11ad495f11f17a1f2912e0c9e4b915ae5ad6cce9 22-Mar-2013 Raphael Moll <ralf@android.com> am 205d337b: am 6d1249e6: Merge "SDK: Generate build-tools package."

* commit '205d337b9db27ef87b2849bef0ac092b3200cb1e':
SDK: Generate build-tools package.
8a8a3025bb570a8ea526e6754bc680dc7f015140 22-Mar-2013 Raphael Moll <raphael@google.com> resolved conflicts for merge of c6dc2830 to jb-mr2-dev

Change-Id: Ia4e83de02c3f6d04523f52ca9586bdb217d9084c
c6dc2830436a521c4d6e6cd63b793651203a2324 22-Mar-2013 Raphael Moll <raphael@google.com> am 8e9aa76f: am ef196297: SDK: Place platform-tools NOTICE file in proper directory.

* commit '8e9aa76f513c16243a08bb7f3806f4dbc8477ad6':
SDK: Place platform-tools NOTICE file in proper directory.
ef1962972fca71034a63181a04c1ce71be855273 22-Mar-2013 Raphael Moll <raphael@google.com> SDK: Place platform-tools NOTICE file in proper directory.

Change-Id: Id5177504b30599df7f44b2354fb708515cfb54a9
dk.atree
bc7c8c5fc59ca99481b534b0e152ff360ed1a3bb 12-Feb-2013 Raphael Moll <ralf@android.com> SDK: Generate build-tools package.

Change-Id: I36e9ee9a9486da18704428ce5225934a6a308029
dk-windows-x86.atree
dk.atree
ools/mk_sdk_repo_xml.sh
ools/patch_windows_sdk.sh
ools/sdk_repo.mk
ools/windows_sdk.mk
8d894a705a33ad14e4f650a07d6bbd7e10752d81 22-Mar-2013 Raphael Moll <ralf@android.com> am 98013c6f: am cc8a21a2: SDK: Generate build-tools package. DO NOT MERGE.

* commit '98013c6f47475f0990eb135353fd8f9107267e73':
SDK: Generate build-tools package. DO NOT MERGE.
34fd8af67c4983e092ab880134d010d2c896d204 21-Mar-2013 Jeff Brown <jeffbrown@google.com> Add support library SDK dependency.

Bug: 8175766
Change-Id: I327a7d0b57a37fb2fbdb11ab44b1a09832b56863
ndroid.mk
bda0c731681aae85372f33910237a9870cefb48f 20-Mar-2013 Jeff Brown <jeffbrown@google.com> Move media router samples to new Support7Demos project.

Add media router support library to SDK build.

Bug: 8175766
Change-Id: I2f333d40ad39e820e8d706a7dab086241692a861
dk.atree
3221bcdb88a62d6caa89a2ec43d969b6c2c1f3f7 19-Mar-2013 Jeff Brown <jeffbrown@google.com> Update appcompat support lib atree rules.

Bug: 8175766
Change-Id: I553d24844e3f85313207c2c2d64336ee6a5c9a17
dk.atree
a00f2f6eb8e0638250afb7bff83212b18cd4c9c2 19-Mar-2013 Jeff Brown <jeffbrown@google.com> Update gridlayout support library atree rules.

Bug: 8175766
Change-Id: Ia2e2faeff2540cc2879e93f11d082fe47ae1de8f
dk.atree
cc8a21a276ec3c0d4f7c3a09809971f6924f1d0f 12-Feb-2013 Raphael Moll <ralf@android.com> SDK: Generate build-tools package. DO NOT MERGE.

Change-Id: I6ae3757f947e927ea09b637e552834e17f70dc44
dk-windows-x86.atree
dk.atree
ools/mk_sdk_repo_xml.sh
ools/patch_windows_sdk.sh
ools/sdk_repo.mk
ools/windows_sdk.mk
5b698437398040b69225351aba797d40f20c26db 14-Mar-2013 Raphael Moll <ralf@android.com> am b3825b54: am d791f1f8: Merge "Build SDK using prebuilts/devtools."

* commit 'b3825b548848cf6bd9c7659985cb407ea0fda94c':
Build SDK using prebuilts/devtools.
645a29c837ca42016f20d1949127b58c6a105d31 13-Mar-2013 Raphael Moll <ralf@android.com> Build SDK using prebuilts/devtools.

Change-Id: I6fd6ba28b4739c3a14bfa3bac328322e85c5686b
dk_only_whitelist.mk
indows_sdk_whitelist.mk
d090a324e1b2e9a604a6d107d7bbff2840fa535e 19-Feb-2013 Siva Velusamy <vsiva@google.com> am 330baa51: am 8967cbff: Merge "Remove swing-worker."

* commit '330baa51a857e37f90215656e09b4f547086d2a7':
Remove swing-worker.
748e9da0899fde882fa2dda1ddfa2e90c4bf4e90 19-Feb-2013 Siva Velusamy <vsiva@google.com> Remove swing-worker.

Change-Id: Ice7f98745424b0063e3c09c4a93a209a11146c17
roduct_sdk.mk
599c4c41a54e3caccb3e4f4af416f4fa1c601525 08-Feb-2013 Raphael Moll <ralf@android.com> am de7e352b: am ddb45cd3: am 68251f81: Merge "Adjust sdk to new prebuilts location."

# Via Android Git Automerger (2) and others
* commit 'de7e352b15e83b50d3003d92561b8942e3bfdadc':
Adjust sdk to new prebuilts location.
862ae1efae509175d51d382885a062400c3617ea 07-Feb-2013 Raphael Moll <ralf@android.com> Adjust sdk to new prebuilts location.

Change-Id: I4a2cb710ef3c22b7b3c90e5b4ee7757087ebe44c
ools/sdk_repo.mk
7531ada080b8bf39e7eb735e45b29ca4190baaca 17-Jan-2013 Raphael Moll <ralf@android.com> am 288e1996: am b78b8ccd: am 7f340728: Merge "Fix SDK build: use repository XML schemas from new prebuilts."

* commit '288e1996175b76e2ffa163836bfb6f4e595fdf75':
Fix SDK build: use repository XML schemas from new prebuilts.
e26f9f9755da31575fbfc052e1dd3681dd6edcec 17-Jan-2013 Raphael Moll <ralf@android.com> Fix SDK build: use repository XML schemas from new prebuilts.

Change-Id: I32799751cb19db2f99b45c26b7e308b1e11af161
ools/sdk_repo.mk
483a8796e8f0933f28065cefb8968519e77d8ef2 10-Dec-2012 Raphael Moll <ralf@android.com> am bae43244: am d8aa2895: Merge "SDK: fix sdk_repo build."

* commit 'bae4324402ec0acc594a16af225f23dd76b28400':
SDK: fix sdk_repo build.
437419089ccf5d93d18fa721e4eb856f3e3b251d 10-Dec-2012 Raphael Moll <ralf@android.com> SDK: fix sdk_repo build.

The makefile for sdk_repo looks for the repository/addon XSD files in the tree,
these paths needed to be adjusted due to the recent reorganization.

Change-Id: I50120542f78dc72da51b4d5377214c064ec68c01
ools/sdk_repo.mk
e8e0e4b9e7a034890f72289a0bc9a3d5aa980dd9 10-Oct-2012 Siva Velusamy <vsiva@google.com> Add ActionBar support library to SDK build

Change-Id: I417657543452b5a9fa0e80664481a655b39a3874
ndroid.mk
dk.atree
8213206c6ea8be2060db1ddf8acc18e9bcf06e95 25-Sep-2012 Adam Momtaz <amomtaz@google.com> Added UiAutomator samples to SDK

Verified tests are building OK.

Change-Id: I838e44e84b3d9e2e503bff4ed2b95887996d8801
dk.atree
6024d7d616f43039a50f895d1a3c6468acff89ec 15-Aug-2012 Ying Wang <wangying@google.com> am 020d4ab4: Establish the dependency on the uiautomator stubs.

* commit '020d4ab4fa296d4e3a6d1f16aed97738bbc55f43':
Establish the dependency on the uiautomator stubs.
020d4ab4fa296d4e3a6d1f16aed97738bbc55f43 15-Aug-2012 Ying Wang <wangying@google.com> Establish the dependency on the uiautomator stubs.

Bug: 6876802
Change-Id: I27dae218b798f4e939d37ee32238e7d489623a40
ndroid.mk
dk.atree
1e3b3b0a9c90af521e2adaf91e7c548009461958 14-Aug-2012 Xavier Ducrohet <xav@android.com> am 611c676b: Add uiautomator.jar to SDK package.

* commit '611c676b7b7bd983a63f0292661c79c4ccb23bc3':
Add uiautomator.jar to SDK package.
611c676b7b7bd983a63f0292661c79c4ccb23bc3 14-Aug-2012 Xavier Ducrohet <xav@android.com> Add uiautomator.jar to SDK package.

Bug: 6876802
Change-Id: Id2c378ffe458d5a177535c39ca909c498228f6ec
dk.atree
78f6f9b1f34e543e0806cfb0393e29b1e39ae84f 03-Aug-2012 Xavier Ducrohet <xav@android.com> Merge "Add Mips support to SDK."
c52fe389d59cf5bb61d5a385757670a6a093749d 09-Jun-2012 Colin Cross <ccross@android.com> Add libsparse to sdk whitelist

Add libsparse to the sdk whitelist so fastboot can link against it on
windows.

Change-Id: I9c78d99842cb48f970669b1e7421cb5f98e47555
dk_only_whitelist.mk
766b7f578d26c7e528e7d1b21a0a56707a6adf8e 03-Jul-2012 Anirudh Dewani <anirudhd@google.com> am 5ef1389e: packaging the sample for SDK

* commit '5ef1389ebb89c25836c0cc7a1dfc1ef8ad3209a3':
packaging the sample for SDK
5ef1389ebb89c25836c0cc7a1dfc1ef8ad3209a3 03-Jul-2012 Anirudh Dewani <anirudhd@google.com> packaging the sample for SDK

Change-Id: Ie398d7dfd421d7ec3de7ce58a9b9dedd532cd2db
dk.atree
d9a06fa8a9f303755103f3b2d051b83b352f59d7 31-May-2012 Raphael Moll <ralf@android.com> am a8fd9e0a: am 86ef5ca7: Merge "SDK: Ability to generate repos in XSD repository-7."

* commit 'a8fd9e0a3bddffb1aa17bc22b86352a1db36160d':
SDK: Ability to generate repos in XSD repository-7.
a8fd9e0a3bddffb1aa17bc22b86352a1db36160d 31-May-2012 Raphael Moll <ralf@android.com> am 86ef5ca7: Merge "SDK: Ability to generate repos in XSD repository-7."

* commit '86ef5ca7e3cd1a3b8cac77aa645217d3fcdccfab':
SDK: Ability to generate repos in XSD repository-7.
86ef5ca7e3cd1a3b8cac77aa645217d3fcdccfab 31-May-2012 Raphael Moll <ralf@android.com> Merge "SDK: Ability to generate repos in XSD repository-7."
edcc4754ee50d97baf15442e9f1ef10ea299aae5 17-May-2012 Jason Sams <jsams@google.com> am dd1b1981: Merge "Put the compute samples back in the SDK." into jb-dev

* commit 'dd1b1981c33fad38567d4d1e2d56f5ac89ad8101':
Put the compute samples back in the SDK.
dd1b1981c33fad38567d4d1e2d56f5ac89ad8101 17-May-2012 Jason Sams <jsams@google.com> Merge "Put the compute samples back in the SDK." into jb-dev
8cb9623c6daa34e86f3814b4bc64ea92ff2f1e49 16-May-2012 Jason Sams <jsams@google.com> Put the compute samples back in the SDK.

Change-Id: Idda5b632750e52eecf3a16205a0ff14af17b2e1b
dk.atree
495f0c27a5afa48033c221a46ea29f6fb9dbffb0 16-May-2012 Raphael Moll <raphael@google.com> resolved conflicts for merge of cf390116 to jb-dev-plus-aosp

Change-Id: Ia215d78fbeefc59ccd1868fe1365f4260b561e24
91ab8ff8260e2dd27a3537fdbb20720c0391e2ce 16-May-2012 Raphael Moll <ralf@android.com> am 69ce67b4: Merge "Fix Mac SDK: sed s/--in-place/-i/"

* commit '69ce67b42dca77762b18c3a1770a6a32e8c51bbf':
Fix Mac SDK: sed s/--in-place/-i/
cf3901168be8fb78b45cef10e048960650f7b937 15-May-2012 Raphael Moll <ralf@android.com> SDK: don't generate empty codename line in source.properties. DO NOT MERGE.

SDK Bug: b/6490860

Change-Id: I3fbc0b710db891a1649138c8badf4ad88d6e2507
ndroid.mk
877b365e3695e5e00d40b15012d478fcfdd502a9 16-May-2012 Raphael Moll <ralf@android.com> Fix Mac SDK: sed s/--in-place/-i/

Change-Id: Idd6481fd86c62596e95647bd3acaedf1a7158640
ndroid.mk
e65ef1be32e8cce4c7649a9c2c47ec74da784aa8 04-May-2012 Duane Sand <duanes@mips.com> Add Mips support to SDK.

Change-Id: Iac67fbb326c09db8b6d79b0852165acf1272d307
Signed-off-by: Duane Sand <duanes@mips.com>
dk-android-mips.atree
c96a1dae1d6700b36dd7d0bb2432c55bff2cb396 15-May-2012 Raphael Moll <ralf@android.com> am c678e6a5: am d721f0e2: Merge "Fix SDK: don\'t generate empty codename line in source.properties."

* commit 'c678e6a5353126ec97d3db4911d8e630fdebe384':
Fix SDK: don't generate empty codename line in source.properties.
c678e6a5353126ec97d3db4911d8e630fdebe384 15-May-2012 Raphael Moll <ralf@android.com> am d721f0e2: Merge "Fix SDK: don\'t generate empty codename line in source.properties."

* commit 'd721f0e2c2d800743f315e39f29081db6362c850':
Fix SDK: don't generate empty codename line in source.properties.
c52a37f326ab111bd70ff170df225aaa16d1da8d 15-May-2012 Raphael Moll <ralf@android.com> am f9f9ea96: am 66493c9e: Merge "SDK: don\'t generate empty codename line in source.properties."

* commit 'f9f9ea96c1ec64a4b3796c077714e1c100dc3be4':
SDK: don't generate empty codename line in source.properties.
f9f9ea96c1ec64a4b3796c077714e1c100dc3be4 15-May-2012 Raphael Moll <ralf@android.com> am 66493c9e: Merge "SDK: don\'t generate empty codename line in source.properties."

* commit '66493c9e6ac3ec87f33347bea745b43b04519bd1':
SDK: don't generate empty codename line in source.properties.
8707207977a72f673ed06dc19e94a1c58e957187 15-May-2012 Raphael Moll <ralf@android.com> Fix SDK: don't generate empty codename line in source.properties.

This fixes commit 41a7acfa6b09c134ff0b68586d64e526c5b08254.

Change-Id: I3cc6ee0efea53fd0469c29fb0ffa87d727b15431
ndroid.mk
41a7acfa6b09c134ff0b68586d64e526c5b08254 15-May-2012 Raphael Moll <ralf@android.com> SDK: don't generate empty codename line in source.properties.

SDK Bug: b/6490860

Change-Id: I1eb7090eedca961a2a71a18e5dcef68e6cbf7163
ndroid.mk
b06504185e7d0f009b71102f495bef8f103c9734 11-May-2012 Raphael Moll <ralf@android.com> SDK: Ability to generate repos in XSD repository-7.

Change-Id: Idc4c75a99625342128e59ea06fe8d30c5b2f56b7
ools/mk_sdk_repo_xml.sh
1ccd581a94fed7a92b8d2d63cf590f34a533e4a7 09-May-2012 Xavier Ducrohet <xav@android.com> am 6bd1ae5e: Fix skin.

* commit '6bd1ae5e75a7ac67a72d15d6f0900284eaa4ea51':
Fix skin.
6bd1ae5e75a7ac67a72d15d6f0900284eaa4ea51 08-May-2012 Xavier Ducrohet <xav@android.com> Fix skin.

Bug: 6447905

Change-Id: I50779c5c343ed9f0bf432336b861153e9b047f07
dk.atree
e83c267f4b4693455c1d7cc9866b2a70aeb9c869 26-Apr-2012 Raphael Moll <ralf@android.com> am 5b9f9e28: am 424c95da: Merge "SDK: Update sdk product library dependency list"

* commit '5b9f9e2852dfecedde177fce0fa5206e8cba249f':
SDK: Update sdk product library dependency list
5b9f9e2852dfecedde177fce0fa5206e8cba249f 26-Apr-2012 Raphael Moll <ralf@android.com> am 424c95da: Merge "SDK: Update sdk product library dependency list"

* commit '424c95da4b3a413c1dae1c270437001ea203cbf3':
SDK: Update sdk product library dependency list
8e706a7f507a4e9743747f6810334b5c4de0a9a8 25-Apr-2012 Raphael Moll <ralf@android.com> am e5a8435b: am a70fac3d: Merge "SDK: update product sdk.mk"

* commit 'e5a8435b42fff6080be9bebdf754cfd9f9dff150':
SDK: update product sdk.mk
e5a8435b42fff6080be9bebdf754cfd9f9dff150 25-Apr-2012 Raphael Moll <ralf@android.com> am a70fac3d: Merge "SDK: update product sdk.mk"

* commit 'a70fac3d09705d03cf7b2e98340b174424f54b5a':
SDK: update product sdk.mk
feaa5e8fbe9bf491db5183a3ceca7c70f5e23293 25-Apr-2012 Raphael Moll <ralf@android.com> SDK: Update sdk product library dependency list

Change-Id: I4830e7eac1192360a0a9850f763f98063b2c266f
roduct_sdk.mk
8427f0fcc6f65d6481d0d45019081b18349d9bfa 25-Apr-2012 Xavier Ducrohet <xav@android.com> Merge "Fix GridLayout copy into the SDK."
3c3cb4687e23e8f199897893bde875781e18b426 25-Apr-2012 Xavier Ducrohet <xav@android.com> Fix GridLayout copy into the SDK.

Typo in a dest file name.

Change-Id: I862f19f87608d1643097ee91ce5eaf64e05800d0
dk.atree
fa6183c396d6dd85d302b9af940d18c2cf2890ef 25-Apr-2012 Raphael Moll <ralf@android.com> SDK: update product sdk.mk

The target/product/sdk.mk was split out of build.git.
Now this moves a few dependencies that were listed into the sdk.git
version of this file by mistake. Also sort the entries to be more
readable.

Change-Id: I652bca2b0322e9e8efd4bf2d5d9fcfd6c86d9c6c
roduct_sdk.mk
cf41a76a322947c843e38a6687dd2b7e2ecc7111 25-Apr-2012 Raphael Moll <ralf@android.com> am 931eb3a4: am 497c9183: am 6a04b5bb: Merge "Support for Windows SDK pre-requisite module list."

* commit '931eb3a4005cb8419d7fbc85217ea8a074f39388':
Support for Windows SDK pre-requisite module list.
184eca22084a98ed94ad25caf1089a1da02152d6 25-Apr-2012 Raphael Moll <ralf@android.com> am 56b07781: am a5965405: am 186f007a: Merge "Split build/targets/product/sdk.mk"

* commit '56b077812c0f38d3bace893639a882c7807b040b':
Split build/targets/product/sdk.mk
497c91834be1be005add05c0be0770b6440970f6 24-Apr-2012 Raphael Moll <ralf@android.com> am 6a04b5bb: Merge "Support for Windows SDK pre-requisite module list."

* commit '6a04b5bb4e1655c274cc0f2b3d5e4954c1911792':
Support for Windows SDK pre-requisite module list.
3fb225fbfdfb045a1e117d02d110ffcd63c9252a 23-Apr-2012 Raphael Moll <ralf@android.com> Support for Windows SDK pre-requisite module list.

Requires sdk.git change I08fc98f2e1

Change-Id: I7388d7292d175ceac221ce6790655b37f85e8a32
ools/windows_sdk.mk
9642d03bda7534e353dbdb50662565daa7242d15 23-Apr-2012 Robert Ly <robertly@google.com> am 3fd0c48b: am 018c9eeb: Merge "adding media effects sample to sdk" into ics-mr1

* commit '3fd0c48b8e0f1297dee8ffa6103fd19ebe03da82':
adding media effects sample to sdk
f6199950068eda60c47d07d1e41b588c8fd729a4 23-Apr-2012 Robert Ly <robertly@google.com> am 018c9eeb: Merge "adding media effects sample to sdk" into ics-mr1

* commit '018c9eeb8e05e4dd6965655d9f120b595efcd758':
adding media effects sample to sdk
018c9eeb8e05e4dd6965655d9f120b595efcd758 23-Apr-2012 Robert Ly <robertly@google.com> Merge "adding media effects sample to sdk" into ics-mr1
a596540506a8cd3d4ea780f48e8a9306d4481476 23-Apr-2012 Raphael Moll <ralf@android.com> am 186f007a: Merge "Split build/targets/product/sdk.mk"

* commit '186f007a741bebdc5ad364df9eda1a9b383e2e15':
Split build/targets/product/sdk.mk
ad3600bb6ebbd805fabddf4af2974939b985f883 21-Apr-2012 Xavier Ducrohet <xav@android.com> Merge "Add .classpath/.project/readme to gridlayout support package."
8957faa8d083422b18f0d690ad3ea308bebda711 21-Apr-2012 Xavier Ducrohet <xav@android.com> Add .classpath/.project/readme to gridlayout support package.

Change-Id: I1f8a08a8f21572fe011964c230a6d45d5ac4b530
dk.atree
01d30e1a876d5637b03f01210af0837fc9be01f9 20-Apr-2012 Raphael Moll <ralf@android.com> Split build/targets/product/sdk.mk

Change-Id: I6bbc6644a1dbf19ac768c2ea65d0e383b5dd23ef
roduct_sdk.mk
4c5f2d2735ac9f65f1144b3b0c9930ea048489ac 19-Apr-2012 Alex Sakhartchouk <alexst@google.com> Renderscript is deprecated. Removing from the sdk.

Change-Id: I4963ec4e9287003772d5818789d2de72b72f59c3
dk.atree
d294027b1f6a904f407d85169a1d47458274bd4d 19-Apr-2012 Jean-Baptiste Queru <jbq@google.com> Merge 2fa7b9ff

Change-Id: I59b2fd09648909c721af5ebb951bc2287fe9fc1a
80d4ba77162126cfb60f9ca75f8a1d3a458ed31f 18-Apr-2012 Jesse Hall <jessehall@google.com> Move emulator GLES from development.git to sdk.git

The emulator GLES support has two interfaces: a host shared library
interface used by QEMU, and a protocol between the platform and the
host. The host library interface is not versioned; QEMU and the GLES
renderer must match. The protocol on the other hand must be backwards
compatible: a new GLES renderer must support an older platform image.

Thus for branching purposes it makes more sense to put the GLES
renderer in sdk.git, which is branched along with qemu.git for SDK
releases. Platform images will be built against the protocol version
in the platform branch of sdk.git.

Change-Id: Ie73fce12815c9740e27d0f56caa53c6ceb3d30cc
dk_only_whitelist.mk
b62e28ddde79314f9d556f8755b1c08dff9cdabd 16-Apr-2012 Jesse Hall <jessehall@google.com> Move emulator GLES from development.git to sdk.git

The emulator GLES support has two interfaces: a host shared library
interface used by QEMU, and a protocol between the platform and the
host. The host library interface is not versioned; QEMU and the GLES
renderer must match. The protocol on the other hand must be backwards
compatible: a new GLES renderer must support an older platform image.

Thus for branching purposes it makes more sense to put the GLES
renderer in sdk.git, which is branched along with qemu.git for SDK
releases. Platform images will be built against the protocol version
in the platform branch of sdk.git.

Change-Id: Ibe2cf8de13520aa3fcbaf72328a15ece261d7b86
dk_only_whitelist.mk
affcdfd7d8fbefe6d46cf6750ec0d99ef6c9f5d2 03-Apr-2012 Robert Ly <robertly@google.com> adding media effects sample to sdk

Change-Id: I8fc55e1ac5409c0262bfda930e6db3d34ce6ae08
dk.atree
e331666e3ed0726c1f165224c803705c78b0e927 06-Apr-2012 Adam Powell <adamp@google.com> Move AppNavigation samples around

Move AppNavigation to SupportAppNavigation - this one uses the support
lib navigation helpers.

Add AppNavigation as an implementation of the same sample using the
framework features in JB.

Change-Id: I59e0f2e3e11ccccc277b177aee87bd88da8eb2c6
dk.atree
34f38a5cdde9be1b0ade0a5131e0a23b040a17c0 04-Apr-2012 Xavier Ducrohet <xav@android.com> am 4db20997: am e3e74aa5: am 2a57c793: Merge "Move stuff from prebuilt to prebuilts/tools"

* commit '4db20997681bbb2c7a16e1c7d50b1a1901496144':
Move stuff from prebuilt to prebuilts/tools
e3e74aa50e74a3465295b9405ea0fccca62472a1 04-Apr-2012 Xavier Ducrohet <xav@android.com> am 2a57c793: Merge "Move stuff from prebuilt to prebuilts/tools"

* commit '2a57c79366dcdac42e330a8af752e44410556f31':
Move stuff from prebuilt to prebuilts/tools
40525ef47239076f79b17d60c8a9bd7a949da826 04-Apr-2012 Xavier Ducrohet <xav@android.com> Move stuff from prebuilt to prebuilts/tools

Also move some atree copy to sdk.git where they belong.

Change-Id: Iab62343806917f24f47d15b9dea75e44422d8764
dk-darwin-x86.atree
dk-linux-x86.atree
dk-windows-x86.atree
2edb02ab24e0ba19065cb4d2919892c6ac268921 30-Mar-2012 Raphael Moll <raphael@google.com> SDK: generate repo in xsd v6. DO NOT MERGE.

Requires change Ib6f5b03c and change I6ba33a96.

Change-Id: Ib42676359289e731d045c4a1e26c85fe5868d633
ools/mk_sdk_repo_xml.sh
ools/sdk_repo.mk
8346f695d1266dfe1046e42324fdcca6900b85e3 31-Mar-2012 Tony Chan <htchan@google.com> am d426fcd9: am a29f43f6: am 1a2ddb42: sdk doc change: Added KeyChain API Demo

* commit 'd426fcd9c2df2643b61c0627a41afbe453c9faf4':
sdk doc change: Added KeyChain API Demo
a29f43f6e18ef78e73b64e6f2a0b34908f67fa21 31-Mar-2012 Tony Chan <htchan@google.com> am 1a2ddb42: sdk doc change: Added KeyChain API Demo

* commit '1a2ddb4216d81f9feadfea3a94bc9923255fe49a':
sdk doc change: Added KeyChain API Demo
1a2ddb4216d81f9feadfea3a94bc9923255fe49a 28-Mar-2012 Tony Chan <htchan@google.com> sdk doc change: Added KeyChain API Demo

Change-Id: Ib2b751a9de485359705b243d2c70e5f8f2c8ab3c
dk.atree
8d83be988a063615ebe3bf80af1c71459b394c70 29-Mar-2012 Andrew Hsieh <andrewhsieh@google.com> Fixed win_sdk build due to rs relocation

frameworks/base/libs/rs got promoted to its own git at frameworks/rs.
See https://android-git.corp.google.com/g/#/c/176760

Change-Id: I7ae8ed1df899eade42c77a85d2a63d012aa9fa13
dk.atree
75d9cabc8e921398561fdb8008ffb50c33592b38 28-Mar-2012 Raphael Moll <raphael@google.com> resolved conflicts for merge of fe2da416 to stage-aosp-master

Change-Id: I70924f6d51e2c790314a2f34ae7c33935a72bda6
f413515f16817ce9db25fcf7774bd47ce4b3722f 22-Mar-2012 Raphael Moll <ralf@android.com> Merge SDK support for source.properties templates.

Requires build.git change Ib36928097

Change-Id: Ida0c471fe166a1388584f2cf2250e07040ed0e55
ndroid.mk
dk.atree
ools/mk_sources_zip.py
ools/sdk_repo.mk
a85a93fdb041b7b95dae5a0ca17c69f4e9e4d8eb 27-Mar-2012 Raphael Moll <raphael@google.com> SDK: correctly zip sources.zip package.

When building the sources.zip for the SDK Repository,
the --exec-zip argument seems to be have been lost with
recent merges. Without this flag, the sources.zip is
not valid on some platforms.

Change-Id: I589df3d6df7890e0fccf568a03a76e6985ecb534
ools/sdk_repo.mk
fc188dcc3e9a8d369e09add54552b70712c46267 24-Mar-2012 Raphael Moll <raphael@google.com> am 9be260a2: am e7a1083b: am 9c7b559f: SDK source pkg: exclude all /tools/ and /tests/ directories.

* commit '9be260a24746634cc66e223244d86da7a36bbe2b':
SDK source pkg: exclude all /tools/ and /tests/ directories.
e7a1083bca804f0417ff96d1495ee38f39855453 23-Mar-2012 Raphael Moll <raphael@google.com> am 9c7b559f: SDK source pkg: exclude all /tools/ and /tests/ directories.

* commit '9c7b559fb730c57a522abb2956c0036edcd15e63':
SDK source pkg: exclude all /tools/ and /tests/ directories.
9c7b559fb730c57a522abb2956c0036edcd15e63 23-Mar-2012 Raphael Moll <raphael@google.com> SDK source pkg: exclude all /tools/ and /tests/ directories.

Change-Id: Ia85105385280e21f073cef22e1130ad369bea121
ools/mk_sources_zip.py
bbbc7e26be6a05e993570d0908eb8b06ae88e5fb 23-Mar-2012 Jean-Baptiste Queru <jbq@google.com> am 6c368d28: Merge "Fix build - configure for schema-v4 output"

* commit '6c368d28f57a45e8310fa0a8cdea240a42c2555e':
Fix build - configure for schema-v4 output
e35ac78cd42ae17c3bd62bf3d19ecc5cc71228d3 22-Mar-2012 Jean-Baptiste Queru <jbq@google.com> Fix build - configure for schema-v4 output

Change-Id: I26b334e54b38cba49e84212fbe40250fb16dc738
ools/mk_sdk_repo_xml.sh
79977b408bd50af2884907bdeb62b4d67a9f9fff 22-Mar-2012 Jean-Baptiste Queru <jbq@google.com> am 8d2f79ba: Merge "SDK: generate repo using latest schemas when available."

* commit '8d2f79ba939e0394cf18489503a6f2a3ebcce8f6':
SDK: generate repo using latest schemas when available.
8f7e1f7a95d13815de1a79826a8dcec118f25e1e 28-Feb-2012 Raphael Moll <raphael@google.com> SDK: generate repo using latest schemas when available.

This generates a repository in either v5 or v6 and adjusts
the name/vendor attributes accordingly.

This extracts the support extra in a separate 'repo-extras.xml'
which has an addon.xsd type instead of being a repository.xsd.

Requires sdk.git change Ib0363f06 to build properly.

Change-Id: I250fe7a3ec0dfa490778ae747a1a8f4e536bb395
ools/mk_sdk_repo_xml.sh
ools/sdk_repo.mk
a4c2cb77b51bc2b2faa615e8a6bfa20f24998269 12-Mar-2012 Raphael Moll <raphael@google.com> am af574136: Support lib: use /samples directory. do not merge.

* commit 'af57413607d91e6fbd1f19ddc2292f7943e7db27':
Support lib: use /samples directory. do not merge.
af57413607d91e6fbd1f19ddc2292f7943e7db27 12-Mar-2012 Raphael Moll <raphael@google.com> Support lib: use /samples directory. do not merge.

This NPW now looks for a "samples" directory at the root of
extras SDK packages. This renames the samples so they fit that
new pattern.

Content of the extra is thus:
/v4/*.jar
/v4/src/..
/v13/*.jar
/v13/src/..
/samples/Support4Demos/
/samples/Support13Demos/

(Cherry-pick from 913d903aa2480b387051ec41e6cd2580f7d72f96)

Change-Id: I4bb01d35ede7c7af45e80204c131361ffc4300ee
dk.atree
913d903aa2480b387051ec41e6cd2580f7d72f96 12-Mar-2012 Raphael Moll <raphael@google.com> Support lib: use /samples directory.

This NPW now looks for a "samples" directory at the root of
extras SDK packages. This renames the samples so they fit that
new pattern.

Content of the extra is thus:
/v4/*.jar
/v4/src/..
/v13/*.jar
/v13/src/..
/samples/Support4Demos/
/samples/Support13Demos/

Change-Id: I4bb01d35ede7c7af45e80204c131361ffc4300ee
dk.atree
06f3f54fc01481a1faf6cf660e771aff344e55f8 09-Mar-2012 Ying Wang <wangying@google.com> Add framework/native to fix build.

No framework/native is split out from framework/base.

Change-Id: I3b596a98feee01f433fa0e88d81d780315a3ebb8
dk_only_whitelist.mk
198705d1ab7f818b146c0c6e0d85f80e4b658e06 08-Mar-2012 Xavier Ducrohet <xav@android.com> am 92b3b050: Add a prebuilt of the gridlayout support library. do not merge

* commit '92b3b05096e23b7ce2b4b841044d518a379ada5d':
Add a prebuilt of the gridlayout support library. do not merge
92b3b05096e23b7ce2b4b841044d518a379ada5d 08-Mar-2012 Xavier Ducrohet <xav@android.com> Add a prebuilt of the gridlayout support library. do not merge

Change-Id: Icd43238672a02f84e37d4301bec34dbe48375200
dk.atree
482423c8a95cabaef7226be7ecd67a3471109fe5 08-Mar-2012 Raphael Moll <raphael@google.com> Merge "SDK repo: fix to handle new and old xsd for support lib"
7942a69488bd397f54afdfb726a5c62ec79ae78f 29-Feb-2012 Xavier Ducrohet <xav@android.com> Add the new v7 support library project to the SDK.

Change-Id: If9078f71e369bae3dd4a0e89ddd792bbfef09fbb
ndroid.mk
dk.atree
eb611a2c289f1cea45de4fba3577415b283c3c10 01-Mar-2012 Raphael Moll <raphael@google.com> SDK repo: fix to handle new and old xsd for support lib

Change-Id: Ic6c42a416e115f5f15631d1a1149d2364fbcea69
ools/mk_sdk_repo_xml.sh
9516dc5aa11cae6f8491b48d897feeff4497ff46 28-Feb-2012 Raphael Moll <raphael@google.com> SDK: generate repo using latest schemas when available.

This generates a repository in either v5 or v6 and adjusts
the name/vendor attributes accordingly.

This extracts the support extra in a separate 'repo-extras.xml'
which has an addon.xsd type instead of being a repository.xsd.

Requires sdk.git change Ib0363f06 to build properly.

Change-Id: I250fe7a3ec0dfa490778ae747a1a8f4e536bb395
ools/mk_sdk_repo_xml.sh
ools/sdk_repo.mk
bea50d35622ccae3357b4d8debea8ab96ffed013 16-Feb-2012 Xavier Ducrohet <xav@android.com> SDK repo: use a template for samples/source.properties.

Use a template for samples/source.properties so that it automatically
picks up the current platform API level.

Also merges 52feec594a769653625f6089cfcd5398332922ea
("Update rev numbers of SDK packages.")

Change-Id: I89574842d2b0290cc6cf454f82a3721644cae0f0
ndroid.mk
dk.atree
b4ce1c006d157d038631ad6a93881aeb6dd02633 14-Feb-2012 Raphael Moll <raphael@google.com> SDK: Support generating XML with new name/vendor attributes.

Change-Id: I21f371879660d5b590a212fd81754fc5f128e428
ools/mk_sdk_repo_xml.sh
2ea5b27ef56cb5666dabd09aec2289b3d80ad6ad 14-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 96a4c245: am 5539b1bf: Merge "Merge "Projects whitelisted for Windows SDK compilation.""

* commit '96a4c2452e0f671abf3d66c6dfd9ac75f7105f70':
Merge "Projects whitelisted for Windows SDK compilation."
96a4c2452e0f671abf3d66c6dfd9ac75f7105f70 14-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 5539b1bf: Merge "Merge "Projects whitelisted for Windows SDK compilation.""

* commit '5539b1bf6be817b538e9490c826151415f445081':
Merge "Projects whitelisted for Windows SDK compilation."
f06c958f3c92d68e1a4216eb80fc228eac852db6 27-Jan-2012 Raphael Moll <raphael@google.com> Merge "Projects whitelisted for Windows SDK compilation."

This replaces the list maintained in build/core/main.mk
There's a similar change in sdk.git at Change Ifa8111dbae

(cherry-pick of 2b53ba58976db5696d65e95ce5c1968263976a71)

Change-Id: I9ea5720291c9057aab3cd4f7f590fa2f7ae17444
dk_only_whitelist.mk
2eba3e344341914bccb1b9b9bde951690b625ace 13-Feb-2012 Adam Powell <adamp@google.com> am 404be3bd: am 1b919a3f: am 15a14930: Merge "Add AppNavigation demo" into ics-mr1

* commit '404be3bd4c69682bd697ff0625382e86111c23b6':
Add AppNavigation demo
404be3bd4c69682bd697ff0625382e86111c23b6 13-Feb-2012 Adam Powell <adamp@google.com> am 1b919a3f: am 15a14930: Merge "Add AppNavigation demo" into ics-mr1

* commit '1b919a3fb80350a6ff1857c5c3d94d86766c0555':
Add AppNavigation demo
58589851a68a3769e633f34e0fdc7c8d742f86da 13-Feb-2012 Adam Powell <adamp@google.com> am 15a14930: Merge "Add AppNavigation demo" into ics-mr1

* commit '15a14930d761d85466faf4e5f62209e8ab078b1d':
Add AppNavigation demo
247df4fe798d63ab99fed6fd7c4de0fc913b3aec 17-Jan-2012 Adam Powell <adamp@google.com> Add AppNavigation demo

This demo illustrates the use of the new support library functionality
for navigating within and across tasks using "up" navigation. This
matches the recommendations in the Android design guide.

Change-Id: I2b36c962dd24f0e0f3b3ee3f86319dafc2fc66e2
dk.atree
fd7545f53b403a3dc4418eef3e9f4699fb5d46cd 07-Feb-2012 Raphael Moll <raphael@google.com> Merge "Win SDK: add ext4_utils to project whitelist."
80437f41e53cd90d1ea1ba17158f4c3064c2fbc7 06-Feb-2012 Tor Norbye <tnorbye@google.com> Merge "Update default project icons, and add an xhdpi version"
0a94feb3fe7c839786bf94f79806d6d1e4d96056 06-Feb-2012 Raphael Moll <raphael@google.com> Win SDK: add ext4_utils to project whitelist.

Change-Id: I00ce4e081d05608711f6e5e06dc5448309d76e94
dk_only_whitelist.mk
f9f0224103c189fec3b3f3099ed90f4a1584c1fa 28-Jan-2012 Xavier Ducrohet <xav@google.com> am 54ee466c: am d4f9372a: Merge "Move api.xml from tools/ to platform-tools/" into ics-mr1

* commit '54ee466c5389e0e9326258364a063e57e106ef5b':
Move api.xml from tools/ to platform-tools/
54ee466c5389e0e9326258364a063e57e106ef5b 27-Jan-2012 Xavier Ducrohet <xav@google.com> am d4f9372a: Merge "Move api.xml from tools/ to platform-tools/" into ics-mr1

* commit 'd4f9372a4dc45bafb7c962046459cc22f18e5098':
Move api.xml from tools/ to platform-tools/
82374f6d8d2c516d69bce6d49bee28b8e58917f6 27-Jan-2012 Tor Norbye <tnorbye@google.com> Move api.xml from tools/ to platform-tools/

The API database was generated with code in sdk/apicheck/.

Change-Id: I42559fb47716f8ea2ee2d836375b523644dfe41c
dk.atree
2b53ba58976db5696d65e95ce5c1968263976a71 27-Jan-2012 Raphael Moll <raphael@google.com> Projects whitelisted for Windows SDK compilation.

This replaces the list maintained in build/core/main.mk
There's a similar change in sdk.git at Change Ifa8111dbae

Change-Id: Ie6f728bee2caea203865c4f861b657323f9f4c9c
dk_only_whitelist.mk
a983c2a1a39cd4829594f19fd9d0d2070cd0cc71 09-Jan-2012 Nick Pelly <npelly@google.com> Update NFC samples.

o Remove NFCDemo sample app. It's janky and is mostly parsing code
that isn't needed anymore.
o Use new NDEF APIs for parsing and creating records
o Use nicer setNdefPushMessage() API
o Delete helper NDEF code that is not needed any more
o Use URL instead of Text for the foreground push demo
o Mark AndroidBeamDemo a test so it gets installed in data not system

Change-Id: I75eda84019c2075956688e26f2598f126d5659a2
dk.atree
e4ee58f3cb786dca4efccb090428a4429cc751c9 09-Jan-2012 Jean-Baptiste Queru <jbq@google.com> Reference kernels in new location

Change-Id: Ic2eae2fef0900e8a8f74cff00e427b99c970f036
dk-android-armeabi-v7a.atree
dk-android-armeabi.atree
dk-android-x86.atree
07ffdd5c318f15501683530157cde36583caee59 09-Jan-2012 Jean-Baptiste Queru <jbq@google.com> Reference kernels in new location

Change-Id: Ic2eae2fef0900e8a8f74cff00e427b99c970f036
dk-android-armeabi-v7a.atree
dk-android-armeabi.atree
dk-android-x86.atree
714e5160b7d5efd211f89fa8ebe08b73c65157cf 17-Dec-2011 Tor Norbye <tnorbye@google.com> Update default project icons, and add an xhdpi version

Change-Id: I7546fb49bc2190c2776290320c87e2cb3843be48
dk.atree
476edbaae4f458ec8283955872481bd2565ed5b3 23-Oct-2011 Raphael <raphael@google.com> Merge "SDK: package fastboot in platform-tools on 3 OSes." Do not merge.

SDK Bug: 21115

(cherry picked from commit 94a55ddf0b12940c019b8275cbc5413616e7f1ae)

Change-Id: I7c61bd171d85a52fdb0ac21bd2861f3d474eb4dc
dk-windows-x86.atree
dk.atree
225cdf76c5837ffe92fb1beca0521c5d5c252847 01-Dec-2011 Chia-chi Yeh <chiachi@android.com> am cd4db913: am 51cf4f22: am 9e1fdc96: Merge "Android VPN sample for ICS SDK" into ics-mr0

* commit 'cd4db913a8aa4b99cdb95930f84d3edbefd1f61f':
Android VPN sample for ICS SDK
9e1fdc961cad3c403da3155ac64d912faa5e1bde 01-Dec-2011 Chia-chi Yeh <chiachi@android.com> Merge "Android VPN sample for ICS SDK" into ics-mr0
dd652afd50cd4104da39edea29e2e3d4e16da18e 01-Dec-2011 Raphael Moll <raphael@google.com> resolved conflicts for merge of ac0ad7e7 to master

Change-Id: I2a17f6702a9577d61044c99a4648d8bcf5b3d7fa
bd235021675ba84b79173c0e02712fd838daef7e 01-Dec-2011 Raphael Moll <raphael@google.com> SDK: fix script creating platform source archive.

It turns out that the way I use Python to create ZIP
archives is plain wrong. Some files simply don't have the
right size and we get EOFException when unzipping with
Java's ZipFile.

This change adds a flag to instead simply copy all the
files we want and then run the 'zip' system command.
The python zip facility is left there intact in case
I want to go back and fix it later (I'm going to assume
it's my usage that's wrong before really blaming python).

Change-Id: Iea178a49be0bf23c91c01a2e036ae7a76def2b55
ools/mk_sources_zip.py
ools/sdk_repo.mk
9ad3f40880fa998063e6d3bcb994e918b44272bc 24-Nov-2011 Chia-chi Yeh <chiachi@android.com> Android VPN sample for ICS SDK

Change-Id: I84e568625c5c9cc9b48f338e2d6226a8e9f67017
dk.atree
bbd339a3d3ff192fa30f6e83f443b983ad5bce38 22-Nov-2011 Raphael <raphael@google.com> Merge "SDK: source.properties templates."
4c23a87d7a05452a33644a7418db8be16b1ed63d 17-Nov-2011 Fred Chung <fchung@google.com> am e39ad49b: am 053c4648: Merge "SDK sample code for Bluetooth HDP API." into ics-mr1

* commit 'e39ad49b453230058ff77df70565360975a68f04':
SDK sample code for Bluetooth HDP API.
512ea9b6f8cc75ec74a7ab8d1c38dec201667f1e 31-Oct-2011 Fred Chung <fchung@google.com> DO NOT MERGE: SDK sample code for Bluetooth HDP API.
Cherry pick from ics-mr1 Change ID I0f68ba42309c960f0df1e537b0932c6d68d9657b

Change-Id: I1d5e37fc24d82f8f9f846c82b93f68dcc58d95cc
dk.atree
053c46485bd24cdef4f0bbbe224cbaa1ba3d7f9b 16-Nov-2011 Fred Chung <fchung@google.com> Merge "SDK sample code for Bluetooth HDP API." into ics-mr1
d79eab5a39486d73eb0f3445a52ae74ebd313b72 16-Nov-2011 Raphael <raphael@google.com> SDK: source.properties templates.

This adds support for "templates" source.properties files that can
inherit the platform version/codename/api level from the build.

The purpose is for a given build to always generate SDK files that
match the platform generated in the same branch.

Change-Id: Id623bbef45a04d953da8eade7e8c34c77709f9c3
ndroid.mk
dk-android-armeabi-v7a.atree
dk-android-armeabi.atree
dk-android-x86.atree
dk.atree
ools/sdk_repo.mk
14c26228cd2d4a2cdf3e230075235c0c3e841cd7 31-Oct-2011 Fred Chung <fchung@google.com> SDK sample code for Bluetooth HDP API.

Change-Id: I0f68ba42309c960f0df1e537b0932c6d68d9657b
dk.atree
65be1a53421ef5c218aa44f86d9870198b19c87e 03-Nov-2011 Robert Ly <robertly@google.com> am cc1eef49: am 8e3c1951: Merge "adding fountain framebuffer object sdk sample" into ics-mr0

* commit 'cc1eef493524af0ce727927996b346312637c78a':
adding fountain framebuffer object sdk sample
8e3c1951915010985db2abee212e8c4c37cacc53 03-Nov-2011 Robert Ly <robertly@google.com> Merge "adding fountain framebuffer object sdk sample" into ics-mr0
a3a8cfd25b531be18102d2465df3d5f0c975cb24 01-Nov-2011 Robert Ly <robertly@google.com> adding fountain framebuffer object sdk sample

Change-Id: I0156281baf450b4aafcd1d43bf5fd9ef8d4cb6cc
dk.atree
d3837ae622513ad149351ed419703b7ca6689e29 01-Nov-2011 Svetoslav Ganov <svetoslavganov@google.com> resolved conflicts for merge of c90e0d59 to master

Change-Id: I51f83d9a0df0c9b154936a669e458becec8b38f7
101f061d3566023ac65b7bcdc548b5875b58a2e7 29-Oct-2011 Svetoslav Ganov <svetoslavganov@google.com> Folding Accessibility Service sample into ApiDemos.

1. Moving Accerssibility Service sample into ApiDemos since
we are putting all accessibility samples there.

2. Fixed regressions (mainly due to adding new event types)
in the Accessibility Service sample.

3. Updated the Query Window Content sample to have some
instructions and to work with touch exploration.

Change-Id: I226ac4130f7f8cae47bb52cbdeab9f104cfaba40
dk.atree
94a55ddf0b12940c019b8275cbc5413616e7f1ae 23-Oct-2011 Raphael <raphael@google.com> SDK: package fastboot in platform-tools on 3 OSes.

SDK Bug: 21115

Change-Id: I0a5ded5ac085dce15f53d012c2ea33d82ede908b
dk-windows-x86.atree
dk.atree
1a9f6bf710d1e437b62fe49ff616fca814066982 21-Oct-2011 Xavier Ducrohet <xav@android.com> CherryPick 676e13 from master to mr0. do not merge.

Move the renderscript include files into platform-tools

The new unique compiler working for all target platforms requires to use
only the latest includes instead of using a different set per target
platforms.

By putting the include in the platform-tools, we ensure that they are
available no matter which platform has been donwloaded and are in sync
with the compiler.

Change-Id: Ib3e8e4e0b02956f60e7f1b4a2e8584a83a33d013
dk.atree
676e13ff606ee52393d8f26e0d37826b9167fbd8 21-Oct-2011 Xavier Ducrohet <xav@android.com> Move the renderscript include files into platform-tools

The new unique compiler working for all target platforms requires to use
only the latest includes instead of using a different set per target
platforms.

By putting the include in the platform-tools, we ensure that they are
available no matter which platform has been donwloaded and are in sync
with the compiler.

Change-Id: Ia5d3d155eeb45c546656123f8cc75d8efe6e631c
dk.atree
47b8def1e3ea4d77ff6e988c37f67b663d9c33d9 18-Oct-2011 satok <satok@google.com> Add hello spell checker sample client app

Bug: 4973788

Change-Id: I938ba499c35d91f2e9dbcd00ae0df64c999b2b95
dk.atree
0f53a4d2942a463bc3edf25210c523dc6c902373 14-Oct-2011 Scott Main <smain@google.com> rename Android Beam sample to Andriod Beam Demo and add launcher icon

Change-Id: If6edb7ac9ba2743ce0dbc39be6f1eede8ef66aaa
dk.atree
f219a95ec0f06ae31b805e9c9010f19d940bd0e2 06-Oct-2011 Anirudh Dewani <anirudhd@google.com> Merge "WiFiDirectDemo"
7ee7d6d5d6efee92f7d13212fa5883ecf58b79a3 01-Oct-2011 Roman Nurik <romannurik@google.com> Add ActionBarCompat sample (CL 1 of 2)

Change-Id: Ie41aee3fc805bf73ef0cd673049fcb608b59275c
dk.atree
12634496be8d78f09755f831a3b92919af0fc31e 20-Sep-2011 Anirudh Dewani <anirudhd@google.com> WiFiDirectDemo

Change-Id: I9ea5020a39f02fd2ba4934397fa9a2ea79f781b4
dk.atree
7d3fde3372263ad1084ccedb50ba5a9d06d86af2 05-Oct-2011 Scott Main <smain@google.com> add NFCDemo and Spell checker service samples to sdk.atree

Change-Id: Ida2b6441026eaf06a648ae4c416ae53bfd593b2c
dk.atree
3da7fb2a60b8c907df6b0f6dd48c455a63400022 05-Oct-2011 Robert Ly <robertly@google.com> clean up Android Beam sample

Change-Id: Ieffe60c0a17509284a112eb11a7588e80e1578ee
dk.atree
8a585470c55b48324be3bd4bdb1f67c0f8430271 04-Oct-2011 Xavier Ducrohet <xav@android.com> Add 1280x720@320dpi skin.

Also tweak some skins to provide more ram to the emulator
for better performance.

Change-Id: I89dcdb7a6a78d95132820db284c1fdfb6f82c6db
dk.atree
3d308aa22cee717875943040f6323526d1fe5695 02-Oct-2011 Raphael Moll <raphael@google.com> SDK: generate support library package on build server.

Also fix packaging of system image (it had an extra root
directory in it, e.g. it was packaging android-4/armeabi-v7a/
instead of just armeabu-v7a/)

Change-Id: I0254b2680168d25103222f8871b2af37a7406b58
ools/mk_sdk_repo_xml.sh
ools/sdk_repo.mk
fdefc0238aaf93e493f61f107fd20509c2720d8b 02-Oct-2011 Raphael Moll <raphael@google.com> SDK: tweak source package (add com.android. sources)

Change-Id: Id1ad2d482c7f0cf58c5832f321997bb3b57d1f24
ools/mk_sources_zip.py
da9eabde860874f88b08c16d9565932a3f1810d9 28-Sep-2011 Raphael Moll <raphael@google.com> SDK: Generate source packages as part of 'make sdk_repo'

Change-Id: Iaea55bae22b2af95993d0f97023a015f2c5a5e77
ools/mk_sdk_repo_xml.sh
ools/mk_sources_zip.py
ools/sdk_repo.mk
4dedff68c253a65d34cec63fe6f24b8d275bf850 28-Sep-2011 Raphael Moll <raphael@google.com> SDK: generate system-image.zip in sdk_repo

Also:
- in the images_*_source.props, we can't have the platform
version name (the human readable string). It's not a valid
property of the XML.
- disable the included-abi in the platform.

Change-Id: I3db62fde5e436bbe8f8e69eb1495ca4e6b954ba2
ools/mk_sdk_repo_xml.sh
ools/sdk_repo.mk
3a1eb8fc1c389585c18526b03cf6fa153fb9391f 21-Sep-2011 Xavier Ducrohet <xav@android.com> Cherry-pick 7fb4cc from master. do not merge.

Build SDK with the new location for the system image.

Change-Id: Ic632d4ef87171fd4ed3e1a5bed9693fb402065c0
dk-android-armeabi-v7a.atree
dk-android-armeabi.atree
dk-android-x86.atree
dk.atree
3acd4823bb53ebcb5bdc50782b9675b6e4b5bb30 18-Sep-2011 Raphael Moll <raphael@google.com> SDK: use XSD v5 props when generating repository packages.

This requires sdk.git Change-Id I6993d6c4 to build
(to enable the use of XSD v5).

Change-Id: If3beb09ae4eef3990caf661b2d4cfbdfd8a6f86a
ools/mk_sdk_repo_xml.sh
ec48ca3dff7f5f377e35949a15492a70d0a8c2f8 18-Sep-2011 Raphael Moll <raphael@google.com> Win SDK: fix missing platforms-tools/dx.bat

In the new windows.atree, the batch file was missing the .bat extension.
This prevents the SDK Manager from recognizing platform-tools.

Change-Id: I885b748f9ce7f6ceeb9f7b9c35ca38f7b8029f55
dk-windows-x86.atree
5dc10d55a4af3008f820388b9ce775a7e8205a09 17-Sep-2011 Raphael <raphael@google.com> Specify the full path to atree for the windows.atree. DO NOT MERGE.

Somehow the build server doesn't automatically find atree.
In a future CL this should be amended to pass the proper
OUT_HOST_EXECUTABLE, being careful that it points to the
host/linux dir, not the current Windows one.

Cherry-pick from master b2b5921

Change-Id: I13e532cdc4c0839b6fd7f2a3a149725940a02734
ools/patch_windows_sdk.sh
405c094032146ab589818e66764db4a90511ba05 16-Sep-2011 Xavier Ducrohet <xav@android.com> Rename Compatibility into support and move it to rev 4. DO NOT MERGE.

Cherry-pick from master e98f22d

Change-Id: I165a7aeb429a4288d6f693a7613a4a102e21dd5b
dk.atree
bc162207564c655fbd78a9cbaf933c62efee16b8 15-Sep-2011 Raphael <raphael@google.com> Use atree for the Windows SDK. Strip binaries. DO NOT MERGE.

This moves the copy/strip/rm logic for the Windows SDK
from the patch_windows_sdk.sh to a regular sdk-windows-x86.atree.

The bash script is still here to invoke atree and do whatever
cleanup we might want to do later.

This should make it easier to maintain the Windows SDK
by providing a structure similar to tools.atree.

This change requires build.git Change-Id: I22aae7a8 to
have rm/strip support in atree.

Cherry-pick from master e07f59a

Change-Id: Ia71fc69717eaee6e4d8d062144347db3326e4127
dk-windows-x86.atree
dk.atree
ools/patch_windows_sdk.sh
ools/windows_sdk.mk
ca4d7f2f74100e6bee906efe563efb65545187e5 16-Sep-2011 Xavier Ducrohet <xav@android.com> Remove llvm/api file matching. DO NOT MERGE

We are moving to a single llvm executable able to handle all
API levels so this file (helping select the llvm exe depending
on target API is not needed anymore).

Cherry-pick from master 73aa4b5

Change-Id: Icc9b035740679eacfa59d452f71e71355816f7be
dk.atree
f31a96aa9fbbf0a08bed0bf55e17e63908c668f4 09-Sep-2011 Raphael <raphael@google.com> SDK packaging for unified llvm-rs-cc binary.

Change-Id: I73971ade5bddadd2f395d098e5a083a6f683c302
dk-darwin-x86.atree
dk-linux-x86.atree
dk.atree
ools/patch_windows_sdk.sh
ools/windows_sdk.mk
169eb6ea17e1e8b512188514b6f306b2799e3ac3 02-Sep-2011 Raphael Moll <ralf@android.com> Merge "Move sdk project ant templates into development.git"
22e4eb29576b543bf0726b77e3a2780e073eed84 30-Aug-2011 Raphael Moll <ralf@android.com> Move sdk project ant templates into development.git

These templates were previously located in sdk.git but
are actually embedded in sdk/platforms/android-n/templates
so really they should be in development.git to avoid
any multi-repo issue.

Change-Id: I9b68f35572fa0c18001873854e1e60d2947dcb39
dk.atree
d9b501bed8f27c4a4e86ecd1e96f4725edc6da53 26-Aug-2011 David Hu <hud@google.com> Fix the location of the GspLocationTest.apk

Change-Id: I4f45bab629bb45fdc9e8ac465a330fa1ab7a7a34
dk.atree
dcb3c9e01aa05e38ea3482c8ae185992cdf292f3 21-Aug-2011 David Hu <hud@google.com> Merge "GPS Location Test Build Change"
0433962f67c783ad1ac55899783197984997764b 03-Aug-2011 Xavier Ducrohet <xav@android.com> Add all platform fonts to the SDK.

Change-Id: Ie73bcb0769313db601466ae5d01416ee7b429353
dk.atree
518aa9cde885be3220163660866b6b9b252fe6a6 02-Aug-2011 David Hu <hud@google.com> GPS Location Test Build Change

move the GpsLocationTest.apk to the emulator-test-apps directory

Change-Id: Ibff69819e74ac7560df453cbe43a721f82600603
dk.atree
345110054ec6f79b1383757b7028ca519805ad61 20-Jul-2011 David Hu <hud@google.com> Merge "Move ConnectivityTest apk to the sdk directory"
7089a5a23780434fa4d1d4ba95e0112a77b9f090 02-Jul-2011 David Hu <hud@google.com> Move ConnectivityTest apk to the sdk directory

Change-Id: I7b28f5edc17ade8c80d123b10f38f96bfe6aaec0
dk.atree
80770d5bc4a7323020f78ca8c5db194298a9f656 18-Jul-2011 Xavier Ducrohet <xav@android.com> Update skin list.

Change-Id: Ic6f128f2ebc69a0cf639ccbe5c6c464375c8201c
dk.atree
dc8ff0c78746dc6694f62fb8c8add514fa84c8f1 14-Jul-2011 Xavier Ducrohet <xav@android.com> Add WSVGA skin to represent 7" tablets.

Change-Id: I0b2865e2213839265f6acf8e9e324fa7018cf336
dk.atree
05c6bed0abe29237524095ba832278152e6bc0bc 29-Jun-2011 David 'Digit' Turner <digit@android.com> am f249fb4f: am eff8b9de: am 39386d45: Merge "sdk: Copy ABI-specific kernel image to platform image directory."

* commit 'f249fb4fe0f5424389fe52e09baf3af1db9a4a55':
sdk: Copy ABI-specific kernel image to platform image directory.
f249fb4fe0f5424389fe52e09baf3af1db9a4a55 29-Jun-2011 David 'Digit' Turner <digit@android.com> am eff8b9de: am 39386d45: Merge "sdk: Copy ABI-specific kernel image to platform image directory."

* commit 'eff8b9de35890bf50093d38ef5e9e81557ad4a9c':
sdk: Copy ABI-specific kernel image to platform image directory.
f7f6842b3235d3537ba2dbd5e13193f428557366 23-Jun-2011 David 'Digit' Turner <digit@android.com> sdk: Copy ABI-specific kernel image to platform image directory.

This patch depends on https://review.source.android.com/24052

It is used to ensure that the proper kernel image is copied to the
platform image's kernel-qemu.

This is needed because for ARMv7 platform builds, the image is
in prebuilt/android-arm/kernel/kernel-qemu-armv7, instead of
prebuilt/android-arm/kernel/kernel-qemu

Change-Id: I0f175a1ba3d97f5c7420597bdeebc7a353551194
dk-android-armeabi-v7a.atree
dk-android-armeabi.atree
dk-android-x86.atree
dk.atree
b688761bab0578d6253c93c47ed4a1c1d159407f 11-Mar-2011 Narayan Kamath <narayan@google.com> Add sample TTS engine

Bug: 4149751
Change-Id: Id8e96d4ec442db46cb97edaeab3ef7c13321ba1f
dk.atree
6ab8e331e3bb7738ab26b9bcfd4e9af98a134328 24-Jun-2011 David 'Digit' Turner <digit@android.com> am 07bd4949: am bf115d33: am 29bcef8f: am 688620eb: Merge "sdk: Ensure we copy build.prop to platform image directory."

* commit '07bd49498684cf905eeab6260a4de11f8ebc4f64':
sdk: Ensure we copy build.prop to platform image directory.
effacceabdd392e413895755ae7ff144abe34e39 23-Jun-2011 Raphael <raphael@google.com> am eae54028: am 0221f2d8: am 320d10ef: Package the 2 llvm-rs-cc versions in the Windows SDK.

* commit 'eae54028c2d763c4edd7129f5d9b91d6541b6dea':
Package the 2 llvm-rs-cc versions in the Windows SDK.
01fa6e5eced2a5d2acd74d2b0c93eaee4db327d3 23-Jun-2011 Xavier Ducrohet <xav@android.com> am 08419fc7: am 608bb77f: am 79aa3cea: Prepare new plat-tools SDK component with 2 llvm versions.

* commit '08419fc7ba3251fa1b059136abc63db24ad7ef1d':
Prepare new plat-tools SDK component with 2 llvm versions.
07bd49498684cf905eeab6260a4de11f8ebc4f64 23-Jun-2011 David 'Digit' Turner <digit@android.com> am bf115d33: am 29bcef8f: am 688620eb: Merge "sdk: Ensure we copy build.prop to platform image directory."

* commit 'bf115d33f26949b636d8cac79d253448fbca2388':
sdk: Ensure we copy build.prop to platform image directory.
eae54028c2d763c4edd7129f5d9b91d6541b6dea 23-Jun-2011 Raphael <raphael@google.com> am 0221f2d8: am 320d10ef: Package the 2 llvm-rs-cc versions in the Windows SDK.

* commit '0221f2d8a084798d279ae8de9bb3a59d934b030f':
Package the 2 llvm-rs-cc versions in the Windows SDK.
08419fc7ba3251fa1b059136abc63db24ad7ef1d 23-Jun-2011 Xavier Ducrohet <xav@android.com> am 608bb77f: am 79aa3cea: Prepare new plat-tools SDK component with 2 llvm versions.

* commit '608bb77f3f13727dbca986bca764644e510283c7':
Prepare new plat-tools SDK component with 2 llvm versions.
320d10ef623c04f3a2fa44af8823fa711a2e6573 26-May-2011 Raphael <raphael@google.com> Package the 2 llvm-rs-cc versions in the Windows SDK.

Change-Id: I7ae8f95b1e173ecc1c5efd6200dfce63b79d9b6c
ools/patch_windows_sdk.sh
ools/windows_sdk.mk
79aa3cea3a00276f49f6987bf1e49b40c3b011c0 26-May-2011 Xavier Ducrohet <xav@android.com> Prepare new plat-tools SDK component with 2 llvm versions.

The output of the platform tree build is llvm-rs-cc-2 and should
be used for apps targeting 12+. This is encoded in llvm-rs-cc.txt

The older (HC) version of llvm-rs-cc is copied from the prebuilt
and is used for apps targeting 11+.

Until new tools that can read/process llvm-rs-cc.txt are released,
old tools will use the HC version of llvm-rs-cc which ensure
proper compatibility.

Change-Id: Iddb924409cc9238531bf1a0448b14b7eac3396a5
dk-darwin-x86.atree
dk-linux-x86.atree
dk.atree
c89b3dd6ef9ce9170d0236f023b24623902f9fc7 18-Jun-2011 Brett Chabot <brettchabot@android.com> Add layoutlib-tests to sdk build.

Change-Id: I20140b367d4f66d1b42d167c0f63f8b3df3e85ef
dk.atree
a21ef2b154ba4584400bb110c6e9aaec97253dcb 17-Jun-2011 David 'Digit' Turner <digit@android.com> sdk: Ensure we copy build.prop to platform image directory.

This patch ensures that we copy the generated build.prop file to
the platform image directory. This file will later be used by the
emulator and other tools to determine various properties of the
image without having to parse the system.img file.

For example, this can be used to extract the target CPU architecture
and/or ABI, and automatically adjust emulation based on this.

Change-Id: Ia5b67c6fb93078b6b224b10e3322af88b99c50b9
dk.atree
bc85db5f9745751db738d904650bec5b5aa3e2d9 14-Jun-2011 Bruno Oliveira <btco@google.com> am 68a87a4a: am d0e6d6f7: am 6f24f89c: Merge "Adds the Random Music Player sample." into honeycomb-mr2

* commit '68a87a4ac6eb7a2b991de8b6df53638015ed9e12':
Adds the Random Music Player sample.
68a87a4ac6eb7a2b991de8b6df53638015ed9e12 13-Jun-2011 Bruno Oliveira <btco@google.com> am d0e6d6f7: am 6f24f89c: Merge "Adds the Random Music Player sample." into honeycomb-mr2

* commit 'd0e6d6f71fe5aab3c9faeecfc480ea7d69c5a080':
Adds the Random Music Player sample.
6f24f89ccb8a4f8a5d86b5e6798ebe2ebab827d2 13-Jun-2011 Bruno Oliveira <btco@google.com> Merge "Adds the Random Music Player sample." into honeycomb-mr2
5146b97fc8143430941b9e9dcf507e53069f1c1b 09-Jun-2011 Ying Wang <wangying@google.com> am 534f6c2d: am 514c8cb5: am e4ccbd68: Use a function to package android support libraries.

* commit '534f6c2de59e707a76bb10137ae013b630a03a2f':
Use a function to package android support libraries.
f3fdaca576019043220f3c44f3a73485d5ecaf33 08-Jun-2011 Xavier Ducrohet <xav@android.com> am 733342c7: am 76fb8500: am 80f84422: Add v13 to the compatibility package.

* commit '733342c71260e8ae4d158848eb4629f550761350':
Add v13 to the compatibility package.
534f6c2de59e707a76bb10137ae013b630a03a2f 07-Jun-2011 Ying Wang <wangying@google.com> am 514c8cb5: am e4ccbd68: Use a function to package android support libraries.

* commit '514c8cb5f622eaa389a7b50a69582ebf9e6c5d21':
Use a function to package android support libraries.
e4ccbd68ec540739819bea7e109d29d08a54122a 07-Jun-2011 Ying Wang <wangying@google.com> Use a function to package android support libraries.

Change-Id: I52240b31fba7728b74d57fd806a93988e3ac8fe9
ndroid.mk
733342c71260e8ae4d158848eb4629f550761350 07-Jun-2011 Xavier Ducrohet <xav@android.com> am 76fb8500: am 80f84422: Add v13 to the compatibility package.

* commit '76fb8500d32e0d9a64b2d00522237d6d8f7a71e9':
Add v13 to the compatibility package.
b30a3010f51cb3631011d84ac948496f044fc7f5 07-Jun-2011 Bruno Oliveira <btco@google.com> Adds the Random Music Player sample.

This sample illustrates how to write an application that plays media
in the background, handles streaming media from the network and
reacts appropriately to system events like headphone disconnection and
audio focus changes, and also uses the notification system to
keep the user informed about what is happening.

This CL is a cherrypick of the old CL 104495 (originally in
honeycomb-mr1) into honeycomb-mr2. Original CL:
https://android-git.corp.google.com/g/#change,104495

Change-Id: Ib8b15ee920300adc093a8b52c17bd9c251ac74ca
dk.atree
80f844229137cb0d78689ea61aea37da4c770c8c 07-Jun-2011 Xavier Ducrohet <xav@android.com> Add v13 to the compatibility package.

Also remove ApiDemos from the package and instead
add each library-specific sample app to each v##
folder.

Change-Id: I2932bbb91c7122c122973902d1fcd159ca899381
ndroid.mk
dk.atree
8d6d2581ff11ec169cd84a6610557b9afdf41e06 16-May-2011 Debashish Chatterjee <debashishc@google.com> Voicemail provider sample source code.

The app demostrates the how to use voicemail provider APIs to insert new
voicemail records using a simple UI.

Change-Id: I22610e06a8b80518b9f0d811f72afe245a4148c6
dk.atree
5ec063c0c65ffdcc420ebb91348a05e861f6f3eb 04-May-2011 Mike Lockwood <lockwood@android.com> am 04b53db9: am cd392822: Add USB MissleLauncher sample program

* commit '04b53db9b44cbef91473bec7d7bab41931729b09':
Add USB MissleLauncher sample program
04b53db9b44cbef91473bec7d7bab41931729b09 04-May-2011 Mike Lockwood <lockwood@android.com> am cd392822: Add USB MissleLauncher sample program

* commit 'cd39282253ec8a27eae1d580fbaa91a8f3c7c5ff':
Add USB MissleLauncher sample program
cd39282253ec8a27eae1d580fbaa91a8f3c7c5ff 02-May-2011 Mike Lockwood <lockwood@android.com> Add USB MissleLauncher sample program

This is sample code that controls a USB missle launcher using USB host APIs

Change-Id: Ic4201faccc4562bf114c70d50b0cab6a00d28a98
Signed-off-by: Mike Lockwood <lockwood@android.com>
dk.atree
b2d8f0ee4e2d90e317f34a1709ba0f4380f56e8f 01-Apr-2011 Raphael <raphael@google.com> am 31d15b9f: Merge 48023786cf63fc4ca90d0c3876d0d578c07d2f68: \'Generate SDK Repository XML.\' Do not merge.

* commit '31d15b9f7616ac5605a895ad8fbc3117f0ff4475':
Merge 48023786cf63fc4ca90d0c3876d0d578c07d2f68: 'Generate SDK Repository XML.' Do not merge.
d739e3ab11047cefab4b3a9ea161ee3ba58952f4 01-Apr-2011 Raphael <raphael@google.com> am 922ee89a: Merge 2ff496b8a14f3f2c68cd5a4d71d3f50a892b4811: \'Build SDK repository.\' Do not merge.

* commit '922ee89a69da7c3007b48977835e9736766b4ba2':
Merge 2ff496b8a14f3f2c68cd5a4d71d3f50a892b4811: 'Build SDK repository.' Do not merge.
e2d5577e86390ee769bb417a5e09133e7d133ae6 28-Mar-2011 Raphael <raphael@google.com> am 4cc9a1e9: Merge 48023786cf63fc4ca90d0c3876d0d578c07d2f68: \'Generate SDK Repository XML.\' Do not merge.

* commit '4cc9a1e942f068c86b0715e398ec40f86a9deb87':
Merge 48023786cf63fc4ca90d0c3876d0d578c07d2f68: 'Generate SDK Repository XML.' Do not merge.
06f2189a4eb7221ae5ef0eda451f4f7875b906b5 26-Mar-2011 Raphael <raphael@google.com> am 627afeae: resolved conflicts for merge of 002acfc3 to stage-korg-master

* commit '627afeae86cf877b53316d976f53c3735414f3ca':
Fix XMLNS detection in SDK Repo XSD files.
31d15b9f7616ac5605a895ad8fbc3117f0ff4475 24-Feb-2011 Raphael <raphael@google.com> Merge 48023786cf63fc4ca90d0c3876d0d578c07d2f68: 'Generate SDK Repository XML.' Do not merge.

When the "sdk_repo" modified is used during the SDK build,
this also generates the repository.xml and addon.xml files
for the new SDK repository packages and places them in
the DIST_DIR.

Example usage:
make -j 16 PRODUCT-sdk-sdk showcommands sdk_repo dist DIST_DIR=/dist/sdk
make -j 16 PRODUCT-google_sdk-sdk_addon showcommands sdk_repo dist DIST_DIR=/dist/addon

Also merges 3ea87ca65fa449e981c5a5dfc6ca6a215be0f5aa
'Fix XMLNS detection in SDK Repo XSD files.'
to prevent a merge conflict later on.

Change-Id: Ib14fe820dab7a60bb5412968c146c30ec5ba81c7
ools/mk_sdk_repo_xml.sh
ools/sdk_repo.mk
4cc9a1e942f068c86b0715e398ec40f86a9deb87 24-Feb-2011 Raphael <raphael@google.com> Merge 48023786cf63fc4ca90d0c3876d0d578c07d2f68: 'Generate SDK Repository XML.' Do not merge.

When the "sdk_repo" modified is used during the SDK build,
this also generates the repository.xml and addon.xml files
for the new SDK repository packages and places them in
the DIST_DIR.

Example usage:
make -j 16 PRODUCT-sdk-sdk showcommands sdk_repo dist DIST_DIR=/dist/sdk
make -j 16 PRODUCT-google_sdk-sdk_addon showcommands sdk_repo dist DIST_DIR=/dist/addon

Also merges 3ea87ca65fa449e981c5a5dfc6ca6a215be0f5aa
'Fix XMLNS detection in SDK Repo XSD files.'
to prevent a merge conflict later on.

Change-Id: Ic9832e71456d76f849406e641792f4285ffbf649
ools/mk_sdk_repo_xml.sh
ools/sdk_repo.mk
627afeae86cf877b53316d976f53c3735414f3ca 26-Mar-2011 Raphael <raphael@google.com> resolved conflicts for merge of 002acfc3 to stage-korg-master

Change-Id: I58e9828bd4d3ebcc4099c9f9ab97390023a1b8e8
44b79c95791a966d4296ae24ddbfbd5b25e27cd3 26-Mar-2011 David Turner <digit@android.com> am 411f741d: am 4621d1a8: am 18ddf41d: Merge "Add x86 qemu"

* commit '411f741d905a174a7f9e315efe7fe7e31f55589b':
Add x86 qemu
411f741d905a174a7f9e315efe7fe7e31f55589b 25-Mar-2011 David Turner <digit@android.com> am 4621d1a8: am 18ddf41d: Merge "Add x86 qemu"

* commit '4621d1a82ce5bb3196c82cb164e7b56521f3a7d2':
Add x86 qemu
3ea87ca65fa449e981c5a5dfc6ca6a215be0f5aa 25-Mar-2011 Raphael <raphael@google.com> Fix XMLNS detection in SDK Repo XSD files.

Change-Id: I7e804c1d7de2db9428d53242c146e15f4c2fcc15
ools/mk_sdk_repo_xml.sh
922ee89a69da7c3007b48977835e9736766b4ba2 16-Feb-2011 Raphael <raphael@google.com> Merge 2ff496b8a14f3f2c68cd5a4d71d3f50a892b4811: 'Build SDK repository.' Do not merge.

When the build is invoked with the fake target "sdk_repo" and
a main target of sdk, win_sdk or sdk_addon, we now create
packages in DIST_DIR that can directly be used to populate the
SDK Repository.
This is quite close to how we actually distribute the SDK.

Change-Id: I671e8ff1bc2a6e9f5c097241d65da1cfdde21154
ools/sdk_repo.mk
ools/windows_sdk.mk
56c341295aeafe5b5d9c508b4375cb431ce4f9b5 24-Feb-2011 Raphael <raphael@google.com> Merge 48023786cf63fc4ca90d0c3876d0d578c07d2f68: 'Generate SDK Repository XML.' Do not merge.

When the "sdk_repo" modified is used during the SDK build,
this also generates the repository.xml and addon.xml files
for the new SDK repository packages and places them in
the DIST_DIR.

Example usage:
make -j 16 PRODUCT-sdk-sdk showcommands sdk_repo dist DIST_DIR=/dist/sdk
make -j 16 PRODUCT-google_sdk-sdk_addon showcommands sdk_repo dist DIST_DIR=/dist/addon

Change-Id: I4f60d3197cac8c22027534cb7686de087ddf1a90
ools/mk_sdk_repo_xml.sh
ools/sdk_repo.mk
9eec9510593c720a16a152c3121c3176e97cf256 16-Feb-2011 Raphael <raphael@google.com> Merge 2ff496b8a14f3f2c68cd5a4d71d3f50a892b4811: 'Build SDK repository.' Do not merge.

When the build is invoked with the fake target "sdk_repo" and
a main target of sdk, win_sdk or sdk_addon, we now create
packages in DIST_DIR that can directly be used to populate the
SDK Repository.
This is quite close to how we actually distribute the SDK.

Change-Id: I1c4a120616697383792d7fb1b328cfcefac0b2f5
ools/sdk_repo.mk
ools/windows_sdk.mk
4621d1a82ce5bb3196c82cb164e7b56521f3a7d2 22-Mar-2011 David Turner <digit@android.com> am 18ddf41d: Merge "Add x86 qemu"

* commit '18ddf41d5d11729c58fbbfbe0f22e7c5888a1751':
Add x86 qemu
60f5414658831dfb0bcbe544bf97c564ce307c48 07-Feb-2011 Bruce Beare <bruce.j.beare@intel.com> Add x86 qemu

Change-Id: Ic0bfcacd5834f9c2345d7fc0c45528da321f0f7f
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Author: Jun Nakajima <jun.nakajima@intel.com>
dk.atree
48023786cf63fc4ca90d0c3876d0d578c07d2f68 24-Feb-2011 Raphael <raphael@google.com> Generate SDK Repository XML.

When the "sdk_repo" modified is used during the SDK build,
this also generates the repository.xml and addon.xml files
for the new SDK repository packages and places them in
the DIST_DIR.

Example usage:
make -j 16 PRODUCT-sdk-sdk showcommands sdk_repo dist DIST_DIR=/dist/sdk
make -j 16 PRODUCT-google_sdk-sdk_addon showcommands sdk_repo dist DIST_DIR=/dist/addon

Change-Id: Ibaad66f4b1cc476a4146afde7087a10a0557f74c
ools/mk_sdk_repo_xml.sh
ools/sdk_repo.mk
d73e1584d5898c9c976ec0eeabf4131ddea8ea50 17-Mar-2011 Xavier Ducrohet <xav@android.com> Add android-support-v4.jar to the apidemo samples in the SDK package.

Change-Id: I07a9723152ffc4f08bbfd254e886986ec0429509
dk.atree
07815cd01d90bde943c7d418322898d9e1a82c6e 15-Mar-2011 Xavier Ducrohet <xav@android.com> Remove the pre-made notice file from platform-tools.

A change in build.git now puts the one that's automatically
generated.

Change-Id: Idced9ea6176152400189203b84809c9a5a3fd92e
dk.atree
b0948c5a6e6615c8d4497b3161d200464edb5297 11-Mar-2011 Ying Wang <wangying@google.com> am b058af05: Disable ccache when using mingw.

* commit 'b058af052efa1dccf38eef8993008920088ff188':
Disable ccache when using mingw.
b058af052efa1dccf38eef8993008920088ff188 11-Mar-2011 Ying Wang <wangying@google.com> Disable ccache when using mingw.

Change-Id: I40ec9f6dfbf54b362b8a87cde7774b396b46b063
ools/windows_sdk.mk
ff3d4bc42b22093695896bc319c59b139aa2c6f6 11-Mar-2011 Ying Wang <wangying@google.com> resolved conflicts for merge of 1a6a849b to gingerbread-plus-aosp

Change-Id: I05bf91403b3160ff6db7b9a60b3c1c5f1ded0c5b
1a6a849bcb4d074113777d78cb769546e7db42b5 11-Mar-2011 Ying Wang <wangying@google.com> Disable ccache when use mingw.

Change-Id: Ieff363f9c4433bba53d1e94a25477c60933666e2
ools/windows_sdk.mk
d46eaa6f76e7e3c9b98283a7e50d64f7b23d3075 02-Mar-2011 Ying Wang <wangying@google.com> Add android-support-v4.jar to sdk.

Change-Id: I28d2a323d31df6b405548e0c73c616eb7b69753d
ndroid.mk
dk.atree
7aa1c11e670356fe53b726752141b467f47fda26 01-Mar-2011 Xavier Ducrohet <xav@android.com> Fix SDK build.

Change-Id: I214048d331c0c9d3885983e588e9313dd3722346
dk.atree
e488b3ef67c20fc667bd1be7bceebd424630f36f 01-Mar-2011 Xavier Ducrohet <xav@android.com> Put back jar file into compatibility package.

Change-Id: I437d3ba7b6fae13815e34a741adadac8e6ecd8f1
dk.atree
51920ee66121bdb6868a05e99aeb1f20d0cb687a 01-Mar-2011 Xavier Ducrohet <xav@android.com> Fix build by using $(DIST_DIR)

Change-Id: I68832ee411fcafa171354c8b06b0992c8f01cd4d
dk.atree
62df672f5d758d3487ab67c6e7bc6b3e1cba2e6d 28-Feb-2011 Xavier Ducrohet <xav@android.com> Package compatibility component.

Change-Id: I4324df1814ae9450b254b22c7bd1b28e4826a29b
dk.atree
005148359f27f0c7b3bfb0f96f8386c244a57be6 28-Feb-2011 Alex Sakhartchouk <alexst@google.com> Merge "Moving renderscript sdk samples to their correct location."
e4304711340fd42d688526cf745b4e165b800a62 22-Feb-2011 Alex Sakhartchouk <alexst@google.com> Moving renderscript sdk samples to their correct location.

Change-Id: I27de909cf0dbd91319c0eefebd0184ecc5c12dc9
dk.atree
2ff496b8a14f3f2c68cd5a4d71d3f50a892b4811 16-Feb-2011 Raphael <raphael@google.com> Build SDK repository.

When the build is invoked with the fake target "sdk_repo" and
a main target of sdk, win_sdk or sdk_addon, we now create
packages in DIST_DIR that can directly be used to populate the
SDK Repository.
This is quite close to how we actually distribute the SDK.

Change-Id: I01c729eff4dbc1eccbc7c5b1869f329363f1ce07
ools/sdk_repo.mk
ools/windows_sdk.mk
f9b583bf03fe7c93ca15ecb0ce6bf59e467ff592 14-Feb-2011 Raphael <raphael@google.com> Win SDK: remove test of llvm-rs-cc presence.

This removes the test that makes the SDK only strip llvm-rs-cc.exe if present.
It means the SDK will FAIL if llvm-rs-cc wasn't build successfully for Windows.

Change-Id: I4c73954c30265e71e84916976f16ae76d67a8e13
ools/windows_sdk.mk
e412a0f4a9ac5661ac3eaeaf160507e90642a249 11-Feb-2011 Winson Chung <winsonc@google.com> Adding sample for collection widgets backed by content providers.

Change-Id: If0005d88a19dfa05ddd7c60aba1a1d7d742158be
dk.atree
be64691c98fee6dcb63bc88ffce5c6c0f3615ab4 09-Feb-2011 Alex Sakhartchouk <alexst@google.com> Adding renderscript samples.

Change-Id: I9aecae9aa554c5fdc6a4843e80509d54eac5bebe
dk.atree
f4f345d0b75c96d92f15a9aba8d58d5d4bec27c6 05-Feb-2011 Roman Nurik <romannurik@google.com> Major update to HoneycombGallery

* Add action bar and icon theming
* Add contextual action bar and photo sharing
* Add notifications (with large icons too)
* Add fullscreening (lights-out mode)
* Add a picture frame

Change-Id: I07a1da435d5adc7bc76c7ac2cc087ff2efd74156
dk.atree
ad402d2b1f4315f31be760d5d2345561059bbe75 03-Feb-2011 Raphael <raphael@google.com> resolved conflicts for merge of d30ec22e to gingerbread-plus-aosp

Change-Id: I02a991cfb35d3cd14bd45eee1c3454e5a9c4600b
27caad9905b7346bfb4e93ff98371ecdf7cdf433 03-Feb-2011 Raphael <raphael@google.com> am 343c626a: am b0e81c37: Merge "SDK: Strip llvm-rs-cc in Windows SDK."

* commit '343c626adaaf323f13d3d0796cf4c84455496a96':
SDK: Strip llvm-rs-cc in Windows SDK.
7a508aed2ac3fe64b307cf05df9989e41e7f6630 01-Feb-2011 Raphael <raphael@google.com> SDK: fix win-sdk build errors, make future errors fatal.

Firs this fixes a cp/rm errors that were logged when building the Windows SDK.
There errors happens because the secondary sdk/tools/patch_windows_sdk.sh
was run twice.

Next the shell script is changed to make any error fatal and actually
break the build, like it should.

In the makefile, merge Ying's fix to correctly pass showcommands.

Change-Id: Iee75e42b0b0bbba3c26858c82c933660dc6d74ae
ools/patch_windows_sdk.sh
ools/windows_sdk.mk
0e2de35b07d086bba435cda6c112481c75a47521 01-Feb-2011 Raphael <raphael@google.com> SDK: Strip llvm-rs-cc in Windows SDK.

SDK Bug: 3394374

Change-Id: I892afdde0672bd5803d25c99e202f2b0418b796d
ools/windows_sdk.mk
cedf2ba81879e658b66c9023ec313c0681a819a7 01-Feb-2011 Raphael <raphael@google.com> SDK: fix win-sdk build errors, make future errors fatal.

Firs this fixes a cp/rm errors that were logged when building the Windows SDK.
There errors happens because the secondary sdk/tools/patch_windows_sdk.sh
was run twice.

Next the shell script is changed to make any error fatal and actually
break the build, like it should.

In the makefile, merge Ying's fix to correctly pass showcommands.

Change-Id: I97bbe46d705c6683e31bb701222efe6f9da71d70
ools/patch_windows_sdk.sh
ools/windows_sdk.mk
d38c76bdf0b3242d096bd391ac7ab5602ac7d304 01-Feb-2011 Raphael <raphael@google.com> SDK: Strip llvm-rs-cc in Windows SDK.

SDK Bug: 3394374

Change-Id: I46ca70a674da28f265f977a267f81039afe3de7c
ools/windows_sdk.mk
75b7bb2521a9e8be84f24f2860870f13e9e5d263 01-Feb-2011 Xavier Ducrohet <xav@android.com> Add Clang includes to the SDK for Renderscript

Change-Id: I247f5c1480799868792871ea68c7765fbbc01fa6
dk.atree
ce2fdae0e68a8a63ddf46eb2718fb5fd39ff5d52 29-Jan-2011 Jean-Baptiste Queru <jbq@google.com> Merge 1adaa571 from gingerbread

Change-Id: Ic4be80eea5331f2b32b507dd6546b86383306f94
6a691b3ed872ed42d83ef52a0f975cfc5b3c638a 28-Jan-2011 Raphael <raphael@google.com> resolved conflicts for merge of 1adaa571 to gingerbread-plus-aosp

Change-Id: I6c2ea537a9f6dce3c5d54b8c3c720b49058fea68
1adaa57108517bc4ea45c9fe4881390f056354d8 27-Jan-2011 Raphael <raphael@google.com> unix2dos command, used by win SDK, has been renamed under Lucid.

Note: this fix was already in master.

Change-Id: I7935093ef4a01181f7239e9aeeef4792ee0b54cc
ools/patch_windows_sdk.sh
ools/windows_sdk.mk
9f935c7da5a0111f8ee0d2f7c59e6c1695916053 12-Jan-2011 Alexander Lucas <alexlucas@google.com> Added Honeycomb Gallery sample application.

Change-Id: I1eefc2837016a7973544f0c57a8464466e7dcef9
dk.atree
91946fe86a7c1f481796d8e0b0f219f457db5750 19-Jan-2011 Xavier Ducrohet <xav@android.com> Merge "Add RenderScript samples to the SDK." into honeycomb
3292919d700910cff8673edf9d6d401ccad6b8e1 19-Jan-2011 Xavier Ducrohet <xav@android.com> Add RenderScript samples to the SDK.

Change-Id: I6139a792916a1cb942c05be8243d52784f39f859
dk.atree
7a3e7b1b9ad0a06744a1c76ae398f684dda7b2bf 18-Jan-2011 Xavier Ducrohet <xav@android.com> Update sdk.prop for the platform SDK component.

sdk.properties should be stored in development.git and
not sdk.git so move it here.

Change-Id: I32e166927ea91cad36d66bb14e90cb36ccb3bc82
dk.atree
ebb6bc2fc89ed6bf3a5135fc9a282a5821392a3c 18-Jan-2011 Jack Palevich <jackpal@google.com> Add BasicGLSurfaceView sample.

Show how to get started with OpenGL ES 2.0.

Change-Id: Iee83ca6a52eee64e8c6b77bc9a8abff11a1eabfd
dk.atree
2fd4288383e8af566d8d423eb606f8fd98a21d8f 18-Jan-2011 Jack Palevich <jackpal@google.com> am 5e38995f: Merge "Add BasicGLSurfaceView sample." into gingerbread

* commit '5e38995f6af6339e5dccf86b50f8b658917c7aeb':
Add BasicGLSurfaceView sample.
a67b557e13a11afc84beed873c7be4f2fac59643 17-Jan-2011 Xavier Ducrohet <xav@android.com> Merge "Add RS includes to the SDK and update skin list." into honeycomb
eb80909dfc0d44d1bd6b38aea12b3740cea4efa9 17-Jan-2011 Winson Chung <winsonc@google.com> Adding WidgetPreview utility.

Change-Id: Idfdf866400687e58304863c3c4f3dd3c4aed45b1
dk.atree
14f3c60f50fdb912faaaa49bae2a19b578e6b00f 16-Jan-2011 Xavier Ducrohet <xav@android.com> Add RS includes to the SDK and update skin list.

Change-Id: Id453585e5c1f4d80336bd2fc837afbc7a0a0d097
dk.atree
2f6e41d6646a3eea54c3cb890ce32b6360d3d913 15-Jan-2011 Jack Palevich <jackpal@google.com> Add BasicGLSurfaceView sample.

Show how to get started with OpenGL ES 2.0.

Change-Id: I22e5e72114fd76bb7319c51e0a3b0d0e05c546fb
dk.atree
32d597b5b7e74b901c92a341409a57005b986efe 14-Jan-2011 Raphael <raphael@google.com> Add llvm-rs-cc to the SDK (all platforms)

Change-Id: I6077251d0a34678e708ddd25068a511159ba7460
dk.atree
ools/patch_windows_sdk.sh
ools/windows_sdk.mk
9709bd228b32ac82c640e95b04a2c48406c472c6 07-Jan-2011 Xavier Ducrohet <xav@android.com> Add WXGA skin.

Change-Id: I29e62d5a1bf9d5017bfdca9fe07ae4e3124f951c
dk.atree
300b84c42779fc8aa52b4bd0d5dd6bb29c4724fc 06-Jan-2011 Xavier Ducrohet <xav@android.com> Cherry-pick f0e5e933 from master.

Move emulator skins to development.git

Also added new default RAM config to the skins.

Change-Id: Ic22592573d6d153fb94e2e2c981068936cae1219
dk.atree
daf0b895e8e0c952cc8563972d74a5e06fba7d0b 06-Jan-2011 Xavier Ducrohet <xav@android.com> Cherry-pick f0e5e933 from master.

Move emulator skins to development.git

Also added new default RAM config to the skins.

Change-Id: I520c485f4ef9f6d9d2eea126ed46d96b5fc3e785
dk.atree
12cd9bacfbdbbe82993ed225b91df1e31d07587b 07-Jan-2011 Xavier Ducrohet <xav@android.com> am dde7492d: Merge "Move emulator skins to development.git"

* commit 'dde7492d4b34ba810329ad080a078bfb870a4507':
Move emulator skins to development.git
f0e5e9330723730d69c6b67101fda8e6cb17df5c 06-Jan-2011 Xavier Ducrohet <xav@android.com> Move emulator skins to development.git

Also added new default RAM config to the skins.

Change-Id: Ib786287b43f639c6ae80bf109ac4fe5b12635676
dk.atree
1c0b37567bb7cdf509adae3e8c2452d61eaf0383 06-Jan-2011 Raphael Moll <ralf@android.com> am 40812f1c: am 1bf9f693: Merge "Use OUT_DIR in atree to find android.jar"

* commit '40812f1c4b312d8276eb2839c06d2d76dd4f97e1':
Use OUT_DIR in atree to find android.jar
40812f1c4b312d8276eb2839c06d2d76dd4f97e1 06-Jan-2011 Raphael Moll <ralf@android.com> am 1bf9f693: Merge "Use OUT_DIR in atree to find android.jar"

* commit '1bf9f6936e423a686b623752e9f008acefaa1057':
Use OUT_DIR in atree to find android.jar
c2e80832552a38655e634f4319451201fa61d670 05-Jan-2011 Raphael Moll <ralf@android.com> Use OUT_DIR in atree to find android.jar

Depends on change Iabbe9053 from build/core.

Change-Id: I0b6e29a5282c2ca6ff329981e5f8d2c677e6e84b
dk.atree
6499e7fc3a4158c111fa84fe1c14e2ae3d6296ca 30-Nov-2010 Dirk Dougherty <ddougherty@google.com> am 49b989c3: am 4171f296: Add AcceleromerPlay sample app to SDK samples package

* commit '49b989c36a07a2440d94ec4f6c899f4e30be1799':
Add AcceleromerPlay sample app to SDK samples package
49b989c36a07a2440d94ec4f6c899f4e30be1799 30-Nov-2010 Dirk Dougherty <ddougherty@google.com> am 4171f296: Add AcceleromerPlay sample app to SDK samples package

* commit '4171f296681a0ef0a1df21fdc792fc9997c1146b':
Add AcceleromerPlay sample app to SDK samples package
4171f296681a0ef0a1df21fdc792fc9997c1146b 25-Nov-2010 Dirk Dougherty <ddougherty@google.com> Add AcceleromerPlay sample app to SDK samples package

Change-Id: Id7ae8de4f3543169d6d707a470f0b872e00e953f
dk.atree
f5d68235fab750351f5ceb0906e793e33841fa6a 30-Nov-2010 Dirk Dougherty <ddougherty@google.com> am fb381e9f: am c73f37ba: Remove HeavyWeight sample from SDK samples package.

* commit 'fb381e9ff5cdc18d2a5463dc858980e3a609b8d0':
Remove HeavyWeight sample from SDK samples package.
fb381e9ff5cdc18d2a5463dc858980e3a609b8d0 30-Nov-2010 Dirk Dougherty <ddougherty@google.com> am c73f37ba: Remove HeavyWeight sample from SDK samples package.

* commit 'c73f37ba5790cd1fe588d0f5886b677a7eaa39f0':
Remove HeavyWeight sample from SDK samples package.
c73f37ba5790cd1fe588d0f5886b677a7eaa39f0 30-Nov-2010 Dirk Dougherty <ddougherty@google.com> Remove HeavyWeight sample from SDK samples package.

Change-Id: Id2113b8a0cd1a7cc3d807919e6c40c50917baaea
dk.atree
b9beb6c05551066edbb6c7ef9752ce6066e83e63 30-Nov-2010 Dirk Dougherty <ddougherty@google.com> Remove NFCDemo from sdk samples to fix build.

Change-Id: I7ab8743d39a5a0cf60d68544c4e94c786224f78e
dk.atree
02cdaff475e8a632c6c90455d21ae90809566383 30-Nov-2010 Roman Nurik <romannurik@google.com> am 624ae678: am 14789d1e: Merge "Add NFCDemo to sdk.atree" into gingerbread

* commit '624ae678ef28e9abc4902bc49d7a23dbdb63f180':
Add NFCDemo to sdk.atree
624ae678ef28e9abc4902bc49d7a23dbdb63f180 30-Nov-2010 Roman Nurik <romannurik@google.com> am 14789d1e: Merge "Add NFCDemo to sdk.atree" into gingerbread

* commit '14789d1eab905728da4f6995816c80716caf52f4':
Add NFCDemo to sdk.atree
9488e4296eeeada53e839f221360cce9ab965553 30-Nov-2010 Roman Nurik <romannurik@google.com> Add NFCDemo to sdk.atree

Change-Id: I2e0a330a31d6d3c0b8c70c38af60118461e7e403
dk.atree
b26b1274edbc98971ccfd302c05655a4d019baa1 24-Nov-2010 Raphael <raphael@google.com> am a65f7696: resolved conflicts for merge of f0f624f3 to gingerbread-plus-aosp

* commit 'a65f76962f475c9c187dd63dca36e59eff84dcca':
Win SDK: Split the win-sdk makefile and script into 2 parts.
a65f76962f475c9c187dd63dca36e59eff84dcca 24-Nov-2010 Raphael <raphael@google.com> resolved conflicts for merge of f0f624f3 to gingerbread-plus-aosp

Change-Id: I670002d7f8606f22c438057883e1a4a9fe63ebf6
1fe58f3892272469edf594a4a6ee1ab9a16d5813 12-Nov-2010 Raphael Moll <ralf@android.com> Win SDK: Split the win-sdk makefile and script into 2 parts.

The main makefile+scripts to build the Windows SDK is still this
one here in development/build/tools. However it defers to a new
matching set of files in sdk/build to build and package
things that depend on the sdk.git or external/qemu.git.

This will make it easier for us to prepare SDKs based on
a tools_rN branch that isn't cut at the same time than the
platform branch.

This is a multi-part changeset. The other part is in sdk.git.

This change also definitely removes support for building
the Windows SDK under Cygwin. Only building a specific subset
of individual binaries is supported at this point.

Change-Id: I4e9a2d810cf29fae0097fbd92be0cef89c9b3505
ools/make_windows_sdk.sh
ools/patch_windows_sdk.sh
ools/windows_sdk.mk
40090497c692e3df43b1a29f94eb3ede6514a273 04-Nov-2010 Alexander Lucas <alexlucas@google.com> am 655f02a4: am 48cc36d9: Merge "Added SIP Demo to sample apps." into gingerbread

* commit '655f02a45669ce3b03d96cd8634bfe3745b6f725':
Added SIP Demo to sample apps.
655f02a45669ce3b03d96cd8634bfe3745b6f725 03-Nov-2010 Alexander Lucas <alexlucas@google.com> am 48cc36d9: Merge "Added SIP Demo to sample apps." into gingerbread

* commit '48cc36d936ea132665c35a1f8c9a2b4b9207ec0b':
Added SIP Demo to sample apps.
a025796211f15c2796f8ea3208c066801aa250b6 03-Nov-2010 Alexander Lucas <alexlucas@google.com> Added SIP Demo to sample apps.

Change-Id: Id98b6e542e1be5b9822a696936e735406c08500f
dk.atree
01cd2b97eb8ad3169fc8991ab9b5c72ce84fb5d1 27-Oct-2010 Raphael Moll <ralf@android.com> am 07d29555: am 42197997: Merge "SDK Windows: Package customized proguard.bat scripts."
07d29555eea32c172b5a2d2d250894273975b05e 27-Oct-2010 Raphael Moll <ralf@android.com> am 42197997: Merge "SDK Windows: Package customized proguard.bat scripts."
da1248a231ba34dbfee4c6d9acdf7312fff5fa9f 26-Oct-2010 Raphael Moll <ralf@android.com> am 5c428f4a: am 799754e1: Merge "Tools package was missing proguard.bat"

Merge commit '5c428f4a8d7fcbd8aea588593cafa8193d48b5f7'

* commit '5c428f4a8d7fcbd8aea588593cafa8193d48b5f7':
Tools package was missing proguard.bat
5c428f4a8d7fcbd8aea588593cafa8193d48b5f7 26-Oct-2010 Raphael Moll <ralf@android.com> am 799754e1: Merge "Tools package was missing proguard.bat"

Merge commit '799754e18b7ce057a9aab8ea243f7dfd1d4edb44' into gingerbread-plus-aosp

* commit '799754e18b7ce057a9aab8ea243f7dfd1d4edb44':
Tools package was missing proguard.bat
f4320c6b145f0d1f979baf884f9436f9096b5c81 25-Oct-2010 Raphael Moll <ralf@android.com> SDK Windows: Package customized proguard.bat scripts.

Requires Change: Ic1dc74cb3ff4dec9b419e2753290c361dffce48e
in platform/sdk.

Change-Id: Ieb2e308c0e9e655b2c047554563d753ac4cbb852
ools/make_windows_sdk.sh
ools/patch_windows_sdk.sh
b04a4f947cc8ad7f5af403ab197e60e9d17a8a87 24-Oct-2010 Raphael Moll <ralf@android.com> Tools package was missing proguard.bat

SDK Bug: 3126278

Change-Id: I8bb9c2e2250b0da4303b09cdfe05717cee887c44
ools/make_windows_sdk.sh
ools/patch_windows_sdk.sh
f043be867414bb13f51e22714d698ca9d69cb67e 16-Oct-2010 Bill Napier <napier@google.com> am 1e41661b: am 66d61ef9: Merge "Add in MonkeyRunner to the Windows SDK."

Merge commit '1e41661b6077552ed71e902f0e628ea6e48aba06'

* commit '1e41661b6077552ed71e902f0e628ea6e48aba06':
Add in MonkeyRunner to the Windows SDK.
1e41661b6077552ed71e902f0e628ea6e48aba06 16-Oct-2010 Bill Napier <napier@google.com> am 66d61ef9: Merge "Add in MonkeyRunner to the Windows SDK."

Merge commit '66d61ef95f5a0f8abc8b5371409e3c5372c9e10a' into gingerbread-plus-aosp

* commit '66d61ef95f5a0f8abc8b5371409e3c5372c9e10a':
Add in MonkeyRunner to the Windows SDK.
50617c8ff40bdd294d6a802ebdb768516929727f 15-Oct-2010 Xavier Ducrohet <xav@google.com> am dd3b6a80: am 99b80ab4: Merge "GB SDK: don\'t use HV2.bat when generating tools." into gingerbread

Merge commit 'dd3b6a80340514c5b594a7f9ccf8f54ba50d94cb'

* commit 'dd3b6a80340514c5b594a7f9ccf8f54ba50d94cb':
GB SDK: don't use HV2.bat when generating tools.
10540d6528c6bba5ea223966b84e77660a46ee91 15-Oct-2010 Kenny Root <kroot@google.com> resolved conflicts for merge of 6c99a051 to master

Change-Id: I0bae8e92609253924f0c7adbc59f8c45394f341a
cca5d187d59ec95457e1d369bea96bb33b0e052c 14-Oct-2010 Raphael <raphael@google.com> GB SDK: don't use HV2.bat when generating tools.

That's because GB uses the Tools_r& which do not have
hierarchyviewer2 so we should not try to pull the .bat from
hv2. We don't care since we'll ignore these old tools anyway
when packaging the final SDK.

Change-Id: Ie7d161bad59d6e919613db2e854f48964e59c4a9
ools/patch_windows_sdk.sh
9e914e4aa2075a38d76048261808a9a3a3036eb5 13-Oct-2010 Xavier Ducrohet <xav@android.com> Reorder the samples packaging + readme.

Change-Id: Ic4d91b214ec9ceb6303bd99e0a0580fbf3401177
dk.atree
85c3f8e12619b4aac09ec0a0eeba851ac400f0da 10-Oct-2010 Bill Napier <napier@google.com> Add in MonkeyRunner to the Windows SDK.

Change-Id: Iecb23b5a2f790978246df9ab4a10cda884abf742
ools/make_windows_sdk.sh
ools/patch_windows_sdk.sh
59b02d0eff9fb11ea6607a90db3752fe76f250d5 09-Oct-2010 Raphael <raphael@google.com> Update win_sdk to put binaries in SDK/platform-tools.

Change-Id: I8fe9df75ceaf04aa1935341e51bf6f3edffae9e4
ools/make_windows_sdk.sh
ools/patch_windows_sdk.sh
76afc004df452384cfd00137a59c7a3e0502ff75 27-Sep-2010 Xavier Ducrohet <xav@android.com> Integrate sdk.atree changes from master. DO NOT MERGE

- Move adb to the platform-tools.
- Update the windows build for it.
- Split the tools component from sdk.atre into sdk/build/tools.atree

Change-Id: I75608f12d6e1d8bc0f470e3ca26c7e550cfdcbd6
dk.atree
ools/patch_windows_sdk.sh
87bfd07634f9b7d3ed0b491666180099d43f25ee 30-Sep-2010 Xavier Ducrohet <xav@android.com> am 92d47e4e: am 682ec293: Split the tools component from sdk.atree

Merge commit '92d47e4ef65c225bcf82c81377412d5c67349ff5'

* commit '92d47e4ef65c225bcf82c81377412d5c67349ff5':
Split the tools component from sdk.atree
92d47e4ef65c225bcf82c81377412d5c67349ff5 30-Sep-2010 Xavier Ducrohet <xav@android.com> am 682ec293: Split the tools component from sdk.atree

Merge commit '682ec293359cf4ac8c61df25bb05519b604b17eb' into gingerbread-plus-aosp

* commit '682ec293359cf4ac8c61df25bb05519b604b17eb':
Split the tools component from sdk.atree
682ec293359cf4ac8c61df25bb05519b604b17eb 28-Sep-2010 Xavier Ducrohet <xav@android.com> Split the tools component from sdk.atree

This is now in sdk/build/tools.atree.

Change-Id: Ic0c5e14e22a5c760b686dee1a7e376667b9c651b
dk.atree
6f1718bab57c08e0e958595cf11fadf0ae212eff 28-Sep-2010 Xavier Ducrohet <xav@android.com> am daa454cb: am 64e53fe5: Merge "Move adb to the platform-tools."

Merge commit 'daa454cb3ba51dcf75330955dc899d35a7b60989'

* commit 'daa454cb3ba51dcf75330955dc899d35a7b60989':
Move adb to the platform-tools.
745a9108d0e7766e236c3ebfccce3a923597307c 28-Sep-2010 Raphael Moll <ralf@android.com> am c0a2e0fc: am 2f613967: Move adb to the platform-tools (windows SDK part).

Merge commit 'c0a2e0fc63fe94c336b44b40cf69fa70a8151cb5'

* commit 'c0a2e0fc63fe94c336b44b40cf69fa70a8151cb5':
Move adb to the platform-tools (windows SDK part).
daa454cb3ba51dcf75330955dc899d35a7b60989 28-Sep-2010 Xavier Ducrohet <xav@android.com> am 64e53fe5: Merge "Move adb to the platform-tools."

Merge commit '64e53fe5dd1d884eabe5e6160d69afa47038d77b' into gingerbread-plus-aosp

* commit '64e53fe5dd1d884eabe5e6160d69afa47038d77b':
Move adb to the platform-tools.
c0a2e0fc63fe94c336b44b40cf69fa70a8151cb5 28-Sep-2010 Raphael Moll <ralf@android.com> am 2f613967: Move adb to the platform-tools (windows SDK part).

Merge commit '2f613967a0c4a579370ff498c8461abee4978fc7' into gingerbread-plus-aosp

* commit '2f613967a0c4a579370ff498c8461abee4978fc7':
Move adb to the platform-tools (windows SDK part).
64e53fe5dd1d884eabe5e6160d69afa47038d77b 28-Sep-2010 Xavier Ducrohet <xav@android.com> Merge "Move adb to the platform-tools."
2f613967a0c4a579370ff498c8461abee4978fc7 28-Sep-2010 Raphael Moll <ralf@android.com> Move adb to the platform-tools (windows SDK part).

This is the Win SDK counterpart to Change I4c2a11c1.

Change-Id: I660ba49154894b5e78d7e943258ed769efd393dc
ools/patch_windows_sdk.sh
6a8e50f695bc9f7b687939c8e73948b4056cab93 27-Sep-2010 Xavier Ducrohet <xav@android.com> Move adb to the platform-tools.

Also fixed the packaging of hierarchyViewer in the SDK

Change-Id: I4c2a11c1d87867efdd5df2dcb90469b7b1c5065a
dk.atree
c54f778e92fe7231aab646d62054a2f92b62bdca 18-Sep-2010 Xavier Ducrohet <xav@android.com> am 591b5edf: am d5964750: Package Proguard with the SDK.

Merge commit '591b5edf255a5872fbfb5424f3ee0028fd036d08'

* commit '591b5edf255a5872fbfb5424f3ee0028fd036d08':
Package Proguard with the SDK.
591b5edf255a5872fbfb5424f3ee0028fd036d08 17-Sep-2010 Xavier Ducrohet <xav@android.com> am d5964750: Package Proguard with the SDK.

Merge commit 'd59647505dff76ebb2e8da489fabf6bf5ddb0d1f' into gingerbread-plus-aosp

* commit 'd59647505dff76ebb2e8da489fabf6bf5ddb0d1f':
Package Proguard with the SDK.
d59647505dff76ebb2e8da489fabf6bf5ddb0d1f 16-Sep-2010 Xavier Ducrohet <xav@android.com> Package Proguard with the SDK.

Change-Id: Ia3effdf9465edbe55d5a691bf7bad163e95bb625
dk.atree
8d74e52a0a3817c4e91a7d5281b61ce63ece82fe 14-Sep-2010 Megha Joshi <mjoshi@google.com> resolved conflicts for merge of 292096fc to master

Change-Id: I2a0d13b3b36aaf3fd6d6b1161bb75ae5ae890630
292096fccd9214a14ef0bffcda19aada22c2874c 14-Sep-2010 Megha Joshi <mjoshi@google.com> am 3471dafa: am 42d3a4ae: Adding CrossCompatibility sample app.

Merge commit '3471dafa11b721ae4510cb182e3d54033faed12d' into gingerbread-plus-aosp

* commit '3471dafa11b721ae4510cb182e3d54033faed12d':
Adding CrossCompatibility sample app.
3471dafa11b721ae4510cb182e3d54033faed12d 14-Sep-2010 Megha Joshi <mjoshi@google.com> am 42d3a4ae: Adding CrossCompatibility sample app.

Merge commit '42d3a4ae1431fb3f02ac212000e8cdfb6f21e226' into gingerbread

* commit '42d3a4ae1431fb3f02ac212000e8cdfb6f21e226':
Adding CrossCompatibility sample app.
42d3a4ae1431fb3f02ac212000e8cdfb6f21e226 17-Aug-2010 Megha Joshi <mjoshi@google.com> Adding CrossCompatibility sample app.

Change-Id: I565584ea53212f61a9fbbb44e50da59f4ba06fff
dk.atree
3aecc4de01b8d8331e6e976add6bb6981af4ded3 28-Aug-2010 Xavier Ducrohet <xav@android.com> New SDK architecture. DO NOT MERGE.

tools normally under the platform, move to a single location
called platform-tools/

Change-Id: I70659167778303722acb107a2d04bbf01467f884
dk.atree
e1a36a69e8be4f4a063ff1c2ee7650fd4a3e74cd 28-Aug-2010 Xavier Ducrohet <xav@android.com> am 7ddeaf21: am 420b59fe: Fix windows SDK build.

Merge commit '7ddeaf2189847cbc6765af552c98439d654d6938'

* commit '7ddeaf2189847cbc6765af552c98439d654d6938':
Fix windows SDK build.
7ddeaf2189847cbc6765af552c98439d654d6938 28-Aug-2010 Xavier Ducrohet <xav@android.com> am 420b59fe: Fix windows SDK build.

Merge commit '420b59fe215f8a912e66759d1c4a252bea3df39d' into gingerbread-plus-aosp

* commit '420b59fe215f8a912e66759d1c4a252bea3df39d':
Fix windows SDK build.
420b59fe215f8a912e66759d1c4a252bea3df39d 28-Aug-2010 Xavier Ducrohet <xav@android.com> Fix windows SDK build.

Location of hierarchyviewer is now in hierarchyviewer2/app/etc

Change-Id: I14257c96552a16d19461cdf8194045a608dd03b3
ools/make_windows_sdk.sh
ools/patch_windows_sdk.sh
23d595f53c054614f3d5762500ab92e62fba7bd9 26-Aug-2010 Raphael Moll <ralf@android.com> am 059e4eb3: am f08d230e: SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"

Merge commit '059e4eb3dbcc3ad645a2cd1f1670d92ab3dc1455'

* commit '059e4eb3dbcc3ad645a2cd1f1670d92ab3dc1455':
SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"
059e4eb3dbcc3ad645a2cd1f1670d92ab3dc1455 26-Aug-2010 Raphael Moll <ralf@android.com> am f08d230e: SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"

Merge commit 'f08d230ed0d2612e79c121e0afa1e439b5702815' into gingerbread-plus-aosp

* commit 'f08d230ed0d2612e79c121e0afa1e439b5702815':
SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"
f08d230ed0d2612e79c121e0afa1e439b5702815 22-Aug-2010 Raphael Moll <ralf@android.com> SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"

Change-Id: Id85ec31d80fc12a6907d9c3404a29d28d4923abd
ools/make_windows_sdk.sh
ools/patch_windows_sdk.sh
d739fa797acd7f8c0eaa00c293285dd3c19eee66 17-Aug-2010 Svetoslav Ganov <svetoslavganov@google.com> am b0772436: am 4b06026c: am 9f93186b: Adding a sample accessibility service

Merge commit 'b07724366ebd73ef3e9daa1d772a633cd331f2b4'

* commit 'b07724366ebd73ef3e9daa1d772a633cd331f2b4':
Adding a sample accessibility service
b07724366ebd73ef3e9daa1d772a633cd331f2b4 17-Aug-2010 Svetoslav Ganov <svetoslavganov@google.com> am 4b06026c: am 9f93186b: Adding a sample accessibility service

Merge commit '4b06026cb901d4a032ecc731a835767ff1bf27fe' into gingerbread-plus-aosp

* commit '4b06026cb901d4a032ecc731a835767ff1bf27fe':
Adding a sample accessibility service
4b06026cb901d4a032ecc731a835767ff1bf27fe 17-Aug-2010 Svetoslav Ganov <svetoslavganov@google.com> am 9f93186b: Adding a sample accessibility service

Merge commit '9f93186beae13ea057a4b2e867928b357cd650a4' into gingerbread

* commit '9f93186beae13ea057a4b2e867928b357cd650a4':
Adding a sample accessibility service
9f93186beae13ea057a4b2e867928b357cd650a4 11-Aug-2010 Svetoslav Ganov <svetoslavganov@google.com> Adding a sample accessibility service

Change-Id: I5bd42157e263aac6d7a85db090319db168dea2fd
dk.atree
99e27c0f08447a382422a4136414aef486aa9ff5 10-Aug-2010 Raphael Moll <ralf@android.com> am 4336dcc6: am ff779c0f: Update win_sdk to put binaries in SDK/platform-tools.

Merge commit '4336dcc64ba518b7c8bd0e4a9a9814064eb8920c'

* commit '4336dcc64ba518b7c8bd0e4a9a9814064eb8920c':
Update win_sdk to put binaries in SDK/platform-tools.
4336dcc64ba518b7c8bd0e4a9a9814064eb8920c 10-Aug-2010 Raphael Moll <ralf@android.com> am ff779c0f: Update win_sdk to put binaries in SDK/platform-tools.

Merge commit 'ff779c0f2a19985a9a6733d4864b4b56b20729bd' into gingerbread-plus-aosp

* commit 'ff779c0f2a19985a9a6733d4864b4b56b20729bd':
Update win_sdk to put binaries in SDK/platform-tools.
ff779c0f2a19985a9a6733d4864b4b56b20729bd 05-Aug-2010 Raphael Moll <ralf@android.com> Update win_sdk to put binaries in SDK/platform-tools.

This is requires as a follow up to Change I4526310a
with moved platform tools from $SDK/platform/*/tools
to $SDK/platform-tools/

SDK Bug: 2897406

Change-Id: I1563c88fc824db3d9c86fb65479820989d46895c
ools/patch_windows_sdk.sh
3cf2a3ac065dbd579c2d5c16f11fa201239a94d7 30-Jul-2010 Xavier Ducrohet <xav@android.com> am 7d3106be: am b86b7f72: Re-organize the SDK, moving the build tools out of the platforms.

Merge commit '7d3106bebbfe76a334567c59303a75897af915b2'

* commit '7d3106bebbfe76a334567c59303a75897af915b2':
Re-organize the SDK, moving the build tools out of the platforms.
7d3106bebbfe76a334567c59303a75897af915b2 30-Jul-2010 Xavier Ducrohet <xav@android.com> am b86b7f72: Re-organize the SDK, moving the build tools out of the platforms.

Merge commit 'b86b7f72db1549cb526a141ca8b6158908483f1a' into gingerbread-plus-aosp

* commit 'b86b7f72db1549cb526a141ca8b6158908483f1a':
Re-organize the SDK, moving the build tools out of the platforms.
b86b7f72db1549cb526a141ca8b6158908483f1a 28-Jul-2010 Xavier Ducrohet <xav@android.com> Re-organize the SDK, moving the build tools out of the platforms.

Change-Id: I4526310a1c882ad33084d94e118b1c74b3181a6a
dk.atree
8c490dc8d198e1ca31b452b772b8d7b82f853f85 15-Jul-2010 Joe Onorato <joeo@android.com> am 6b9784b0: am 288d90c2: Merge "The "current" SDK stubs jar should use the full apk that\'s exported, not the product-specific one." into gingerbread

Merge commit '6b9784b04249d42f1f2c68cfd30fa4d3322a3b75'

* commit '6b9784b04249d42f1f2c68cfd30fa4d3322a3b75':
The "current" SDK stubs jar should use the full apk that's exported, not the product-specific one.
6e384d9b43276ab7f023960d27c5270d01a36a25 15-Jul-2010 Joe Onorato <joeo@android.com> The "current" SDK stubs jar should use the full apk that's exported, not the product-specific one.

The SDK is not dependent on configurations, and also this speeds up the post-installclean build.

Change-Id: I1c075ddf1dd2ca44cc0aa37f23e86ccc593cc2a8
ndroid.mk
55f4a60aa0dc1c2fc5ef58df185c9426c262e0ba 18-Jun-2010 Gilles Debunne <debunne@google.com> New XmlAdapter sample example.

This sample illustrate the use of the news Xml Adapters definition, as well
as the use on the new XmlDocumentProvider class.

Change-Id: Ie9738b5f0a0f00df2af643890a48573bace19311
dk.atree
b606d1bea23c1732328b5617a4fe161d4535c06a 23-Jun-2010 Kenny Root <kroot@google.com> am 60c91105: am 9e1400cd: Do not compress resources.arsc in android.jar

Merge commit '60c911051081fb2f2e786df7f45ac60b2bffdd2e'

* commit '60c911051081fb2f2e786df7f45ac60b2bffdd2e':
Do not compress resources.arsc in android.jar
9e1400cdae7f3732808120db8b83de7b252340ca 23-Jun-2010 Kenny Root <kroot@google.com> Do not compress resources.arsc in android.jar

In framework-res.apk and in applications, resources are always stored in
zip files instead of compressed so that they may be accessed via mmap()
instead of needing to decompress them first.

This change makes sure the SDK's android.jar has the same behavior.

Change-Id: Ied881c34dca86ff5b5bd2ccfa4e316ae590ca473
ndroid.mk
906d47573bc1a4a180945da019538144bdb395b4 18-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I4e06b684dd46c317e1c206e584050dbee20be281
32b1e17b7559bb6f1892c88ff2978acabd628ffc 17-Jun-2010 Xavier Ducrohet <xav@android.com> am 2f8cb6de: am fdbc1d7b: remove apkbuilder.jar from the sdk build.

Merge commit '2f8cb6de03df5283bc5a5e3afc6ff729804e6bc9'

* commit '2f8cb6de03df5283bc5a5e3afc6ff729804e6bc9':
remove apkbuilder.jar from the sdk build.
fdbc1d7bc1aa73c095b93808bd15b6eca02ea7c9 16-Jun-2010 Xavier Ducrohet <xav@android.com> remove apkbuilder.jar from the sdk build.

Change-Id: I76f979a0d3aa196f25e8a5f2522437e26655a7d0
dk.atree
1cabf853fdff56aaf30d5f5db80f981661d53d8c 16-Jun-2010 Xavier Ducrohet <xav@android.com> remove apkbuilder.jar from the sdk build.

Change-Id: I82cca5c159c1f3210b98deebfd78e2844728b2ac
dk.atree
66bdf7ff57c57450b30f406fdf705669da11f6da 16-Jun-2010 Xavier Ducrohet <xav@android.com> am e389abdc: am 442396be: remove jarutils from the sdk packaging.

Merge commit 'e389abdc29eb2a9d523e64531975dde25a8e9617'

* commit 'e389abdc29eb2a9d523e64531975dde25a8e9617':
remove jarutils from the sdk packaging.
442396be27a82850f99d4a891d02b8c95c9c1ef1 15-Jun-2010 Xavier Ducrohet <xav@android.com> remove jarutils from the sdk packaging.

Change-Id: I49beab11b49f09451cbea9bfbc88aa522e7dbd85
dk.atree
e7a4c0910c8340334fdbbb61b3c676af63776909 16-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I3e12f866966fda80db5a0795eba9ff82bfe6547d
4c22d2bb7d9d7f9cf25557a082293ddaea3aa885 15-Jun-2010 Xavier Ducrohet <xav@android.com> remove jarutils from the sdk packaging.

Change-Id: Ic3c91ff5e20a5bf6b7c3ad11eb6e6f4250c7613d
dk.atree
7d68266c86b8ad4af7c980c6f87f409ea5cac20c 15-Jun-2010 Ying Wang <wangying@google.com> Also dist the original linux sdk package for wind_sdk build.

Change-Id: I64dab5763dc7c7398582c5a30c126c7e3e6afe32
ools/windows_sdk.mk
db974ee7bdb28bbdf733b6d9f94b2f5edcd4de26 04-Jun-2010 Dianne Hackborn <hackbod@google.com> Dumb.

Change-Id: I05f17560ace880c628c94d676bd908c611348029
dk.atree
2e952670a24263458bf3c0885c592aa950773af5 04-Jun-2010 Dianne Hackborn <hackbod@google.com> Add API demo of a heavy-weight application.

Change-Id: I15e2d1c766af8aa7a62beed3069b8d128338ca11
dk.atree
8bfa91f076b667223920d8b68c8ab0f6e8dbc164 11-May-2010 Dirk Dougherty <ddougherty@google.com> am 56c8df1b: sdk change: add index for tictactoe library and app. fix output path for spinner sample app in sdk builds.

Merge commit '56c8df1b0637c380bd7aa3f9a928430abfba2c7d' into froyo-plus-aosp

* commit '56c8df1b0637c380bd7aa3f9a928430abfba2c7d':
sdk change: add index for tictactoe library and app. fix output path for spinner sample app in sdk builds.
56c8df1b0637c380bd7aa3f9a928430abfba2c7d 09-May-2010 Dirk Dougherty <ddougherty@google.com> sdk change: add index for tictactoe library and app. fix output path for spinner sample app in sdk builds.

Change-Id: I51d412e1e78e6bd672eb419d53310eb1194672a3
dk.atree
46ea565515a1ab4f3bc4107eae8c0e909b634dac 10-May-2010 Scott Main <smain@google.com> am 6807387d: change searchable dictionary folder name back to normal (exclude "v2", which should instead be used only for HTML titles)

Merge commit '6807387d71dbcad1577edc3b2a88e11eda0aa8c0' into froyo-plus-aosp

* commit '6807387d71dbcad1577edc3b2a88e11eda0aa8c0':
change searchable dictionary folder name back to normal (exclude "v2", which
6807387d71dbcad1577edc3b2a88e11eda0aa8c0 10-May-2010 Scott Main <smain@google.com> change searchable dictionary folder name back to normal (exclude "v2", which
should instead be used only for HTML titles)

Change-Id: Ia5c08478d91fb8aa6246fcbca3d68337becadf65
dk.atree
9e678c26d81ba76ad48e73cb7c78a6210cd91a7b 07-May-2010 Dirk Dougherty <ddougherty@google.com> am 2f0b1c13: Doc change: cherry-pick from master. ->Subject: Android application files for the Activity Testing Tutorial

Merge commit '2f0b1c1335f6212889633e170d71c56dba70e78e' into froyo-plus-aosp

* commit '2f0b1c1335f6212889633e170d71c56dba70e78e':
Doc change: cherry-pick from master. ->Subject: Android application files for the Activity Testing Tutorial
2f0b1c1335f6212889633e170d71c56dba70e78e 07-May-2010 Dirk Dougherty <ddougherty@google.com> Doc change: cherry-pick from master. ->Subject: Android application files for the Activity Testing Tutorial

Conflicts:

build/sdk.atree

Change-Id: I5edb1d4d8a18fbda53a0e78ca6c9d20cf7d3ff4a
dk.atree
5542d32c67e31f4e39ff33904613ec722d42ddd1 07-May-2010 Xavier Ducrohet <xav@android.com> am fc7428f9: Add the TicTacToe Lib+Main samples

Merge commit 'fc7428f91254740a245fdac5db77d035c0b4c41f' into froyo-plus-aosp

* commit 'fc7428f91254740a245fdac5db77d035c0b4c41f':
Add the TicTacToe Lib+Main samples
fc7428f91254740a245fdac5db77d035c0b4c41f 07-May-2010 Xavier Ducrohet <xav@android.com> Add the TicTacToe Lib+Main samples

Change-Id: I17a26172ab82b2e4b794774c5ab94bed8202b7d4
dk.atree
02d92477d5bd290eb8cd1ef7e13e903520ebba05 07-May-2010 The Android Open Source Project <initial-contribution@android.com> Merge commit 'goog/readonly-korg-master' into HEAD
36cb47e677f0974e757e79346942760797f45b39 05-May-2010 Xavier Ducrohet <xav@android.com> Update sdk.atree with new ant rules location.

Change-Id: I69cd421f36c8ea2b41b3f22f053489ac7dc5e3e9
dk.atree
51ecd212b6339fe817d50af5aab9dfe244613b35 28-Apr-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I5b1a7e1448dc3bfeb499201e0332de550da1380a
a61e3cd438fc00f1b71fc8cdc6e23462eda6a4e0 28-Apr-2010 Xavier Ducrohet <xav@android.com> Package Ant rules r3

Change-Id: I2c5fca2ac89a54499f243670bbe858affa8770c3
dk.atree
096f06bef2f4ac602055be2e977269071689feeb 27-Apr-2010 Scott Main <smain@google.com> am 3adbb98d: Merge "title the searchable dictionary app as "v2" because it includes significant changes and it\'s worth highlighting the revision. some revisions to the sample desciption. a companion change to the resources navigation link will follow (to name it v2)."

Merge commit '3adbb98dff3b1cbafcd9aadfc8708f4b88030497' into froyo-plus-aosp

* commit '3adbb98dff3b1cbafcd9aadfc8708f4b88030497':
title the searchable dictionary app as "v2" because it includes significant
3adbb98dff3b1cbafcd9aadfc8708f4b88030497 27-Apr-2010 Scott Main <smain@google.com> Merge "title the searchable dictionary app as "v2" because it includes significant changes and it's worth highlighting the revision. some revisions to the sample desciption. a companion change to the resources navigation link will follow (to name it v2)." into froyo
262113ac94692b4c70090f20a61345db01273e5b 24-Apr-2010 Raphael <raphael@google.com> am 0e4dd618: Makefile to create Windows SDK under Linux.

Merge commit '0e4dd618494c577b8e8dcb0c7f525617b0a72fc4' into froyo-plus-aosp

* commit '0e4dd618494c577b8e8dcb0c7f525617b0a72fc4':
Makefile to create Windows SDK under Linux.
0e4dd618494c577b8e8dcb0c7f525617b0a72fc4 17-Apr-2010 Raphael <raphael@google.com> Makefile to create Windows SDK under Linux.

The makefile makes it possible to "make PRODUCT-sdk-win_sdk".
It builds the Linux SDK, mirrors it as a Windows SDK and then use the shell
script to patch in all the Windows binaries.

(Merge master Change Ie24f765b)
ools/patch_windows_sdk.sh
ools/windows_sdk.mk
05bd673250139b992c314d93f8a08db67e2d3799 22-Apr-2010 Scott Main <smain@google.com> title the searchable dictionary app as "v2" because it includes significant
changes and it's worth highlighting the revision.
some revisions to the sample desciption.
a companion change to the resources navigation link will follow (to name it v2).

Change-Id: Ib11cae9e4cc753f76b45ae446ef9871fee674e7a
dk.atree
19495e9285a2ca1a10103c0ef5d8fab27858c8d6 12-Apr-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Ic084784dc5ca0f98367b2824261be0be4f9617bf
cd2dfa72cb5050ad490b4fdb744606def6772897 09-Apr-2010 Xavier Ducrohet <xav@android.com> Fix SDK build by packaging the new Ant rules files.

Change-Id: Id88eeb0e596b58e48f425c7521fb40f9e046b818
dk.atree
9cd63801a53f467d8496fd052cf1d640f3aa685f 09-Apr-2010 Xavier Ducrohet <xav@android.com> Update SDK build file to package the correct version for groovy.

Change-Id: I0e81a9941693acc0f29933aa15bb7d4e7689bf51
dk.atree
41c42a972c03a0e72b12e24b49f23bbda0f46ad7 07-Apr-2010 Christopher Tate <ctate@google.com> Add Backup/Restore sample to the SDK docs

Part of bug #2545514

Change-Id: I9085ebfdce3552ddab602eec8d40de67b219a834
dk.atree
5f0ab869707793ffef1e811f799583ad3aba5eb3 18-Mar-2010 Xavier Ducrohet <xav@android.com> Package the new ant rules file in the SDK.

Change-Id: Ic4db70e75b7a747c86635d9f28cfb98537c0e9a1
dk.atree
d87ae802548efbd68624cfce6f69a81ed43d042f 11-Mar-2010 Xavier Ducrohet <xav@android.com> Change ant.prop to sdk.prop

Change-Id: I45bb6652b2ae9455e20d681555f2bb61e11f9ce7
dk.atree
84f621775ef6dd190539fbf2c31197f7925093d7 06-Mar-2010 Raphael <raphael@google.com> Fix make_windows_sdk when invoked without params.

Change-Id: I24a6e06498a343a31c562e0c765f6e8075b1916e
ools/make_windows_sdk.sh
080ecbe59a4a572f35fbf43d18e387116b6a845a 01-Mar-2010 Raphael <raphael@google.com> Fix make_windows_sdk.

SDK Bug 2478848: emulator fails to build because sdl-config
was not checkout as +x by git/cygwin.

SDK Bug 2479321: aapt built using Cygwin 1.7.x depends on some
new cygwin DLL instead of mgwz.dll. The latter DLL is not even
present and fails to be bundled. This does not change the behavior,
it just makes sure we are using the proper version of cygwin.
ools/make_windows_sdk.sh
8badeab73d5241cb6e899e14c337a17a86f74ed4 05-Feb-2010 Xavier Ducrohet <xav@android.com> Add the new Ant build rules for library projects.
Bug: 2294012

Change-Id: If4ebfe4d98e0dd445dc7e79dfc096cc761c79f75
dk.atree
59b13b559ce198bc3900dabd7b7e1db752a027de 17-Feb-2010 Xavier Ducrohet <xav@android.com> Add ant.properties to sdk build.

Change-Id: I755e259557cb02d1ca72df0dc18a3bd4fb38d1f1
dk.atree
ae7af39f72e497ea1213384acdc2c181dd35fc9a 12-Feb-2010 Mike LeBeau <mlebeau@android.com> Add VoiceRecognitionService to the list of SDK sample apps.
dk.atree
8b0f5a40a6de17aedcefddd203737ea168cec9cf 11-Feb-2010 Raphael <raphael@google.com> Update prebuilt Groovy JAR to 1.7.0

Depends on Change Ie2684212

Change-Id: I9eb6eabd99dcaf36d7c0432e0a08b1c9b1fa49c3
dk.atree
658d86e5be4c776813797d9806fc80b7b7c9a7cc 08-Feb-2010 Dirk Dougherty <ddougherty@google.com> Add SampleSyncAdapter to SDK build and docs build. Add CubeLiveWallpaper to docs build.

Change-Id: I149fb2aab91d0a2dfc4242a85118bf20dea97e42
dk.atree
6d32277b8675b3819c14b133af29d0b252e8aa40 29-Jan-2010 Raphael <raphael@google.com> SDK Manager: post install script to update SDK Setup.exe

SDK Bug: 2404830

Change-Id: I7e2346c95132ff6d26468d589212bf83e15ce407
ools/make_windows_sdk.sh
d51d36fa5444ef5f28dbbe5903949e1a75bb2510 27-Jan-2010 Raphael <raphael@google.com> Windows SDK: package new tools/find_java.bat

SDK Bug: 2315813

Change-Id: Ice0eb6327b153fcaab42477cd4d3aa8ee12e0063
ools/make_windows_sdk.sh
2b9a0444eaa9a3ba3e527990babb6a44f1ae5739 13-Jan-2010 Raphael Moll <raphael@google.com> Merge "Add etc1tool to Windows SDK." into eclair
2f2fb96b4b037a016336a98e3b637f4394e1f323 12-Jan-2010 Xavier Ducrohet <xav@android.com> Make the SDK packaging put the samples in the root folder.

Change-Id: Icb88f88d503de9690ba210c0bfabdc0598021860
dk.atree
d6704310644733914f697b5572c173668621a7ec 12-Jan-2010 Raphael <raphael@google.com> Add etc1tool to Windows SDK.

SDK BUG 2368918

This depends on Change I1b4f5e39 from build/core.

Change-Id: I8348514506742aa70cdee057e94069a67357a689
ools/make_windows_sdk.sh
e1a1faefa962e61b7ba69b637505db658edabfc3 08-Jan-2010 Jack Palevich <jackpal@google.com> Add the tool etc1tool to the sdk.

etc1tool is a command line tool for compressing and decompressing
ETC1 textures. This texture format is commonly supported by OpenGL
ES 2.0 GPUs.
dk.atree
b84cf9e1e378f6cc6642b4ac3f391a85b208a23b 15-Dec-2009 Xavier Ducrohet <xav@android.com> Clean up the SDK and make it compiled and installed in the SDK system image.

Change-Id: I6e5f01a1cc45beada70608307f4ac38a4dcdd0b9
dk.atree
1162372c9e7ff4b6e60d247fb057b47f571af86f 15-Dec-2009 Xavier Ducrohet <xav@android.com> Use the feature list for the SDK.

Change-Id: I926a682ac23a373276d10223af9f1e47ebc617d0
dk.atree
5a3963887519fcfe1f7e8b1dfe552cb3977fad84 11-Dec-2009 Xavier Ducrohet <xav@android.com> Add new samples to the SDK.

Change-Id: I9fb303e6b6f6fb00172f4f5bf64a2c56649c2491
dk.atree
06ddeb0fbd7bd514b17fbb335d5e5e1eeb19397a 03-Dec-2009 Xavier Ducrohet <xav@android.com> Move source prop files for docs/platforms/usb driver back into dev.

Change-Id: I4632dc69432b720d586c84834f89c843a2eaf5cd
dk.atree
67203cca65901d672803071bfc026c3657b85fdf 01-Dec-2009 Scott Main <smain@google.com> add new Bluetooth sample app
dk.atree
1ed7cb992a34bff8b72189ea3942ab88ec78c394 01-Dec-2009 Xavier Ducrohet <xav@android.com> Update sdk build to use the new folders in sdk/

Change-Id: Ia7f1d23e452b4b493dc4456f8fedd4dd3d2b006f
dk.atree
01d2087c87627df5bfc7e684f62466e0a662197a 19-Nov-2009 Xavier Ducrohet <xav@android.com> resolved conflicts for merge of 19cb54ea to eclair

Change-Id: I182195aeaad88aebc82988b1cec9ebda0c359bc8
19cb54ea7da270254852dcd1f476fe1becf1e8a9 18-Nov-2009 Xavier Ducrohet <xav@android.com> Remove components that were moved to sdk.git and update build scripts.
dk.atree
ools/make_windows_sdk.sh
ools/sdk_clean.sh
808c4541329b8ccce58d124e3fdab2ead511c5cb 09-Nov-2009 Xavier Ducrohet <xav@android.com> Add Japanese font to SDK.

BUG 2041229

Change-Id: I68a71c11ae4f61c987a888dadf205f585b577c61
dk.atree
5e4efac4f7c95206bb91d28b6ebb8b5aa36ed5bf 15-Oct-2009 Xavier Ducrohet <xav@android.com> WQVGA skin (240x400) (do not merge)
dk.atree
73ad4a8a498703d55e52c55be690b90dfd6efa9d 15-Oct-2009 Xavier Ducrohet <xav@android.com> WQVGA skin (240x400)

Change-Id: Icb3327e2371800029844a869df6abd68a8516aff
dk.atree
62437b9984649c80aa3a7d93750efdc5ff206d07 14-Oct-2009 Raphael <raphael@google.com> Windows SDK: copy SDK Setup.exe at root of SDK.

Also add a source.properties (we'll install it on the vendor/google
script part of the script).

SDK BUG 2173135

Change-Id: Icb0f22a65ffd819bf7b0f48adbec51cbc1243f71
ools/make_windows_sdk.sh
40d4b03ee5840366496aa35a5d780953a3575017 07-Oct-2009 Raphael <raphael@google.com> Fix Windows SDK build broken by layoutopt change.

Change-Id: I1503487861ef20dead3de62548feea6328e0d60d
ools/make_windows_sdk.sh
9d489ddff97dbd7208ba58592a3a834c04d9260a 06-Oct-2009 Romain Guy <romainguy@android.com> Add layoutopt to the SDK.

Change-Id: Idc9b152e2a5abffaa9feb2cf70791d8288cfa1dd
dk.atree
ools/make_windows_sdk.sh
2cdd16b77f18b7e240c41e8bc95ba0d844767652 01-Oct-2009 Xavier Ducrohet <xav@android.com> fix the build

Change-Id: Ica519f7e0adbc9fd48792198221c01da3e27fab8
dk.atree
227b8768fa8accff8a9e3555351af05d41ad7840 01-Oct-2009 Xavier Ducrohet <xav@android.com> Load default GLE device profiles from the SDK.

Change-Id: Ife64397692912f892ec81af8237ac31914830be9
dk.atree
8677a1704ec66faf813f5b1a23377b1a49867261 01-Oct-2009 Xavier Ducrohet <xav@android.com> Replace icon template with new style and multiple densities.

The icon in the templates of ADT was medium density only.
I added new densities (high and low), as well as updated to
the new Eclair style. Also added a version for Ant project.

Updated ADT and sdklib to deal with creating new projects
with all 3 icons.

In case of Ant project, this is done only if the icons
are present in the target platforms.

For ADT, this is done only if the project target donut
or later. Older project still have only one icon located
in drawable/

Change-Id: I77069a1e4902ef395d490526aabc40a26e33d4ca
dk.atree
c51d184216d8fa0ea0fd6f0f7eb7959afd8faae2 26-Sep-2009 Xavier Ducrohet <xav@android.com> Update the project creation (from the command line):

- Make the distinction between the activity class name, manifest entry,
fully-qualified name, and tested activity for the template place-holders.
Test activity names now directly contain the full name (including the
"Test" prefix) instead of the template adding it.
This is required by the new 'create test-project'

- New action: create test-project
This requires a path to the main project. It reads the package, activity
name and target from the main project.
The activity is read from the manifest and can be in a more complex form
than previously expected (for instance .subpackage.MyClass, instead of
simply MyClass). This is what required the re-work the activity related
template place holders.
Options:
-m --main Location path of the project to test, relative to the new
project [required]
-n --name Project name
-p --path Location path of the new project [required]

Example: for 2 projects MyProject and MyTests located in the same folder,
calling from their parent folder.

android create test-project -p MyTests -m ../MyProject

- build.properties now only gets application.package for older targets
as the new one get it directly from XPath

- Remove AndroidXPathFactory from the anttasks project as it was already
in sdklib which is a dependency.

- Removed IntelliJ templates for the SDK. We haven't supported them for
a while, and now that IntelliJ has built-in support for Android, it's
not that useful anymore.

While there is the command line parameters for 'update test-project'
it's not yet implemented.

Change-Id: I663d4cb7f439bb2abfe866f893e58f4d13aff975
dk.atree
1da1bd86b8e1dedb66d2eaba36471f81e7bd7fd5 22-Sep-2009 Xavier Ducrohet <xav@android.com> Add a new skin to the SDK.

Change-Id: I988a5a4bf372c0f8608facf64314ada1e9ee791e
dk.atree
8ffe5c72bbebdfbaf227276fc2e7ff6177d5ae1a 16-Sep-2009 Xavier Ducrohet <xav@android.com> Add 64bit SWT to Mac SDK build.

Change-Id: Ie30153644733d5a22453eea2c66551e4aaa03316
dk-darwin-x86.atree
6edb5a108ef4ef332bafc90defff84201cebd9a7 02-Sep-2009 Piotr Gurgul <pgurgul@google.com> Add ant-based code coverage support to Android SDK

Target 'run-tests' launches all the unit tests against the tested project.
Target 'coverage' emma-instruments the tested project's classes,
runs the tests against instrumented classes, collects code coverage data
and extracts it to human-readable form as report.html.
android_test_rules.xml contain additional rules for test projects.
Test projects are auto-recognized by presence of the tested.project.dir
property, which will be auto-generated for tests projects. Temporarily,
please add this property manually to the build.properties file.
Current version is mainly tested with default, android generated test projects.
This version includes also fixing relative to absolute paths for
properties which are most likely to be changed by user in external
property file.
dk.atree
83e2eae3fbb54cb284e96a8ce3f658f4dadba172 28-Aug-2009 Mike LeBeau <mlebeau@google.com> Reinclude SearchableDictionary sample app as a demo of third party inclusion in Quick Search Box.

This reverts commit 3e83e8bc8b969a993b026dab9d13b99b315d9af0.
dk.atree
2328b4f3f56cd33deef5f9b21673dc072012e0d3 26-Aug-2009 Xavier Ducrohet <xav@android.com> am 3a92963b: Merge change 22652 into donut

Merge commit '3a92963bf3865330e89b3e7a66b66dd9cfc8792b' into eclair

* commit '3a92963bf3865330e89b3e7a66b66dd9cfc8792b':
Cleanup SDK packaging: remove alias build files.
b9084306523f308c4cd255e42c5d22cd4e9ad93a 25-Aug-2009 Xavier Ducrohet <xav@android.com> Cleanup SDK packaging: remove alias build files.
dk.atree
978ec5abe1fe33418205d96edb8003cb4fc9a163 21-Aug-2009 Anonymous Coward <nobody@android.com> am 3e83e8bc: Remove SearchableDictionary sample app as it is a demo of third party inclusion in quick search box.

Merge commit '3e83e8bc8b969a993b026dab9d13b99b315d9af0' into eclair

* commit '3e83e8bc8b969a993b026dab9d13b99b315d9af0':
Remove SearchableDictionary sample app as it is a demo of third party inclusion in quick search box.
3e83e8bc8b969a993b026dab9d13b99b315d9af0 21-Aug-2009 Anonymous Coward <nobody@android.com> Remove SearchableDictionary sample app as it is a demo of third party inclusion in quick search box.

update: remove entry from build.sdk
dk.atree
eec015ad1465431b0942214c730f6bd6344c8c76 21-Aug-2009 Raphael <raphael@google.com> am 8fccf9eb: mgwz.dll must be packaged next to tools/zipalign.exe in the Windows SDK.

Merge commit '8fccf9eb7c099a42729d0ff4a8a250f73a68c3f9' into eclair

* commit '8fccf9eb7c099a42729d0ff4a8a250f73a68c3f9':
mgwz.dll must be packaged next to tools/zipalign.exe in the Windows SDK.
8fccf9eb7c099a42729d0ff4a8a250f73a68c3f9 21-Aug-2009 Raphael <raphael@google.com> mgwz.dll must be packaged next to tools/zipalign.exe in the Windows SDK.

BUG 2068812
ools/make_windows_sdk.sh
326aa6aaab53aba4d79a3b4a5807a7dc9a015e24 18-Aug-2009 Xavier Ducrohet <xav@android.com> am 513c2b51: Merge change 21598 into donut

Merge commit '513c2b511627ad743b57af4aa8272788d397697c' into eclair

* commit '513c2b511627ad743b57af4aa8272788d397697c':
Remove WQVGA skin from SDK
85947db31b5ef7e74a487450fc80ad75705034c6 18-Aug-2009 Xavier Ducrohet <xav@android.com> am 62410fc5: Merge change 21571 into donut

Merge commit '62410fc5a983bd1057622bc51801ad36cd316811' into eclair

* commit '62410fc5a983bd1057622bc51801ad36cd316811':
Fixed QVGA skin and added WQVGA432 skin.
b74479296bbdba52c75e83c9509fd232e563babb 18-Aug-2009 Xavier Ducrohet <xav@android.com> am 25ec7998: Add OSGi.jar to the SDK (required by org.eclipse.jface)

Merge commit '25ec799863219bfa1b5b8c71b5033cb450e70918' into eclair

* commit '25ec799863219bfa1b5b8c71b5033cb450e70918':
Add OSGi.jar to the SDK (required by org.eclipse.jface)
363fc3fe4074ded7eaee584ebd74f9b562302f8f 18-Aug-2009 Xavier Ducrohet <xav@android.com> am e058cf98: Merge change 21234 into donut

Merge commit 'e058cf98bc44cf0492c0eb3da25a61c9419cbdc7' into eclair

* commit 'e058cf98bc44cf0492c0eb3da25a61c9419cbdc7':
Revamped QVGA skin and new WVGA 800/854 skins
49120ffe393034edf0d5c58f3c230182ee156d37 18-Aug-2009 Xavier Ducrohet <xav@android.com> Remove WQVGA skin from SDK
dk.atree
e8b2e0adeda280c35eb18f5de08ba2da40ff5026 17-Aug-2009 Xavier Ducrohet <xav@android.com> Fixed QVGA skin and added WQVGA432 skin.
dk.atree
25ec799863219bfa1b5b8c71b5033cb450e70918 14-Aug-2009 Xavier Ducrohet <xav@android.com> Add OSGi.jar to the SDK (required by org.eclipse.jface)
dk.atree
c98f3e1a2d508734b7c568e3355d914647f466e7 14-Aug-2009 Xavier Ducrohet <xav@android.com> Revamped QVGA skin and new WVGA 800/854 skins

BUG: 1944280
dk.atree
a501e44af0dd31c5ccfad0ac480d82b9277f1c71 12-Aug-2009 Raphael <raphael@google.com> am 64c277c2: Merge change 20833 into donut

Merge commit '64c277c24bf52762e36185cc769d1b29233e20d4'

* commit '64c277c24bf52762e36185cc769d1b29233e20d4':
BUG 1993354 : Add zipalign to SDK
69b2b48e076209c0bf63ea88008ba3e36391060c 12-Aug-2009 Raphael <raphael@google.com> am a901c3d4: Merge change 20765 into donut

Merge commit 'a901c3d41203e6cbbf5cd72722fcf78f5919feff'

* commit 'a901c3d41203e6cbbf5cd72722fcf78f5919feff':
BUG 2033924: Add AdbWinUsbApi.dll to prebuilt for Windows SDK
f6abec3376d6e9eea2a44ec9ff92b4aa9c4b33bd 12-Aug-2009 Raphael <raphael@google.com> BUG 1993354 : Add zipalign to SDK
dk.atree
ools/make_windows_sdk.sh
1620a180c2f56573d4f9446c54acc126175f6775 11-Aug-2009 Raphael <raphael@google.com> BUG 2033924: Add AdbWinUsbApi.dll to prebuilt for Windows SDK
ools/make_windows_sdk.sh
38693ff5506fdb877a40a2e32d96615aa664b4dc 11-Aug-2009 Karl Rosaen <krosaen@google.com> am 7a3e95ae: Add a "Searchable Dictionary" app to the sample apps that demonstrates being a part of global search.

Merge commit '7a3e95aeba5109ef6aa4c9488be9416e7355067c'

* commit '7a3e95aeba5109ef6aa4c9488be9416e7355067c':
Add a "Searchable Dictionary" app to the sample apps that demonstrates being a part of global search.
7a3e95aeba5109ef6aa4c9488be9416e7355067c 08-Aug-2009 Karl Rosaen <krosaen@google.com> Add a "Searchable Dictionary" app to the sample apps that demonstrates being a part of global search.

updated: makefile adjusted so app is part of sdk, and the manifest refers to the correct sdk version.

updated: brushed up docs and formatting per feedback.
dk.atree
ca76255aba079a115853ff4f6dd8bd15c6ab5cb5 08-Aug-2009 Raphael <raphael@google.com> am 1736f2ce: Merge change 20484 into donut

Merge commit '1736f2ce6560a89acc8c21d573da96d76b75ec07'

* commit '1736f2ce6560a89acc8c21d573da96d76b75ec07':
BUG 2039647 : support customization from calling wrapper script.
bd7dfac5a51bd6e7c552ced63e03c2b1833e04f0 08-Aug-2009 Raphael <raphael@google.com> BUG 2039647 : support customization from calling wrapper script.
ools/make_windows_sdk.sh
bb90a717f2ea548a72bd07570e90b9a72b5f9df0 31-Jul-2009 Xavier Ducrohet <xav@android.com> am 5379e098: Remove section about USB driver as not everything is directly available anymore

Merge commit '5379e0981ebd570faba0dcd13c087f71d856e0f0'

* commit '5379e0981ebd570faba0dcd13c087f71d856e0f0':
Remove section about USB driver as not everything is directly available anymore
5379e0981ebd570faba0dcd13c087f71d856e0f0 30-Jul-2009 Xavier Ducrohet <xav@android.com> Remove section about USB driver as not everything is directly available anymore

See development/host/windows/usb/readme.txt
ools/make_windows_sdk.sh
aaa5547c4dae49f61e59aedb473ecb87684bae1c 29-Jul-2009 Xavier Ducrohet <xav@android.com> am 91e0a8bb: Fix minor typo and duplicated entry in sdk.atree

Merge commit '91e0a8bb9cc1e1478bf65627dc4faeb82ee3825d'

* commit '91e0a8bb9cc1e1478bf65627dc4faeb82ee3825d':
Fix minor typo and duplicated entry in sdk.atree
4568cf1ba4e9a280622fbe34cc879827563f7749 29-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 8136f161: Merge change 8885 into donut

Merge commit '8136f1611207c1bb120d7863dda1a6655a1d52be'

* commit '8136f1611207c1bb120d7863dda1a6655a1d52be':
Add notice file to platform folder.
91e0a8bb9cc1e1478bf65627dc4faeb82ee3825d 29-Jul-2009 Xavier Ducrohet <xav@android.com> Fix minor typo and duplicated entry in sdk.atree
dk.atree
b519db4eed1401a468bab39fc5782d0c902c3151 29-Jul-2009 Xavier Ducrohet <xav@android.com> Add notice file to platform folder.
dk.atree
9c537d0fd5c0acef69f4d5d3119ea91b8e7035b0 25-Jul-2009 Xavier Ducrohet <xav@android.com> am 6675fec4: First pass at a WVGA skin.

Merge commit '6675fec474d86d77947cf68d47dd36e9744b9f14'

* commit '6675fec474d86d77947cf68d47dd36e9744b9f14':
First pass at a WVGA skin.
821c288575c896a8ad9df1a07872ffa2e6a6898a 25-Jul-2009 Xavier Ducrohet <xav@android.com> am e0f85e6c: Delete non rotating skins and create a QVGA rotating skin.

Merge commit 'e0f85e6c7379c053cd3ece5bdd934337ff66cd45'

* commit 'e0f85e6c7379c053cd3ece5bdd934337ff66cd45':
Delete non rotating skins and create a QVGA rotating skin.
6675fec474d86d77947cf68d47dd36e9744b9f14 25-Jul-2009 Xavier Ducrohet <xav@android.com> First pass at a WVGA skin.
dk.atree
e0f85e6c7379c053cd3ece5bdd934337ff66cd45 25-Jul-2009 Xavier Ducrohet <xav@android.com> Delete non rotating skins and create a QVGA rotating skin.

HVGA-P and HVGA-L were redundant with HVGA which supports both orientations.
QVGA-P and QVGA-L has been replaced with QVGA which supports both orientations.
dk.atree
22979479fb7bfa26f709043d1648eaa36bfa1e4a 24-Jul-2009 Xavier Ducrohet <xav@android.com> am f74c1d2f: Add default version files into the SDK for docs/tools/platforms.

Merge commit 'f74c1d2fb76ed6f3a08c76f3c4dc7c783c39383c'

* commit 'f74c1d2fb76ed6f3a08c76f3c4dc7c783c39383c':
Add default version files into the SDK for docs/tools/platforms.
6b92f91fde71626d289c55fc650f961f7bde8f00 24-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am d74be2a9: Merge change 8377 into donut

Merge commit 'd74be2a969207c7f3ea91962bf3720d198f7fbc5'

* commit 'd74be2a969207c7f3ea91962bf3720d198f7fbc5':
Use Apache Commons Compress instead of java.util.zip
f74c1d2fb76ed6f3a08c76f3c4dc7c783c39383c 24-Jul-2009 Xavier Ducrohet <xav@android.com> Add default version files into the SDK for docs/tools/platforms.
dk.atree
797654a452916a7de7eeb2182a59a54d60f4b1f0 23-Jul-2009 Xavier Ducrohet <xav@android.com> Use Apache Commons Compress instead of java.util.zip

When the SDK installer unarchives the zip files, it is important to keep
the permissions for executable (Linux/MacOS) or the tools required to
build applications (aapt, aidl, ...) won't work.

Since java.util.zip does not provide support for permissions, we now
use the Apache Commons Compress component that allows us to read the
permission from the archive.
dk.atree
0215a1b0535a41034bff0e1ae9171c0a0d82f6ec 23-Jul-2009 Xavier Ducrohet <xav@android.com> am 76033864: Add GestureBuilder to the samples.

Merge commit '76033864c534e1516747ae2980b2eb26f0e51f5f'

* commit '76033864c534e1516747ae2980b2eb26f0e51f5f':
Add GestureBuilder to the samples.
76033864c534e1516747ae2980b2eb26f0e51f5f 23-Jul-2009 Xavier Ducrohet <xav@android.com> Add GestureBuilder to the samples.
dk-linux-x86.atree
dk.atree
2a6f10a9f0ca3beb210f49fd611c510ccdf2259a 20-Jul-2009 Joe Onorato <joeo@android.com> This should depend on the new docs target, not the big one.
ndroid.mk
49d559a9faed107661d13a22a604a83b0305db06 25-Jun-2009 Raphael Moll <raphael@google.com> am 53f1c71a: Revert "Package both swt.jar for linux-x86 and linux-x86_64."

Merge commit '53f1c71a034e03fe50549dbd19a6053b906850ad'

* commit '53f1c71a034e03fe50549dbd19a6053b906850ad':
Revert "Package both swt.jar for linux-x86 and linux-x86_64."
53f1c71a034e03fe50549dbd19a6053b906850ad 25-Jun-2009 Raphael Moll <raphael@google.com> Revert "Package both swt.jar for linux-x86 and linux-x86_64."

This reverts commit 8f346c14d0b09af59801dfc41a112809630ec6f4.
https://android-git.corp.google.com/g/Gerrit#change,5179
dk-linux-x86.atree
c8c44241fb3fde4d65e4323a46c0261e97321c70 25-Jun-2009 Raphael Moll <raphael@google.com> am 8f346c14: Package both swt.jar for linux-x86 and linux-x86_64.

Merge commit '8f346c14d0b09af59801dfc41a112809630ec6f4'

* commit '8f346c14d0b09af59801dfc41a112809630ec6f4':
Package both swt.jar for linux-x86 and linux-x86_64.
8f346c14d0b09af59801dfc41a112809630ec6f4 24-Jun-2009 Raphael Moll <raphael@google.com> Package both swt.jar for linux-x86 and linux-x86_64.

This depends on another CL in prebuilt that packages
both linux-x86/swt/swt.jar and linux-x86/swt_64/swt_64.jar:

https://android-git.corp.google.com/g/5178

The new jar are picked from out/... rather than prebuilt,
which seems to work better.
dk-linux-x86.atree
6b1e19d17d42b5ac6fa4b2374fffb51994e5958c 06-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 51851f30: Merge change 3316 into donut

Merge commit '51851f307936a96bbb12acf98cf96979d5ed05bf'

* commit '51851f307936a96bbb12acf98cf96979d5ed05bf':
Fix make_windows_sdk to make sure we're not creating
fb64322e76081af6dda8aaa055d17e350a2bcf99 05-Jun-2009 Raphael <raphael@google.com> Fix make_windows_sdk to make sure we're not creating
files as directories :-)
ools/make_windows_sdk.sh
9aa9fcf0c146368bf4ad0915302bd60ab33b631b 05-Jun-2009 Raphael <raphael@google.com> am 0dbf4c8b: Change scripts to support x86_64 for DDMS.

Merge commit '0dbf4c8bcfc95bc09cca46e523094c3be9ab0d48'

* commit '0dbf4c8bcfc95bc09cca46e523094c3be9ab0d48':
Change scripts to support x86_64 for DDMS.
ab16f45d674628e7e0c0744f05e6fd3c63dee9e5 05-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 79508571: Merge change 3195 into donut

Merge commit '79508571c00bfdfb7e46f99d3df1c4ecd5f9a282'

* commit '79508571c00bfdfb7e46f99d3df1c4ecd5f9a282':
Change the SDK, DDMS and Traceview to work with the new SWT libraries.
0dbf4c8bcfc95bc09cca46e523094c3be9ab0d48 05-Jun-2009 Raphael <raphael@google.com> Change scripts to support x86_64 for DDMS.
ools/make_windows_sdk.sh
c5a89e256cd0ed486d72b23c2309d189bd923051 04-Jun-2009 Xavier Ducrohet <xav@android.com> Change the SDK, DDMS and Traceview to work with the new SWT libraries.

The SDK now contains 32 and 64 bit version of SWT. DDMS and Traceview
use the archquery java app to check the architecture of the VM to decide
which version of SWT should be used to run the apps.
dk-darwin-x86.atree
dk-linux-x86.atree
dk.atree
d7a547d1166295a381b5c6d78aef8e7e192c91cf 21-May-2009 Android (Google) Code Review <android-gerrit@google.com> am 1f4a1dcb: Merge change 2121 into donut

Merge commit '1f4a1dcb5f9cfe65a98be2fcb21cd5df4c6a3a9e'

* commit '1f4a1dcb5f9cfe65a98be2fcb21cd5df4c6a3a9e':
SDK #1800921: Packages the Windows SDK in a temporary location.
d1959dcee1d3fcd4a83908e3333c6388da6d404c 20-May-2009 Raphael <raphael@google.com> SDK #1800921: Packages the Windows SDK in a temporary location.

This changes make_windows_sdk so that it packages everything
in a temp dir. Once the build & packaging succeeds, the final
Zip is copied to the desired location.

The temp dir is *not* cleared on zip errors, which helps in
diagnosing packaging issues after the fact.

This has no impact on the build process itself (i.e. make
adb, emulator, etc.) which all happen in $SDK/out anyway.

The temp dir can be passed as an argument. If not provided,
the default Cygwin $TMP is used. Otherwise /tmp is used.

I also added an usage description when parameters are missing.
ools/make_windows_sdk.sh
c27b3804d108600be4b75c476b99cb9b5229e38d 19-May-2009 Xavier Ducrohet <xav@android.com> am 53f479a3: Update the SDK packaging to include sdkuilib.

Merge commit '53f479a3675bfa3797fad324bc80323bf1c539b7'

* commit '53f479a3675bfa3797fad324bc80323bf1c539b7':
Update the SDK packaging to include sdkuilib.
53f479a3675bfa3797fad324bc80323bf1c539b7 18-May-2009 Xavier Ducrohet <xav@android.com> Update the SDK packaging to include sdkuilib.

This is now necessary since the 'android' tool has a UI.
dk.atree
12ad2e48eef34e900c2468a81eb534f7cdea6104 15-May-2009 Xavier Ducrohet <nobody@android.com> am 0d61af72: am 5cb2d230: AI 148875: Fix Google add-on to include Streetview, remove the add-account from the SDK (this is google specific), update the google Add-on to rev 2

Merge commit '0d61af7220b7289624bc3e5dc4e3297e95c07f7c'

* commit '0d61af7220b7289624bc3e5dc4e3297e95c07f7c':
AI 148875: Fix Google add-on to include Streetview, remove the add-account from the SDK (this is google specific), update the google Add-on to rev 2
5cb2d23022cec5abc07c4dbb463be58e6d88b2c7 15-May-2009 Xavier Ducrohet <nobody@android.com> AI 148875: Fix Google add-on to include Streetview, remove the add-account from the SDK (this is google specific), update the google Add-on to rev 2

Automated import of CL 148875
dk.atree
6542544f0e3e1eb639e02fba0c981eb5029d809b 20-Apr-2009 Raphael Moll <> Merge branch 'readonly-p4-master'
4394c9b06057e798c30bf4b250a59ed3b6519aca 20-Apr-2009 Raphael Moll <> AI 146972: am: CL 146970 am: CL 146969 Windows SDK fixes for JetCreator
Original author: raphael
Merged from: //branches/cupcake/...
Original author: android-build

Automated import of CL 146972
ools/make_windows_sdk.sh
9d6afd51c89094baa1bd419e90824bd13d899225 20-Apr-2009 Raphael Moll <> AI 146969: Windows SDK fixes for JetCreator
BUG=1793093

Automated import of CL 146969
ools/make_windows_sdk.sh
fe0f6b73ab3863169afe1a21e9885d07589e99ef 20-Apr-2009 Xavier Ducrohet <> Merge branch 'readonly-p4-master'
82ac685f6565141fdaed76d7bb50c86b1385f58a 20-Apr-2009 Xavier Ducrohet <> AI 146949: am: CL 146944 am: CL 146943 Move JetCreator into tools/Jet/JetCreator. Add demo content and Logic templates in tools/Jet/
Original author: xav
Merged from: //branches/cupcake/...
Original author: android-build

Automated import of CL 146949
dk-darwin-x86.atree
ools/make_windows_sdk.sh
c6a9036940b740766c8b116ae629a67536ef15a7 20-Apr-2009 Xavier Ducrohet <> AI 146943: Move JetCreator into tools/Jet/JetCreator. Add demo content and Logic templates in tools/Jet/
BUG=1793093

Automated import of CL 146943
dk-darwin-x86.atree
ools/make_windows_sdk.sh
3328f02351186e4404af0616fd1843d34cc1395b 19-Apr-2009 Raphael Moll <> Merge branch 'readonly-p4-master'
9ddd8a3d73211a359179f5fc26e8208a94e0e743 19-Apr-2009 Raphael Moll <> AI 146864: am: CL 146863 am: CL 146862 Fix Windows SDK build.
Original author: raphael
Merged from: //branches/cupcake/...
Original author: android-build

Automated import of CL 146864
ools/make_windows_sdk.sh
b0b773fccd42ae1c8370acd0dee073effdecd914 19-Apr-2009 Raphael Moll <> AI 146862: Fix Windows SDK build.
BUG=1793093

Automated import of CL 146862
ools/make_windows_sdk.sh
78aeb4ef40ffc2b53dca36f53d8be6d5792918c9 19-Apr-2009 Xavier Ducrohet <> Merge branch 'readonly-p4-master'
afb3dbd5c013a9e6a7873ff45845d1ac0e2b9fa1 19-Apr-2009 Xavier Ducrohet <> AI 146831: am: CL 146750 am: CL 146747 Add the JetCreator tools and docs to the SDK (mac/windows only).
Original author: xav
Merged from: //branches/cupcake/...
Original author: android-build

Automated import of CL 146831
dk-darwin-x86.atree
ools/make_windows_sdk.sh
bcc0b044fd1a04be0c5f05632b4756ab7c6c7e23 17-Apr-2009 Xavier Ducrohet <> AI 146747: Add the JetCreator tools and docs to the SDK (mac/windows only).
BUG=1793093

Automated import of CL 146747
dk-darwin-x86.atree
ools/make_windows_sdk.sh
6e44cca2a1023f4c0202f8120ed294c9e8dfeed3 10-Apr-2009 Xavier Ducrohet <> Merge branch 'readonly-p4-master'
26e6ad9c76807e61aca276b298106cc3ba242599 10-Apr-2009 Xavier Ducrohet <> AI 145660: am: CL 145622 am: CL 145380 Fixes for add-on build
Original author: xav
Merged from: //branches/cupcake/...
Original author: android-build

Automated import of CL 145660
dk.atree
7215471a97892b4692f0f9f93eef3f2d1544fe7b 09-Apr-2009 Xavier Ducrohet <> AI 145380: Fixes for add-on build

Automated import of CL 145380
dk.atree
e68ddeeb13de0b52dae0795fa43da4b7f4b9cabe 01-Apr-2009 The Android Open Source Project <initial-contribution@android.com> Merge commit 'goog/readonly-p4-master'
dc9a9a7bf7ea12241af3bd431de758676e57ccf1 01-Apr-2009 Raphael Moll <> AI 143880: am: CL 143879 am: CL 143876 Include hprof-conv in SDK (bug #1640225)
Original author: raphael
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...

Automated import of CL 143880
dk.atree
ools/make_windows_sdk.sh
058dad6d77b7d218ec79b00d24bb355dc39db7b2 01-Apr-2009 Raphael Moll <> AI 143876: Include hprof-conv in SDK (bug #1640225)
BUG=1640225

Automated import of CL 143876
dk.atree
ools/make_windows_sdk.sh
3e2a2d312abdcd476ef9612bd4057d5aee289227 19-Mar-2009 Jean-Baptiste Queru <jbq@google.com> Merge commit 'remotes/korg/cupcake' into cupcake_to_master
52d4c30ca52320ec92d1d1ddc8db3f07f69c4f98 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
ndroid.mk
dk-darwin-x86.atree
dk-linux-x86.atree
dk.atree
dk.exclude.atree
ools/make_windows_sdk.sh
d4aee0c0caa00aa02d4c50ed28151591ac0456b5 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
ndroid.mk
dk-darwin-x86.atree
dk-linux-x86.atree
dk.atree
dk.exclude.atree
ools/make_windows_sdk.sh
d2f2b1d7b77d06bce8cf9340171cf6c25cd720c4 03-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@132589
dk.atree
ools/make_windows_sdk.sh
b8747bc7b1082c273360f84f7cd0b4770613955a 03-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@137055
dk.atree
ools/make_windows_sdk.sh
74a996a2c7251790ab3cc6a10358c31ad0fed828 20-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@132569
dk.atree
ff4b5f241f323a335897aff754d144f246caede7 19-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@132276
dk.atree
ools/make_windows_sdk.sh
a1a69d0936cd9c3120c52de7ea80548a0486b749 12-Feb-2009 Adrian Taylor <adrian@macrobug.com> Improving comments in make_windows_sdk.sh.

This commit adds notes about some cygwin packages which I found were
required, and a few other things which cropped up. It has no functional
changes.

List of packages amended as per request by Raphael Moll
(ralf@android.com).
ools/make_windows_sdk.sh
e3c5766074e2d6d1dcd60c4dafabce8a0c20d2b8 11-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@130745
dk.atree
7b53e3937797ee1eea71c6291bdcd58cb9dedf7a 20-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@127101
dk.atree
ools/make_windows_sdk.sh
b8d704a517c8a838e42dde314c7f6acdcc981e53 16-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@126645
ools/make_windows_sdk.sh
95cf464c5a9f2bb7d6bf3a231862323dcbf854f8 10-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@125939
dk.atree
e943f2fd8e7623ba3ea12bb65294d30446db4174 18-Dec-2008 The Android Open Source Project <initial-contribution@android.com> Code drop from //branches/cupcake/...@124589
ndroid.mk
dk.atree
ools/make_windows_sdk.sh
5c11852110eeb03dc5a69111354b383f98d15336 21-Oct-2008 The Android Open Source Project <initial-contribution@android.com> Initial Contribution
ndroid.mk
dk-darwin-x86.atree
dk-linux-x86.atree
dk.atree
dk.exclude.atree