diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2009-12-15 15:04:00 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-15 15:04:00 -0800 |
| commit | 692bf86e67ef3bef98a64c1ad1c6f54b9f2020ae (patch) | |
| tree | 31c7dc2763581b69384912daec24c7e7c6a15f44 /Android.mk | |
| parent | 01dde47ea9dda6f869557931db5f64573b9ce73d (diff) | |
| parent | 479a49f74f77855825ba69b105c065422c24246a (diff) | |
| download | frameworks_base-692bf86e67ef3bef98a64c1ad1c6f54b9f2020ae.zip frameworks_base-692bf86e67ef3bef98a64c1ad1c6f54b9f2020ae.tar.gz frameworks_base-692bf86e67ef3bef98a64c1ad1c6f54b9f2020ae.tar.bz2 | |
am 479a49f7: am 7585586c: Merge change Ib1eb2e9e into eclair
Merge commit '479a49f74f77855825ba69b105c065422c24246a'
* commit '479a49f74f77855825ba69b105c065422c24246a':
sdk doc change for esr: Add "resources" tab content. Fix links pointing to the old locations. Change Android.mk to output samples files to resources/samples. Misc other fixes.
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 38 |
1 files changed, 18 insertions, 20 deletions
@@ -361,33 +361,31 @@ sample_dir := development/samples web_docs_sample_code_flags := \ -hdf android.hasSamples 1 \ -samplecode $(sample_dir)/ApiDemos \ - guide/samples/ApiDemos "API Demos" \ - -samplecode $(sample_dir)/BluetoothChat \ - guide/samples/BluetoothChat "Bluetooth Chat" \ - -samplecode $(sample_dir)/ContactManager \ - guide/samples/ContactManager "Contact Manager" \ + resources/samples/ApiDemos "API Demos" \ + -samplecode $(sample_dir)/BluetoothChat \ + resources/samples/BluetoothChat "Bluetooth Chat" \ + -samplecode $(sample_dir)/ContactManager \ + resources/samples/ContactManager "Contact Manager" \ -samplecode $(sample_dir)/Home \ - guide/samples/Home "Home" \ + resources/samples/Home "Home" \ -samplecode $(sample_dir)/JetBoy \ - guide/samples/JetBoy "JetBoy" \ + resources/samples/JetBoy "JetBoy" \ -samplecode $(sample_dir)/LunarLander \ - guide/samples/LunarLander "Lunar Lander" \ - -samplecode $(sample_dir)/MultiResolution \ - guide/samples/MultiResolution "Multiple Resolutions" \ + resources/samples/LunarLander "Lunar Lander" \ + -samplecode $(sample_dir)/MultiResolution \ + resources/samples/MultiResolution "Multiple Resolutions" \ -samplecode $(sample_dir)/NotePad \ - guide/samples/NotePad "Note Pad" \ + resources/samples/NotePad "Note Pad" \ -samplecode $(sample_dir)/SearchableDictionary \ - guide/samples/SearchableDictionary "Searchable Dictionary" \ + resources/samples/SearchableDictionary "Searchable Dictionary" \ -samplecode $(sample_dir)/Snake \ - guide/samples/Snake "Snake" \ + resources/samples/Snake "Snake" \ -samplecode $(sample_dir)/SoftKeyboard \ - guide/samples/SoftKeyboard "Soft Keyboard" \ - -samplecode $(sample_dir)/Wiktionary \ - guide/samples/Wiktionary "Wiktionary" \ - -samplecode $(sample_dir)/WiktionarySimple \ - guide/samples/WiktionarySimple "Wiktionary (Simplified)" - - + resources/samples/SoftKeyboard "Soft Keyboard" \ + -samplecode $(sample_dir)/Wiktionary \ + resources/samples/Wiktionary "Wiktionary" \ + -samplecode $(sample_dir)/WiktionarySimple \ + resources/samples/WiktionarySimple "Wiktionary (Simplified)" ## SDK version identifiers used in the published docs # major[.minor] version for current SDK. (full releases only) |