Commit Graph

541 Commits

Author SHA1 Message Date
Xavier Ducrohet
6bd1ae5e75 Fix skin.
Bug: 6447905

Change-Id: I50779c5c343ed9f0bf432336b861153e9b047f07
2012-05-07 18:14:36 -07:00
Raphael Moll
e83c267f4b am 5b9f9e28: am 424c95da: Merge "SDK: Update sdk product library dependency list"
* commit '5b9f9e2852dfecedde177fce0fa5206e8cba249f':
  SDK: Update sdk product library dependency list
2012-04-25 15:59:49 -07:00
Raphael Moll
5b9f9e2852 am 424c95da: Merge "SDK: Update sdk product library dependency list"
* commit '424c95da4b3a413c1dae1c270437001ea203cbf3':
  SDK: Update sdk product library dependency list
2012-04-25 15:57:51 -07:00
Raphael Moll
8e706a7f50 am e5a8435b: am a70fac3d: Merge "SDK: update product sdk.mk"
* commit 'e5a8435b42fff6080be9bebdf754cfd9f9dff150':
  SDK: update product sdk.mk
2012-04-25 13:52:46 -07:00
Raphael Moll
e5a8435b42 am a70fac3d: Merge "SDK: update product sdk.mk"
* commit 'a70fac3d09705d03cf7b2e98340b174424f54b5a':
  SDK: update product sdk.mk
2012-04-25 13:50:26 -07:00
Raphael Moll
feaa5e8fbe SDK: Update sdk product library dependency list
Change-Id: I4830e7eac1192360a0a9850f763f98063b2c266f
2012-04-24 17:01:20 -07:00
Xavier Ducrohet
8427f0fcc6 Merge "Fix GridLayout copy into the SDK." 2012-04-24 16:49:43 -07:00
Xavier Ducrohet
3c3cb4687e Fix GridLayout copy into the SDK.
Typo in a dest file name.

Change-Id: I862f19f87608d1643097ee91ce5eaf64e05800d0
2012-04-24 16:46:29 -07:00
Raphael Moll
fa6183c396 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
2012-04-24 16:30:39 -07:00
Raphael Moll
cf41a76a32 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.
2012-04-24 15:54:41 -07:00
Raphael Moll
184eca2208 am 56b07781: am a5965405: am 186f007a: Merge "Split build/targets/product/sdk.mk"
* commit '56b077812c0f38d3bace893639a882c7807b040b':
  Split build/targets/product/sdk.mk
2012-04-24 15:18:50 -07:00
Raphael Moll
497c91834b am 6a04b5bb: Merge "Support for Windows SDK pre-requisite module list."
* commit '6a04b5bb4e1655c274cc0f2b3d5e4954c1911792':
  Support for Windows SDK pre-requisite module list.
2012-04-23 15:45:33 -07:00
Raphael Moll
3fb225fbfd Support for Windows SDK pre-requisite module list.
Requires sdk.git change I08fc98f2e1

Change-Id: I7388d7292d175ceac221ce6790655b37f85e8a32
2012-04-23 13:16:16 -07:00
Robert Ly
9642d03bda am 3fd0c48b: am 018c9eeb: Merge "adding media effects sample to sdk" into ics-mr1
* commit '3fd0c48b8e0f1297dee8ffa6103fd19ebe03da82':
  adding media effects sample to sdk
2012-04-23 10:44:42 -07:00
Robert Ly
f619995006 am 018c9eeb: Merge "adding media effects sample to sdk" into ics-mr1
* commit '018c9eeb8e05e4dd6965655d9f120b595efcd758':
  adding media effects sample to sdk
2012-04-23 10:41:26 -07:00
Robert Ly
018c9eeb8e Merge "adding media effects sample to sdk" into ics-mr1 2012-04-23 10:38:30 -07:00
Raphael Moll
a596540506 am 186f007a: Merge "Split build/targets/product/sdk.mk"
* commit '186f007a741bebdc5ad364df9eda1a9b383e2e15':
  Split build/targets/product/sdk.mk
2012-04-23 10:11:32 -07:00
Xavier Ducrohet
ad3600bb6e Merge "Add .classpath/.project/readme to gridlayout support package." 2012-04-20 17:02:54 -07:00
Xavier Ducrohet
8957faa8d0 Add .classpath/.project/readme to gridlayout support package.
Change-Id: I1f8a08a8f21572fe011964c230a6d45d5ac4b530
2012-04-20 17:02:10 -07:00
Raphael Moll
01d30e1a87 Split build/targets/product/sdk.mk
Change-Id: I6bbc6644a1dbf19ac768c2ea65d0e383b5dd23ef
2012-04-20 14:19:51 -07:00
Alex Sakhartchouk
4c5f2d2735 Renderscript is deprecated. Removing from the sdk.
Change-Id: I4963ec4e9287003772d5818789d2de72b72f59c3
2012-04-19 11:42:38 -07:00
Jean-Baptiste Queru
d294027b1f Merge 2fa7b9ff
Change-Id: I59b2fd09648909c721af5ebb951bc2287fe9fc1a
2012-04-18 15:04:52 -07:00
Jesse Hall
80d4ba7716 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
2012-04-18 06:26:17 -07:00
Jesse Hall
b62e28ddde 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
2012-04-16 15:53:33 -07:00
Robert Ly
affcdfd7d8 adding media effects sample to sdk
Change-Id: I8fc55e1ac5409c0262bfda930e6db3d34ce6ae08
2012-04-16 10:48:24 -07:00
Adam Powell
e331666e3e 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
2012-04-05 18:03:24 -07:00
Xavier Ducrohet
34f38a5cdd am 4db20997: am e3e74aa5: am 2a57c793: Merge "Move stuff from prebuilt to prebuilts/tools"
* commit '4db20997681bbb2c7a16e1c7d50b1a1901496144':
  Move stuff from prebuilt to prebuilts/tools
2012-04-04 14:06:28 -07:00
Xavier Ducrohet
e3e74aa50e am 2a57c793: Merge "Move stuff from prebuilt to prebuilts/tools"
* commit '2a57c79366dcdac42e330a8af752e44410556f31':
  Move stuff from prebuilt to prebuilts/tools
2012-04-04 14:01:30 -07:00
Xavier Ducrohet
40525ef472 Move stuff from prebuilt to prebuilts/tools
Also move some atree copy to sdk.git where they belong.

Change-Id: Iab62343806917f24f47d15b9dea75e44422d8764
2012-04-03 16:33:35 -07:00
Raphael Moll
2edb02ab24 SDK: generate repo in xsd v6. DO NOT MERGE.
Requires change Ib6f5b03c and change I6ba33a96.

Change-Id: Ib42676359289e731d045c4a1e26c85fe5868d633
2012-04-02 15:21:41 -07:00
Tony Chan
8346f695d1 am d426fcd9: am a29f43f6: am 1a2ddb42: sdk doc change: Added KeyChain API Demo
* commit 'd426fcd9c2df2643b61c0627a41afbe453c9faf4':
  sdk doc change: Added KeyChain API Demo
2012-03-31 02:23:12 -07:00
Tony Chan
a29f43f6e1 am 1a2ddb42: sdk doc change: Added KeyChain API Demo
* commit '1a2ddb4216d81f9feadfea3a94bc9923255fe49a':
  sdk doc change: Added KeyChain API Demo
2012-03-31 02:17:44 -07:00
Tony Chan
1a2ddb4216 sdk doc change: Added KeyChain API Demo
Change-Id: Ib2b751a9de485359705b243d2c70e5f8f2c8ab3c
2012-03-30 11:10:01 +08:00
Andrew Hsieh
8d83be988a 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
2012-03-29 18:42:35 +08:00
Raphael Moll
75d9cabc8e resolved conflicts for merge of fe2da416 to stage-aosp-master
Change-Id: I70924f6d51e2c790314a2f34ae7c33935a72bda6
2012-03-28 11:05:45 -07:00
Raphael Moll
f413515f16 Merge SDK support for source.properties templates.
Requires build.git change Ib36928097

Change-Id: Ida0c471fe166a1388584f2cf2250e07040ed0e55
2012-03-27 11:59:06 -07:00
Raphael Moll
a85a93fdb0 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
2012-03-27 10:49:58 -07:00
Raphael Moll
fc188dcc3e 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.
2012-03-24 10:27:24 -07:00
Raphael Moll
e7a1083bca am 9c7b559f: SDK source pkg: exclude all /tools/ and /tests/ directories.
* commit '9c7b559fb730c57a522abb2956c0036edcd15e63':
  SDK source pkg: exclude all /tools/ and /tests/ directories.
2012-03-23 10:37:59 -07:00
Raphael Moll
9c7b559fb7 SDK source pkg: exclude all /tools/ and /tests/ directories.
Change-Id: Ia85105385280e21f073cef22e1130ad369bea121
2012-03-23 10:27:04 -07:00
Jean-Baptiste Queru
bbbc7e26be am 6c368d28: Merge "Fix build - configure for schema-v4 output"
* commit '6c368d28f57a45e8310fa0a8cdea240a42c2555e':
  Fix build - configure for schema-v4 output
2012-03-22 17:51:44 -07:00
Jean-Baptiste Queru
e35ac78cd4 Fix build - configure for schema-v4 output
Change-Id: I26b334e54b38cba49e84212fbe40250fb16dc738
2012-03-22 15:51:17 -07:00
Jean-Baptiste Queru
79977b408b am 8d2f79ba: Merge "SDK: generate repo using latest schemas when available."
* commit '8d2f79ba939e0394cf18489503a6f2a3ebcce8f6':
  SDK: generate repo using latest schemas when available.
2012-03-22 13:27:44 -07:00
Raphael Moll
8f7e1f7a95 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
2012-03-21 19:08:11 -07:00
Raphael Moll
a4c2cb77b5 am af574136: Support lib: use /samples directory. do not merge.
* commit 'af57413607d91e6fbd1f19ddc2292f7943e7db27':
  Support lib: use /samples directory. do not merge.
2012-03-12 12:30:20 -07:00
Raphael Moll
af57413607 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 913d903aa2)

Change-Id: I4bb01d35ede7c7af45e80204c131361ffc4300ee
2012-03-12 12:27:02 -07:00
Raphael Moll
913d903aa2 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
2012-03-12 11:33:18 -07:00
Ying Wang
06f3f54fc0 Add framework/native to fix build.
No framework/native is split out from framework/base.

Change-Id: I3b596a98feee01f433fa0e88d81d780315a3ebb8
2012-03-09 10:04:22 -08:00
Xavier Ducrohet
198705d1ab 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
2012-03-07 20:07:38 -08:00
Xavier Ducrohet
92b3b05096 Add a prebuilt of the gridlayout support library. do not merge
Change-Id: Icd43238672a02f84e37d4301bec34dbe48375200
2012-03-07 17:47:12 -08:00