Commit Graph

304 Commits

Author SHA1 Message Date
David 'Digit' Turner
f249fb4fe0 am eff8b9de: am 39386d45: Merge "sdk: Copy ABI-specific kernel image to platform image directory."
* commit 'eff8b9de35890bf50093d38ef5e9e81557ad4a9c':
  sdk: Copy ABI-specific kernel image to platform image directory.
2011-06-29 02:51:26 -07:00
David 'Digit' Turner
f7f6842b32 sdk: Copy ABI-specific kernel image to platform image directory.
This patch depends on https://review.source.android.com/24052

It is used to ensure that the proper kernel image is copied to the
platform image's kernel-qemu.

This is needed because for ARMv7 platform builds, the image is
in prebuilt/android-arm/kernel/kernel-qemu-armv7, instead of
   prebuilt/android-arm/kernel/kernel-qemu

Change-Id: I0f175a1ba3d97f5c7420597bdeebc7a353551194
2011-06-29 11:32:17 +02:00
David 'Digit' Turner
07bd494986 am bf115d33: am 29bcef8f: am 688620eb: Merge "sdk: Ensure we copy build.prop to platform image directory."
* commit 'bf115d33f26949b636d8cac79d253448fbca2388':
  sdk: Ensure we copy build.prop to platform image directory.
2011-06-23 06:25:42 -07:00
Raphael
eae54028c2 am 0221f2d8: am 320d10ef: Package the 2 llvm-rs-cc versions in the Windows SDK.
* commit '0221f2d8a084798d279ae8de9bb3a59d934b030f':
  Package the 2 llvm-rs-cc versions in the Windows SDK.
2011-06-22 19:08:47 -07:00
Xavier Ducrohet
08419fc7ba am 608bb77f: am 79aa3cea: Prepare new plat-tools SDK component with 2 llvm versions.
* commit '608bb77f3f13727dbca986bca764644e510283c7':
  Prepare new plat-tools SDK component with 2 llvm versions.
2011-06-22 19:08:38 -07:00
Raphael
320d10ef62 Package the 2 llvm-rs-cc versions in the Windows SDK.
Change-Id: I7ae8f95b1e173ecc1c5efd6200dfce63b79d9b6c
2011-06-22 15:27:49 -07:00
Xavier Ducrohet
79aa3cea3a Prepare new plat-tools SDK component with 2 llvm versions.
The output of the platform tree build is llvm-rs-cc-2 and should
be used for apps targeting 12+. This is encoded in llvm-rs-cc.txt

The older (HC) version of llvm-rs-cc is copied from the prebuilt
and is used for apps targeting 11+.

Until new tools that can read/process llvm-rs-cc.txt are released,
old tools will use the HC version of llvm-rs-cc which ensure
proper compatibility.

Change-Id: Iddb924409cc9238531bf1a0448b14b7eac3396a5
2011-06-22 15:27:44 -07:00
David 'Digit' Turner
a21ef2b154 sdk: Ensure we copy build.prop to platform image directory.
This patch ensures that we copy the generated build.prop file to
the platform image directory. This file will later be used by the
emulator and other tools to determine various properties of the
image without having to parse the system.img file.

For example, this can be used to extract the target CPU architecture
and/or ABI, and automatically adjust emulation based on this.

Change-Id: Ia5b67c6fb93078b6b224b10e3322af88b99c50b9
2011-06-17 18:01:22 +02:00
Bruno Oliveira
68a87a4ac6 am d0e6d6f7: am 6f24f89c: Merge "Adds the Random Music Player sample." into honeycomb-mr2
* commit 'd0e6d6f71fe5aab3c9faeecfc480ea7d69c5a080':
  Adds the Random Music Player sample.
2011-06-13 14:31:02 -07:00
Bruno Oliveira
6f24f89ccb Merge "Adds the Random Music Player sample." into honeycomb-mr2 2011-06-13 14:25:26 -07:00
Ying Wang
534f6c2de5 am 514c8cb5: am e4ccbd68: Use a function to package android support libraries.
* commit '514c8cb5f622eaa389a7b50a69582ebf9e6c5d21':
  Use a function to package android support libraries.
2011-06-07 14:02:13 -07:00
Ying Wang
e4ccbd68ec Use a function to package android support libraries.
Change-Id: I52240b31fba7728b74d57fd806a93988e3ac8fe9
2011-06-07 11:25:07 -07:00
Xavier Ducrohet
733342c712 am 76fb8500: am 80f84422: Add v13 to the compatibility package.
* commit '76fb8500d32e0d9a64b2d00522237d6d8f7a71e9':
  Add v13 to the compatibility package.
2011-06-07 10:58:00 -07:00
Bruno Oliveira
b30a3010f5 Adds the Random Music Player sample.
This sample illustrates how to write an application that plays media
in the background, handles streaming media from the network and
reacts appropriately to system events like headphone disconnection and
audio focus changes, and also uses the notification system to
keep the user informed about what is happening.

This CL is a cherrypick of the old CL 104495 (originally in
honeycomb-mr1) into honeycomb-mr2. Original CL:
https://android-git.corp.google.com/g/#change,104495

Change-Id: Ib8b15ee920300adc093a8b52c17bd9c251ac74ca
2011-06-07 01:09:21 -04:00
Xavier Ducrohet
80f8442291 Add v13 to the compatibility package.
Also remove ApiDemos from the package and instead
add each library-specific sample app to each v##
folder.

Change-Id: I2932bbb91c7122c122973902d1fcd159ca899381
2011-06-06 19:21:45 -07:00
Mike Lockwood
04b53db9b4 am cd392822: Add USB MissleLauncher sample program
* commit 'cd39282253ec8a27eae1d580fbaa91a8f3c7c5ff':
  Add USB MissleLauncher sample program
2011-05-03 15:22:17 -07:00
Mike Lockwood
cd39282253 Add USB MissleLauncher sample program
This is sample code that controls a USB missle launcher using USB host APIs

Change-Id: Ic4201faccc4562bf114c70d50b0cab6a00d28a98
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-03 17:56:51 -04:00
Raphael
b2d8f0ee4e am 31d15b9f: Merge 48023786cf: \'Generate SDK Repository XML.\' Do not merge.
* commit '31d15b9f7616ac5605a895ad8fbc3117f0ff4475':
  Merge 48023786cf: 'Generate SDK Repository XML.' Do not merge.
2011-03-31 16:34:25 -07:00
Raphael
d739e3ab11 am 922ee89a: Merge 2ff496b8a1: \'Build SDK repository.\' Do not merge.
* commit '922ee89a69da7c3007b48977835e9736766b4ba2':
  Merge 2ff496b8a1: 'Build SDK repository.' Do not merge.
2011-03-31 16:34:18 -07:00
Raphael
e2d5577e86 am 4cc9a1e9: Merge 48023786cf: \'Generate SDK Repository XML.\' Do not merge.
* commit '4cc9a1e942f068c86b0715e398ec40f86a9deb87':
  Merge 48023786cf: 'Generate SDK Repository XML.' Do not merge.
2011-03-28 12:56:11 -07:00
Raphael
06f2189a4e am 627afeae: resolved conflicts for merge of 002acfc3 to stage-korg-master
* commit '627afeae86cf877b53316d976f53c3735414f3ca':
  Fix XMLNS detection in SDK Repo XSD files.
2011-03-25 17:51:57 -07:00
Raphael
31d15b9f76 Merge 48023786cf: 'Generate SDK Repository XML.' Do not merge.
When the "sdk_repo" modified is used during the SDK build,
this also generates the repository.xml and addon.xml files
for the new SDK repository packages and places them in
the DIST_DIR.

Example usage:
  make -j 16 PRODUCT-sdk-sdk showcommands sdk_repo dist DIST_DIR=/dist/sdk
  make -j 16 PRODUCT-google_sdk-sdk_addon showcommands sdk_repo dist DIST_DIR=/dist/addon

Also merges 3ea87ca65f
  'Fix XMLNS detection in SDK Repo XSD files.'
  to prevent a merge conflict later on.

Change-Id: Ib14fe820dab7a60bb5412968c146c30ec5ba81c7
2011-03-25 17:50:38 -07:00
Raphael
4cc9a1e942 Merge 48023786cf: 'Generate SDK Repository XML.' Do not merge.
When the "sdk_repo" modified is used during the SDK build,
this also generates the repository.xml and addon.xml files
for the new SDK repository packages and places them in
the DIST_DIR.

Example usage:
  make -j 16 PRODUCT-sdk-sdk showcommands sdk_repo dist DIST_DIR=/dist/sdk
  make -j 16 PRODUCT-google_sdk-sdk_addon showcommands sdk_repo dist DIST_DIR=/dist/addon

Also merges 3ea87ca65f
  'Fix XMLNS detection in SDK Repo XSD files.'
  to prevent a merge conflict later on.

Change-Id: Ic9832e71456d76f849406e641792f4285ffbf649
2011-03-25 17:45:21 -07:00
Raphael
627afeae86 resolved conflicts for merge of 002acfc3 to stage-korg-master
Change-Id: I58e9828bd4d3ebcc4099c9f9ab97390023a1b8e8
2011-03-25 17:38:23 -07:00
David Turner
411f741d90 am 4621d1a8: am 18ddf41d: Merge "Add x86 qemu"
* commit '4621d1a82ce5bb3196c82cb164e7b56521f3a7d2':
  Add x86 qemu
2011-03-25 15:51:22 -07:00
Raphael
3ea87ca65f Fix XMLNS detection in SDK Repo XSD files.
Change-Id: I7e804c1d7de2db9428d53242c146e15f4c2fcc15
2011-03-25 14:25:03 -07:00
Raphael
922ee89a69 Merge 2ff496b8a1: 'Build SDK repository.' Do not merge.
When the build is invoked with the fake target "sdk_repo" and
a main target of sdk, win_sdk or sdk_addon, we now create
packages in DIST_DIR that can directly be used to populate the
SDK Repository.
This is quite close to how we actually distribute the SDK.

Change-Id: I671e8ff1bc2a6e9f5c097241d65da1cfdde21154
2011-03-24 13:07:30 -07:00
Raphael
56c341295a Merge 48023786cf: 'Generate SDK Repository XML.' Do not merge.
When the "sdk_repo" modified is used during the SDK build,
this also generates the repository.xml and addon.xml files
for the new SDK repository packages and places them in
the DIST_DIR.

Example usage:
  make -j 16 PRODUCT-sdk-sdk showcommands sdk_repo dist DIST_DIR=/dist/sdk
  make -j 16 PRODUCT-google_sdk-sdk_addon showcommands sdk_repo dist DIST_DIR=/dist/addon

Change-Id: I4f60d3197cac8c22027534cb7686de087ddf1a90
2011-03-24 11:20:16 -07:00
Raphael
9eec951059 Merge 2ff496b8a1: 'Build SDK repository.' Do not merge.
When the build is invoked with the fake target "sdk_repo" and
a main target of sdk, win_sdk or sdk_addon, we now create
packages in DIST_DIR that can directly be used to populate the
SDK Repository.
This is quite close to how we actually distribute the SDK.

Change-Id: I1c4a120616697383792d7fb1b328cfcefac0b2f5
2011-03-24 11:09:43 -07:00
David Turner
4621d1a82c am 18ddf41d: Merge "Add x86 qemu"
* commit '18ddf41d5d11729c58fbbfbe0f22e7c5888a1751':
  Add x86 qemu
2011-03-22 06:10:31 -07:00
Bruce Beare
60f5414658 Add x86 qemu
Change-Id: Ic0bfcacd5834f9c2345d7fc0c45528da321f0f7f
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Author: Jun Nakajima <jun.nakajima@intel.com>
2011-03-22 14:02:45 +01:00
Xavier Ducrohet
d73e1584d5 Add android-support-v4.jar to the apidemo samples in the SDK package.
Change-Id: I07a9723152ffc4f08bbfd254e886986ec0429509
2011-03-17 12:10:10 -07:00
Xavier Ducrohet
07815cd01d Remove the pre-made notice file from platform-tools.
A change in build.git now puts the one that's automatically
generated.

Change-Id: Idced9ea6176152400189203b84809c9a5a3fd92e
2011-03-15 13:29:38 -07:00
Ying Wang
b0948c5a6e am b058af05: Disable ccache when using mingw.
* commit 'b058af052efa1dccf38eef8993008920088ff188':
  Disable ccache when using mingw.
2011-03-11 14:11:11 -08:00
Ying Wang
b058af052e Disable ccache when using mingw.
Change-Id: I40ec9f6dfbf54b362b8a87cde7774b396b46b063
2011-03-11 13:59:34 -08:00
Ying Wang
ff3d4bc42b resolved conflicts for merge of 1a6a849b to gingerbread-plus-aosp
Change-Id: I05bf91403b3160ff6db7b9a60b3c1c5f1ded0c5b
2011-03-11 12:59:56 -08:00
Ying Wang
1a6a849bcb Disable ccache when use mingw.
Change-Id: Ieff363f9c4433bba53d1e94a25477c60933666e2
2011-03-10 18:25:51 -08:00
Ying Wang
d46eaa6f76 Add android-support-v4.jar to sdk.
Change-Id: I28d2a323d31df6b405548e0c73c616eb7b69753d
2011-03-01 17:14:05 -08:00
Xavier Ducrohet
7aa1c11e67 Fix SDK build.
Change-Id: I214048d331c0c9d3885983e588e9313dd3722346
2011-03-01 14:20:35 -08:00
Xavier Ducrohet
e488b3ef67 Put back jar file into compatibility package.
Change-Id: I437d3ba7b6fae13815e34a741adadac8e6ecd8f1
2011-03-01 12:07:04 -08:00
Xavier Ducrohet
51920ee661 Fix build by using $(DIST_DIR)
Change-Id: I68832ee411fcafa171354c8b06b0992c8f01cd4d
2011-03-01 11:10:02 -08:00
Xavier Ducrohet
62df672f5d Package compatibility component.
Change-Id: I4324df1814ae9450b254b22c7bd1b28e4826a29b
2011-02-28 15:57:39 -08:00
Alex Sakhartchouk
005148359f Merge "Moving renderscript sdk samples to their correct location." 2011-02-28 09:02:51 -08:00
Alex Sakhartchouk
e430471134 Moving renderscript sdk samples to their correct location.
Change-Id: I27de909cf0dbd91319c0eefebd0184ecc5c12dc9
2011-02-22 11:41:40 -08:00
Raphael
2ff496b8a1 Build SDK repository.
When the build is invoked with the fake target "sdk_repo" and
a main target of sdk, win_sdk or sdk_addon, we now create
packages in DIST_DIR that can directly be used to populate the
SDK Repository.
This is quite close to how we actually distribute the SDK.

Change-Id: I01c729eff4dbc1eccbc7c5b1869f329363f1ce07
2011-02-16 20:25:43 -08:00
Raphael
f9b583bf03 Win SDK: remove test of llvm-rs-cc presence.
This removes the test that makes the SDK only strip llvm-rs-cc.exe if present.
It means the SDK will FAIL if llvm-rs-cc wasn't build successfully for Windows.

Change-Id: I4c73954c30265e71e84916976f16ae76d67a8e13
2011-02-14 13:01:17 -08:00
Winson Chung
e412a0f4a9 Adding sample for collection widgets backed by content providers.
Change-Id: If0005d88a19dfa05ddd7c60aba1a1d7d742158be
2011-02-11 14:50:06 -08:00
Alex Sakhartchouk
be64691c98 Adding renderscript samples.
Change-Id: I9aecae9aa554c5fdc6a4843e80509d54eac5bebe
2011-02-09 09:10:06 -08:00
Roman Nurik
f4f345d0b7 Major update to HoneycombGallery
* Add action bar and icon theming
* Add contextual action bar and photo sharing
* Add notifications (with large icons too)
* Add fullscreening (lights-out mode)
* Add a picture frame

Change-Id: I07a1da435d5adc7bc76c7ac2cc087ff2efd74156
2011-02-07 17:03:19 -08:00
Raphael
ad402d2b1f resolved conflicts for merge of d30ec22e to gingerbread-plus-aosp
Change-Id: I02a991cfb35d3cd14bd45eee1c3454e5a9c4600b
2011-02-03 11:30:41 -08:00