Raphael Moll
2f613967a0
Move adb to the platform-tools (windows SDK part).
...
This is the Win SDK counterpart to Change I4c2a11c1.
Change-Id: I660ba49154894b5e78d7e943258ed769efd393dc
2010-09-27 16:20:07 -07:00
Xavier Ducrohet
6a8e50f695
Move adb to the platform-tools.
...
Also fixed the packaging of hierarchyViewer in the SDK
Change-Id: I4c2a11c1d87867efdd5df2dcb90469b7b1c5065a
2010-09-27 13:58:45 -07:00
Xavier Ducrohet
c54f778e92
am 591b5edf: am d5964750: Package Proguard with the SDK.
...
Merge commit '591b5edf255a5872fbfb5424f3ee0028fd036d08'
* commit '591b5edf255a5872fbfb5424f3ee0028fd036d08':
Package Proguard with the SDK.
2010-09-17 16:10:58 -07:00
Xavier Ducrohet
591b5edf25
am d5964750: Package Proguard with the SDK.
...
Merge commit 'd59647505dff76ebb2e8da489fabf6bf5ddb0d1f' into gingerbread-plus-aosp
* commit 'd59647505dff76ebb2e8da489fabf6bf5ddb0d1f':
Package Proguard with the SDK.
2010-09-17 14:31:47 -07:00
Xavier Ducrohet
d59647505d
Package Proguard with the SDK.
...
Change-Id: Ia3effdf9465edbe55d5a691bf7bad163e95bb625
2010-09-16 15:54:37 -07:00
Megha Joshi
8d74e52a0a
resolved conflicts for merge of 292096fc to master
...
Change-Id: I2a0d13b3b36aaf3fd6d6b1161bb75ae5ae890630
2010-09-14 10:39:56 -07:00
Megha Joshi
292096fccd
am 3471dafa: am 42d3a4ae: Adding CrossCompatibility sample app.
...
Merge commit '3471dafa11b721ae4510cb182e3d54033faed12d' into gingerbread-plus-aosp
* commit '3471dafa11b721ae4510cb182e3d54033faed12d':
Adding CrossCompatibility sample app.
2010-09-13 17:43:01 -07:00
Megha Joshi
3471dafa11
am 42d3a4ae: Adding CrossCompatibility sample app.
...
Merge commit '42d3a4ae1431fb3f02ac212000e8cdfb6f21e226' into gingerbread
* commit '42d3a4ae1431fb3f02ac212000e8cdfb6f21e226':
Adding CrossCompatibility sample app.
2010-09-13 17:38:43 -07:00
Megha Joshi
42d3a4ae14
Adding CrossCompatibility sample app.
...
Change-Id: I565584ea53212f61a9fbbb44e50da59f4ba06fff
2010-09-13 17:00:10 -07:00
Xavier Ducrohet
3aecc4de01
New SDK architecture. DO NOT MERGE.
...
tools normally under the platform, move to a single location
called platform-tools/
Change-Id: I70659167778303722acb107a2d04bbf01467f884
2010-08-30 16:01:45 -07:00
Xavier Ducrohet
e1a36a69e8
am 7ddeaf21: am 420b59fe: Fix windows SDK build.
...
Merge commit '7ddeaf2189847cbc6765af552c98439d654d6938'
* commit '7ddeaf2189847cbc6765af552c98439d654d6938':
Fix windows SDK build.
2010-08-27 19:43:59 -07:00
Xavier Ducrohet
7ddeaf2189
am 420b59fe: Fix windows SDK build.
...
Merge commit '420b59fe215f8a912e66759d1c4a252bea3df39d' into gingerbread-plus-aosp
* commit '420b59fe215f8a912e66759d1c4a252bea3df39d':
Fix windows SDK build.
2010-08-27 19:41:51 -07:00
Xavier Ducrohet
420b59fe21
Fix windows SDK build.
...
Location of hierarchyviewer is now in hierarchyviewer2/app/etc
Change-Id: I14257c96552a16d19461cdf8194045a608dd03b3
2010-08-27 19:30:38 -07:00
Raphael Moll
23d595f53c
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"
2010-08-26 13:14:29 -07:00
Raphael Moll
059e4eb3db
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"
2010-08-26 09:02:13 -07:00
Raphael Moll
f08d230ed0
SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"
...
Change-Id: Id85ec31d80fc12a6907d9c3404a29d28d4923abd
2010-08-23 13:38:02 -07:00
Svetoslav Ganov
d739fa797a
am b0772436: am 4b06026c: am 9f93186b: Adding a sample accessibility service
...
Merge commit 'b07724366ebd73ef3e9daa1d772a633cd331f2b4'
* commit 'b07724366ebd73ef3e9daa1d772a633cd331f2b4':
Adding a sample accessibility service
2010-08-17 10:56:26 -07:00
Svetoslav Ganov
b07724366e
am 4b06026c: am 9f93186b: Adding a sample accessibility service
...
Merge commit '4b06026cb901d4a032ecc731a835767ff1bf27fe' into gingerbread-plus-aosp
* commit '4b06026cb901d4a032ecc731a835767ff1bf27fe':
Adding a sample accessibility service
2010-08-17 10:48:34 -07:00
Svetoslav Ganov
4b06026cb9
am 9f93186b: Adding a sample accessibility service
...
Merge commit '9f93186beae13ea057a4b2e867928b357cd650a4' into gingerbread
* commit '9f93186beae13ea057a4b2e867928b357cd650a4':
Adding a sample accessibility service
2010-08-17 10:45:23 -07:00
Svetoslav Ganov
9f93186bea
Adding a sample accessibility service
...
Change-Id: I5bd42157e263aac6d7a85db090319db168dea2fd
2010-08-11 14:45:56 -07:00
Raphael Moll
99e27c0f08
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.
2010-08-10 11:45:02 -07:00
Raphael Moll
4336dcc64b
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.
2010-08-10 11:39:50 -07:00
Raphael Moll
ff779c0f2a
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
2010-08-05 13:32:03 -07:00
Xavier Ducrohet
3cf2a3ac06
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.
2010-07-30 11:33:05 -07:00
Xavier Ducrohet
7d3106bebb
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.
2010-07-30 11:29:30 -07:00
Xavier Ducrohet
b86b7f72db
Re-organize the SDK, moving the build tools out of the platforms.
...
Change-Id: I4526310a1c882ad33084d94e118b1c74b3181a6a
2010-07-28 16:01:06 -07:00
Joe Onorato
8c490dc8d1
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.
2010-07-15 11:16:38 -07:00
Joe Onorato
6e384d9b43
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
2010-07-14 19:56:38 -07:00
Gilles Debunne
55f4a60aa0
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
2010-06-24 09:44:57 -07:00
Kenny Root
b606d1bea2
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
2010-06-23 13:56:38 -07:00
Kenny Root
9e1400cdae
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
2010-06-23 13:40:41 -07:00
The Android Open Source Project
906d47573b
merge from open-source master
...
Change-Id: I4e06b684dd46c317e1c206e584050dbee20be281
2010-06-18 11:33:52 -07:00
Xavier Ducrohet
32b1e17b75
am 2f8cb6de: am fdbc1d7b: remove apkbuilder.jar from the sdk build.
...
Merge commit '2f8cb6de03df5283bc5a5e3afc6ff729804e6bc9'
* commit '2f8cb6de03df5283bc5a5e3afc6ff729804e6bc9':
remove apkbuilder.jar from the sdk build.
2010-06-16 19:41:49 -07:00
Xavier Ducrohet
fdbc1d7bc1
remove apkbuilder.jar from the sdk build.
...
Change-Id: I76f979a0d3aa196f25e8a5f2522437e26655a7d0
2010-06-16 18:10:41 -07:00
Xavier Ducrohet
1cabf853fd
remove apkbuilder.jar from the sdk build.
...
Change-Id: I82cca5c159c1f3210b98deebfd78e2844728b2ac
2010-06-15 18:04:44 -07:00
Xavier Ducrohet
66bdf7ff57
am e389abdc: am 442396be: remove jarutils from the sdk packaging.
...
Merge commit 'e389abdc29eb2a9d523e64531975dde25a8e9617'
* commit 'e389abdc29eb2a9d523e64531975dde25a8e9617':
remove jarutils from the sdk packaging.
2010-06-15 16:01:29 -07:00
Xavier Ducrohet
442396be27
remove jarutils from the sdk packaging.
...
Change-Id: I49beab11b49f09451cbea9bfbc88aa522e7dbd85
2010-06-15 15:35:07 -07:00
The Android Open Source Project
e7a4c0910c
merge from open-source master
...
Change-Id: I3e12f866966fda80db5a0795eba9ff82bfe6547d
2010-06-15 15:02:39 -07:00
Xavier Ducrohet
4c22d2bb7d
remove jarutils from the sdk packaging.
...
Change-Id: Ic3c91ff5e20a5bf6b7c3ad11eb6e6f4250c7613d
2010-06-15 13:00:13 -07:00
Ying Wang
7d68266c86
Also dist the original linux sdk package for wind_sdk build.
...
Change-Id: I64dab5763dc7c7398582c5a30c126c7e3e6afe32
2010-06-15 09:24:35 -07:00
Dianne Hackborn
db974ee7bd
Dumb.
...
Change-Id: I05f17560ace880c628c94d676bd908c611348029
2010-06-04 14:13:27 -07:00
Dianne Hackborn
2e952670a2
Add API demo of a heavy-weight application.
...
Change-Id: I15e2d1c766af8aa7a62beed3069b8d128338ca11
2010-06-04 13:39:37 -07:00
Dirk Dougherty
8bfa91f076
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.
2010-05-11 10:18:43 -07:00
Dirk Dougherty
56c8df1b06
sdk change: add index for tictactoe library and app. fix output path for spinner sample app in sdk builds.
...
Change-Id: I51d412e1e78e6bd672eb419d53310eb1194672a3
2010-05-10 16:12:24 -07:00
Scott Main
46ea565515
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
2010-05-10 13:47:14 -07:00
Scott Main
6807387d71
change searchable dictionary folder name back to normal (exclude "v2", which
...
should instead be used only for HTML titles)
Change-Id: Ia5c08478d91fb8aa6246fcbca3d68337becadf65
2010-05-10 12:46:19 -07:00
Dirk Dougherty
9e678c26d8
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
2010-05-07 09:20:00 -07:00
Dirk Dougherty
2f0b1c1335
Doc change: cherry-pick from master. ->Subject: Android application files for the Activity Testing Tutorial
...
Conflicts:
build/sdk.atree
Change-Id: I5edb1d4d8a18fbda53a0e78ca6c9d20cf7d3ff4a
2010-05-07 09:16:56 -07:00
Xavier Ducrohet
5542d32c67
am fc7428f9: Add the TicTacToe Lib+Main samples
...
Merge commit 'fc7428f91254740a245fdac5db77d035c0b4c41f' into froyo-plus-aosp
* commit 'fc7428f91254740a245fdac5db77d035c0b4c41f':
Add the TicTacToe Lib+Main samples
2010-05-06 17:36:56 -07:00
Xavier Ducrohet
fc7428f912
Add the TicTacToe Lib+Main samples
...
Change-Id: I17a26172ab82b2e4b794774c5ab94bed8202b7d4
2010-05-06 16:53:09 -07:00