Commit Graph

498 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
ce2fdae0e6 Merge 1adaa571 from gingerbread
Change-Id: Ic4be80eea5331f2b32b507dd6546b86383306f94
2011-01-29 11:13:54 -08:00
Raphael
6a691b3ed8 resolved conflicts for merge of 1adaa571 to gingerbread-plus-aosp
Change-Id: I6c2ea537a9f6dce3c5d54b8c3c720b49058fea68
2011-01-27 21:46:19 -08:00
Raphael
1adaa57108 unix2dos command, used by win SDK, has been renamed under Lucid.
Note: this fix was already in master.

Change-Id: I7935093ef4a01181f7239e9aeeef4792ee0b54cc
2011-01-27 14:00:21 -08:00
Alexander Lucas
9f935c7da5 Added Honeycomb Gallery sample application.
Change-Id: I1eefc2837016a7973544f0c57a8464466e7dcef9
2011-01-19 17:02:48 -08:00
Xavier Ducrohet
91946fe86a Merge "Add RenderScript samples to the SDK." into honeycomb 2011-01-18 18:13:34 -08:00
Xavier Ducrohet
3292919d70 Add RenderScript samples to the SDK.
Change-Id: I6139a792916a1cb942c05be8243d52784f39f859
2011-01-18 16:41:29 -08:00
Xavier Ducrohet
7a3e7b1b9a 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
2011-01-18 14:21:55 -08:00
Jack Palevich
ebb6bc2fc8 Add BasicGLSurfaceView sample.
Show how to get started with OpenGL ES 2.0.

Change-Id: Iee83ca6a52eee64e8c6b77bc9a8abff11a1eabfd
2011-01-17 17:48:44 -08:00
Jack Palevich
2fd4288383 am 5e38995f: Merge "Add BasicGLSurfaceView sample." into gingerbread
* commit '5e38995f6af6339e5dccf86b50f8b658917c7aeb':
  Add BasicGLSurfaceView sample.
2011-01-17 17:42:56 -08:00
Xavier Ducrohet
a67b557e13 Merge "Add RS includes to the SDK and update skin list." into honeycomb 2011-01-16 19:16:16 -08:00
Winson Chung
eb80909dfc Adding WidgetPreview utility.
Change-Id: Idfdf866400687e58304863c3c4f3dd3c4aed45b1
2011-01-16 17:13:16 -08:00
Xavier Ducrohet
14f3c60f50 Add RS includes to the SDK and update skin list.
Change-Id: Id453585e5c1f4d80336bd2fc837afbc7a0a0d097
2011-01-16 13:21:52 -08:00
Jack Palevich
2f6e41d664 Add BasicGLSurfaceView sample.
Show how to get started with OpenGL ES 2.0.

Change-Id: I22e5e72114fd76bb7319c51e0a3b0d0e05c546fb
2011-01-14 19:27:56 -08:00
Raphael
32d597b5b7 Add llvm-rs-cc to the SDK (all platforms)
Change-Id: I6077251d0a34678e708ddd25068a511159ba7460
2011-01-13 16:59:09 -08:00
Xavier Ducrohet
9709bd228b Add WXGA skin.
Change-Id: I29e62d5a1bf9d5017bfdca9fe07ae4e3124f951c
2011-01-07 14:37:37 -08:00
Xavier Ducrohet
300b84c427 Cherry-pick f0e5e933 from master.
Move emulator skins to development.git

Also added new default RAM config to the skins.

Change-Id: Ic22592573d6d153fb94e2e2c981068936cae1219
2011-01-07 13:04:25 -08:00
Xavier Ducrohet
daf0b895e8 Cherry-pick f0e5e933 from master.
Move emulator skins to development.git

Also added new default RAM config to the skins.

Change-Id: I520c485f4ef9f6d9d2eea126ed46d96b5fc3e785
2011-01-07 13:03:22 -08:00
Xavier Ducrohet
12cd9bacfb am dde7492d: Merge "Move emulator skins to development.git"
* commit 'dde7492d4b34ba810329ad080a078bfb870a4507':
  Move emulator skins to development.git
2011-01-06 17:35:01 -08:00
Xavier Ducrohet
f0e5e93307 Move emulator skins to development.git
Also added new default RAM config to the skins.

Change-Id: Ib786287b43f639c6ae80bf109ac4fe5b12635676
2011-01-06 13:31:24 -08:00
Raphael Moll
1c0b37567b 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
2011-01-05 15:50:28 -08:00
Raphael Moll
40812f1c4b am 1bf9f693: Merge "Use OUT_DIR in atree to find android.jar"
* commit '1bf9f6936e423a686b623752e9f008acefaa1057':
  Use OUT_DIR in atree to find android.jar
2011-01-05 15:48:26 -08:00
Raphael Moll
c2e8083255 Use OUT_DIR in atree to find android.jar
Depends on change Iabbe9053 from build/core.

Change-Id: I0b6e29a5282c2ca6ff329981e5f8d2c677e6e84b
2011-01-05 14:59:27 -08:00
Dirk Dougherty
6499e7fc3a am 49b989c3: am 4171f296: Add AcceleromerPlay sample app to SDK samples package
* commit '49b989c36a07a2440d94ec4f6c899f4e30be1799':
  Add AcceleromerPlay sample app to SDK samples package
2010-11-29 18:15:36 -08:00
Dirk Dougherty
49b989c36a am 4171f296: Add AcceleromerPlay sample app to SDK samples package
* commit '4171f296681a0ef0a1df21fdc792fc9997c1146b':
  Add AcceleromerPlay sample app to SDK samples package
2010-11-29 18:13:49 -08:00
Dirk Dougherty
4171f29668 Add AcceleromerPlay sample app to SDK samples package
Change-Id: Id7ae8de4f3543169d6d707a470f0b872e00e953f
2010-11-29 18:11:26 -08:00
Dirk Dougherty
f5d68235fa am fb381e9f: am c73f37ba: Remove HeavyWeight sample from SDK samples package.
* commit 'fb381e9ff5cdc18d2a5463dc858980e3a609b8d0':
  Remove HeavyWeight sample from SDK samples package.
2010-11-29 17:09:37 -08:00
Dirk Dougherty
fb381e9ff5 am c73f37ba: Remove HeavyWeight sample from SDK samples package.
* commit 'c73f37ba5790cd1fe588d0f5886b677a7eaa39f0':
  Remove HeavyWeight sample from SDK samples package.
2010-11-29 17:07:26 -08:00
Dirk Dougherty
c73f37ba57 Remove HeavyWeight sample from SDK samples package.
Change-Id: Id2113b8a0cd1a7cc3d807919e6c40c50917baaea
2010-11-29 17:03:46 -08:00
Dirk Dougherty
b9beb6c055 Remove NFCDemo from sdk samples to fix build.
Change-Id: I7ab8743d39a5a0cf60d68544c4e94c786224f78e
2010-11-29 16:57:20 -08:00
Roman Nurik
02cdaff475 am 624ae678: am 14789d1e: Merge "Add NFCDemo to sdk.atree" into gingerbread
* commit '624ae678ef28e9abc4902bc49d7a23dbdb63f180':
  Add NFCDemo to sdk.atree
2010-11-29 16:04:40 -08:00
Roman Nurik
624ae678ef am 14789d1e: Merge "Add NFCDemo to sdk.atree" into gingerbread
* commit '14789d1eab905728da4f6995816c80716caf52f4':
  Add NFCDemo to sdk.atree
2010-11-29 15:54:07 -08:00
Roman Nurik
9488e4296e Add NFCDemo to sdk.atree
Change-Id: I2e0a330a31d6d3c0b8c70c38af60118461e7e403
2010-11-29 15:45:50 -08:00
Raphael
b26b1274ed 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.
2010-11-23 15:39:37 -08:00
Raphael
a65f76962f resolved conflicts for merge of f0f624f3 to gingerbread-plus-aosp
Change-Id: I670002d7f8606f22c438057883e1a4a9fe63ebf6
2010-11-23 15:36:17 -08:00
Raphael Moll
1fe58f3892 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
2010-11-22 21:12:44 -08:00
Alexander Lucas
40090497c6 am 655f02a4: am 48cc36d9: Merge "Added SIP Demo to sample apps." into gingerbread
* commit '655f02a45669ce3b03d96cd8634bfe3745b6f725':
  Added SIP Demo to sample apps.
2010-11-04 07:20:40 -07:00
Alexander Lucas
655f02a456 am 48cc36d9: Merge "Added SIP Demo to sample apps." into gingerbread
* commit '48cc36d936ea132665c35a1f8c9a2b4b9207ec0b':
  Added SIP Demo to sample apps.
2010-11-03 15:35:24 -07:00
Alexander Lucas
a025796211 Added SIP Demo to sample apps.
Change-Id: Id98b6e542e1be5b9822a696936e735406c08500f
2010-11-03 13:21:52 -07:00
Raphael Moll
01cd2b97eb am 07d29555: am 42197997: Merge "SDK Windows: Package customized proguard.bat scripts." 2010-10-26 15:44:23 -07:00
Raphael Moll
07d29555ee am 42197997: Merge "SDK Windows: Package customized proguard.bat scripts." 2010-10-26 15:42:14 -07:00
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
f4320c6b14 SDK Windows: Package customized proguard.bat scripts.
Requires Change: Ic1dc74cb3ff4dec9b419e2753290c361dffce48e
in platform/sdk.

Change-Id: Ieb2e308c0e9e655b2c047554563d753ac4cbb852
2010-10-25 14:41:16 -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