Commit Graph

293 Commits

Author SHA1 Message Date
Maurice Chu
6fee567b2f Move multidex support library
Multidex is being moved from frameworks/support/multidex to
frameworks/multidex.

Bug: 10674263

(cherry picked from commit 7b433ee4e4)

Change-Id: If33387af7b58da2f258eba1240a911483daa9c7e
2014-07-18 10:52:54 +00:00
Yohann Roussel
b16fd5a5f4 Add res folder to multidex SDK projects.
This will fix an error when importing thoses projects with ADT.

(cherry picked from commit 6fa1156b3b)

Change-Id: Ibcd570a3f4f3bd6c8c4fd263d2d18e2cec18b787
2014-07-17 16:44:30 +02:00
Yohann Roussel
96dc8db6e5 android-support-multidex-instrumentation in SDK.
(cherry picked from commit 6f57b24889)

Change-Id: Ic8e609c0025d86c873161b28d99bb0da2b6c2d27
2014-07-17 16:44:30 +02:00
Yohann Roussel
ef0e4f5a3b Add multidex ADT project to SDK.
(cherry picked from commit a6ca3cf29f)

Change-Id: I44cf397dbc5649d9d701e2f8524a322d74c2aaa6
2014-07-17 16:44:30 +02:00
Raphael Moll
4f8a38ed7a Generate api-versions.xml for lint.
Depends on:
- tools/base      I747d27e998c6dbd61dd17c44bfc747c9542e33d1
- tools/buildSrc  I400f4b6c146836ba30e6e7985ca6c9894985a8cb
- prebuilts/tools Ia4b0c477cf6f4788de610be017a9f5b43d73486c

Change-Id: I3f791d5e1d0ea893cdb5969854d9ae99d5fbb5b7
2014-06-09 15:59:58 -07:00
Steve Moyer
23a8adf276 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
2014-06-04 09:55:31 -07:00
Raphael Moll
37433ac223 Add Build-Tools runtime.properties file.
Change-Id: I5addf44a2ea3dbb91df5a49f6fcb10e75047fa82
2014-06-03 13:46:51 -07:00
Raphael Moll
261307bebe resolved conflicts for merge of bf164835 to stage-aosp-master
Change-Id: I3c380b1ddae5e088985513398d7eb6274d8426eb
2014-05-20 16:29:29 -07:00
Raphael Moll
e9a7920ca4 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
2014-05-20 14:10:47 -07:00
Bill Yi
23f68632c7 Merge commit 'd297be2136209cab4edbcf8879520f65fb564103' into HEAD 2014-04-29 11:33:09 -07:00
Steve Moyer
0b1a1f7b38 Merge "DO NOT MERGE: Add SmsTest and mege emulator smoke tests" 2014-04-04 16:32:00 +00:00
Steve Moyer
6ded79d696 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
2014-04-03 16:02:56 -07:00
Xavier Ducrohet
76510e2dd2 Move ZipAlign to build-tools.
Change-Id: Id83a8dc86946bcde78e9eaaab009a06a59fccbd0
2014-04-03 10:09:53 -07:00
Alexander Lucas
7ae2eca4a0 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
2014-03-13 22:15:02 +00:00
Alexander Lucas
c4a6ecf00d Added new samples to sdk.atree for march push
Change-Id: Ic138c1ff32c86ebb48375cc07d0c138829c8a3f7
2014-03-10 14:49:49 -07:00
Alexander Lucas
97c8590ca8 Updating build metadata for march sample push.
Change-Id: Ic8f6e2adce61c76cfb3e3c6db96f13c915be7a63
2014-03-07 15:00:38 -08:00
Alexander Lucas
fc1c69874c Updated sdk.atree to include new samples for feb sample launch
Change-Id: I71af239a0bf0f146345e243720d9e4300c5ed1f6
2014-02-06 14:45:32 -08:00
Deepanshu Gupta
0363ab1f74 Merge "Bundle Noto fonts with the SDK" into klp-dev 2014-02-06 02:05:06 +00:00
Deepanshu Gupta
bc0b4a804f Bundle Noto fonts with the SDK
Change-Id: I28c48b3b5dbd761ef0391497e834f315ac83cae4
2014-01-08 01:44:45 +00:00
Xavier Ducrohet
7f15ddd546 Properly package the RS support bc file.
Change-Id: Ia55b597085c97cb07029b812392a618a4670ff36
2014-01-02 16:24:21 -08:00
Alexander Lucas
b734f1b590 Updating sdk.atree to reflect new set of samples
Change-Id: I1308d65f77783fc7f43fdc36bf90a59a137ec73f
2013-11-21 13:32:25 -08:00
Deepanshu Gupta
2c3e0af13c Merge "Add ICU jar to SDK" into jb-mr2-dev 2013-09-05 18:48:10 +00:00
Trevor Johns
6a3067db20 Merge "Add common directory to BasicSyncAdapter sample" into jb-mr2-dev 2013-08-15 22:15:11 +00:00
Xavier Ducrohet
8791785cd0 Package Renderscript files for support mode.
Change-Id: I4eae052b01ae014f3e4d289ba33893dfd9c43309
2013-08-13 15:57:08 -07:00
Stephen Hines
94efbd635d Add bcc_compat to sdk.atree to fix build break.
Change-Id: Iaccd5654aca64b249e9805844099fc4724b6b07e
2013-08-06 18:18:27 -07:00
Xavier Ducrohet
1fda188905 Merge "Add dynamic libraries for renderscript." into jb-mr2-dev 2013-07-25 19:30:53 +00:00
Xavier Ducrohet
afda1d33de 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
2013-07-25 12:24:21 -07:00
Trevor Johns
2a4aa3cd5d Remove AppRestrictions and BluetoothLeGatt samples
These have been moved to the new samples repository in
developers/samples/android.

Change-Id: I77312ea146ccb47ec8ecf38c9448149ec4c34962
2013-07-24 12:36:28 -07:00
Trevor Johns
da67d18b5b 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
2013-07-24 12:31:16 -07:00
Trevor Johns
af0ab077f3 Remove samples/legacy from sdk.atree
This directory is only on my local machine, and doesn't
really exist. :)

Change-Id: Iea29b3f06fd089a5dca0f990cca058d9c2e7179b
2013-07-23 16:03:08 -07:00
Trevor Johns
1ffb35074a 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
2013-07-23 15:54:23 -07:00
Xavier Ducrohet
b7ed7bec1f Add support-v4 to the appcompat lib.
Change-Id: I2676ca4705e5dca15388e3759ba3a644fbae2b9b
2013-07-23 12:31:50 -07:00
Siva Velusamy
31cc1650cf Merge "Release systrace into platform-tools" into jb-mr2-dev 2013-07-22 20:53:51 +00:00
Fred Chung
b71371d3af 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
2013-07-21 23:19:18 -07:00
Siva Velusamy
28f992a9cd Release systrace into platform-tools
Change-Id: Id05c92f96ecb38c5a056d51ba86ea2e91a45733d
2013-07-19 15:05:24 -07:00
Jeff Brown
8b51a39fda Merge "Revert "Remove mediarouter v7 support library from SDK."" into jb-mr2-dev 2013-07-09 23:44:58 +00:00
Jeff Brown
a18be3116a Revert "Remove mediarouter v7 support library from SDK."
This reverts commit 408c184614.

Bug: 9425325
Change-Id: I340364c43f3040b454894e55a94be236ff999ce6
2013-07-09 00:35:10 +00:00
Fred Chung
7167a054a8 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
2013-07-08 13:22:56 -07:00
Deepanshu Gupta
79cc4f9212 Add ICU jar to SDK
Bundle the ICU jar with the SDK.

Change-Id: I0773cee58b072f3bf60c2594b6dee251ef101cf0
2013-06-20 10:09:46 -07:00
Jeff Brown
408c184614 Remove mediarouter v7 support library from SDK.
Bug: 9425325
Change-Id: I9459fa005c4801cac0c2e28c5afb414620241ad9
2013-06-14 15:47:52 -07:00
Chris Banes
063f035dd8 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>
2013-03-25 09:34:53 +00:00
Raphael Moll
9ca69cf21f SDK: Generate build-tools package.
(cherry-picked from bc7c8c5fc5)

Change-Id: I36e9ee9a9486da18704428ce5225934a6a308029
2013-03-22 13:38:56 -07:00
Raphael Moll
8a8a3025bb resolved conflicts for merge of c6dc2830 to jb-mr2-dev
Change-Id: Ia4e83de02c3f6d04523f52ca9586bdb217d9084c
2013-03-22 11:09:16 -07:00
Raphael Moll
ef1962972f SDK: Place platform-tools NOTICE file in proper directory.
Change-Id: Id5177504b30599df7f44b2354fb708515cfb54a9
2013-03-22 10:30:50 -07:00
Jeff Brown
bda0c73168 Move media router samples to new Support7Demos project.
Add media router support library to SDK build.

Bug: 8175766
Change-Id: I2f333d40ad39e820e8d706a7dab086241692a861
2013-03-20 18:20:18 -07:00
Jeff Brown
3221bcdb88 Update appcompat support lib atree rules.
Bug: 8175766
Change-Id: I553d24844e3f85313207c2c2d64336ee6a5c9a17
2013-03-20 18:20:18 -07:00
Jeff Brown
a00f2f6eb8 Update gridlayout support library atree rules.
Bug: 8175766
Change-Id: Ia2e2faeff2540cc2879e93f11d082fe47ae1de8f
2013-03-20 18:20:18 -07:00
Raphael Moll
cc8a21a276 SDK: Generate build-tools package. DO NOT MERGE.
Change-Id: I6ae3757f947e927ea09b637e552834e17f70dc44
2013-03-20 16:43:47 -07:00
Siva Velusamy
e8e0e4b9e7 Add ActionBar support library to SDK build
Change-Id: I417657543452b5a9fa0e80664481a655b39a3874
2012-10-10 15:32:14 -07:00
Adam Momtaz
8213206c6e Added UiAutomator samples to SDK
Verified tests are building OK.

Change-Id: I838e44e84b3d9e2e503bff4ed2b95887996d8801
2012-09-25 17:15:17 -07:00