LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,020 Commits 2 Branches 0 Tags
2cf5a578c65628e032f03c4d038db8a632b6f44e
Commit Graph

207 Commits

Author SHA1 Message Date
Raphael Moll
da1248a231 am 5c428f4a: am 799754e1: Merge "Tools package was missing proguard.bat" 
Merge commit '5c428f4a8d7fcbd8aea588593cafa8193d48b5f7'

* commit '5c428f4a8d7fcbd8aea588593cafa8193d48b5f7':
  Tools package was missing proguard.bat
 2010-10-25 17:25:08 -07:00
Raphael Moll
5c428f4a8d am 799754e1: Merge "Tools package was missing proguard.bat" 
Merge commit '799754e18b7ce057a9aab8ea243f7dfd1d4edb44' into gingerbread-plus-aosp

* commit '799754e18b7ce057a9aab8ea243f7dfd1d4edb44':
  Tools package was missing proguard.bat
 2010-10-25 16:57:55 -07:00
Raphael Moll
b04a4f947c Tools package was missing proguard.bat 
SDK Bug: 3126278

Change-Id: I8bb9c2e2250b0da4303b09cdfe05717cee887c44
 2010-10-23 22:11:37 -07:00
Bill Napier
f043be8674 am 1e41661b: am 66d61ef9: Merge "Add in MonkeyRunner to the Windows SDK." 
Merge commit '1e41661b6077552ed71e902f0e628ea6e48aba06'

* commit '1e41661b6077552ed71e902f0e628ea6e48aba06':
  Add in MonkeyRunner to the Windows SDK.
 2010-10-16 09:43:36 -07:00
Bill Napier
1e41661b60 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.
 2010-10-15 15:58:17 -07:00
Xavier Ducrohet
50617c8ff4 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.
 2010-10-15 14:02:11 -07:00
Kenny Root
10540d6528 resolved conflicts for merge of 6c99a051 to master 
Change-Id: I0bae8e92609253924f0c7adbc59f8c45394f341a
 2010-10-15 00:14:56 -07:00
Raphael
cca5d187d5 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
 2010-10-14 11:25:01 -07:00
Xavier Ducrohet
9e914e4aa2 Reorder the samples packaging + readme. 
Change-Id: Ic4d91b214ec9ceb6303bd99e0a0580fbf3401177
 2010-10-13 13:38:45 -07:00
Bill Napier
85c3f8e126 Add in MonkeyRunner to the Windows SDK. 
Change-Id: Iecb23b5a2f790978246df9ab4a10cda884abf742
 2010-10-10 13:34:38 -07:00
Raphael
59b02d0eff Update win_sdk to put binaries in SDK/platform-tools. 
Change-Id: I8fe9df75ceaf04aa1935341e51bf6f3edffae9e4
 2010-10-08 15:41:01 -07:00
Xavier Ducrohet
76afc004df 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
 2010-09-30 11:33:21 -07:00
Xavier Ducrohet
87bfd07634 am 92d47e4e: am 682ec293: Split the tools component from sdk.atree 
Merge commit '92d47e4ef65c225bcf82c81377412d5c67349ff5'

* commit '92d47e4ef65c225bcf82c81377412d5c67349ff5':
  Split the tools component from sdk.atree
 2010-09-30 11:27:02 -07:00
Xavier Ducrohet
92d47e4ef6 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
 2010-09-30 08:52:23 -07:00
Xavier Ducrohet
682ec29335 Split the tools component from sdk.atree 
This is now in sdk/build/tools.atree.

Change-Id: Ic0c5e14e22a5c760b686dee1a7e376667b9c651b
 2010-09-28 08:37:24 -07:00
Xavier Ducrohet
6f1718bab5 am daa454cb: am 64e53fe5: Merge "Move adb to the platform-tools." 
Merge commit 'daa454cb3ba51dcf75330955dc899d35a7b60989'

* commit 'daa454cb3ba51dcf75330955dc899d35a7b60989':
  Move adb to the platform-tools.
 2010-09-27 21:29:10 -07:00
Raphael Moll
745a9108d0 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).
 2010-09-27 21:29:06 -07:00
Xavier Ducrohet
daa454cb3b am 64e53fe5: Merge "Move adb to the platform-tools." 
Merge commit '64e53fe5dd1d884eabe5e6160d69afa47038d77b' into gingerbread-plus-aosp

* commit '64e53fe5dd1d884eabe5e6160d69afa47038d77b':
  Move adb to the platform-tools.
 2010-09-27 16:44:55 -07:00
Raphael Moll
c0a2e0fc63 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).
 2010-09-27 16:44:40 -07:00
Xavier Ducrohet
64e53fe5dd Merge "Move adb to the platform-tools." 2010-09-27 16:24:25 -07:00
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