diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2010-02-09 18:48:59 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-02-09 18:48:59 -0800 |
| commit | f3449ee8536fb579da0022247ae78cd82d6fbbdc (patch) | |
| tree | 593156d87198214d9b75a630a0c2f5ba2dac3d33 /Android.mk | |
| parent | a63730d1f103f78589faef461d2af7351fc49f42 (diff) | |
| parent | e524ff534e1aabc45819e978c26bf61d9b71f444 (diff) | |
| download | frameworks_base-f3449ee8536fb579da0022247ae78cd82d6fbbdc.zip frameworks_base-f3449ee8536fb579da0022247ae78cd82d6fbbdc.tar.gz frameworks_base-f3449ee8536fb579da0022247ae78cd82d6fbbdc.tar.bz2 | |
am e524ff53: am 859f4556: Merge "Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper." into eclair
Merge commit 'e524ff534e1aabc45819e978c26bf61d9b71f444'
* commit 'e524ff534e1aabc45819e978c26bf61d9b71f444':
Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper.
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -370,6 +370,8 @@ framework_docs_LOCAL_ADDITIONAL_JAVA_DIR:=$(call intermediates-dir-for,JAVA_LIBR sample_dir := development/samples +# the list here should match the list of samples included in the sdk samples package +# (see development/build/sdk.atree) web_docs_sample_code_flags := \ -hdf android.hasSamples 1 \ -samplecode $(sample_dir)/ApiDemos \ @@ -380,6 +382,8 @@ web_docs_sample_code_flags := \ resources/samples/BusinessCard "Business Card" \ -samplecode $(sample_dir)/ContactManager \ resources/samples/ContactManager "Contact Manager" \ + -samplecode $(sample_dir)/CubeLiveWallpaper \ + resources/samples/CubeLiveWallpaper "Live Wallpaper" \ -samplecode $(sample_dir)/Home \ resources/samples/Home "Home" \ -samplecode $(sample_dir)/JetBoy \ @@ -390,6 +394,8 @@ web_docs_sample_code_flags := \ resources/samples/MultiResolution "Multiple Resolutions" \ -samplecode $(sample_dir)/NotePad \ resources/samples/NotePad "Note Pad" \ + -samplecode $(sample_dir)/SampleSyncAdapter \ + resources/samples/SampleSyncAdapter "Sample Sync Adapter" \ -samplecode $(sample_dir)/SearchableDictionary \ resources/samples/SearchableDictionary "Searchable Dictionary" \ -samplecode $(sample_dir)/Snake \ |