diff options
| author | 2013-09-04 22:29:02 -0700 | |
|---|---|---|
| committer | 2013-09-04 22:29:02 -0700 | |
| commit | 2069b00416c5da60a84ad75a9a9efe56a455e187 (patch) | |
| tree | caffd91a159175783fe5c26432c3437751ad7b01 | |
| parent | 533e118f5ad37005a77a2a6edc60afc56034d1e9 (diff) | |
| parent | 76fcf6c73e7dda99ec80e6da616bee26c2a088e6 (diff) | |
am 76fcf6c7: am 07c9bcc3: am 4ef51c3c: Merge "Add a few more samples to browser." into jb-mr2-docs
* commit '76fcf6c73e7dda99ec80e6da616bee26c2a088e6':
Add a few more samples to browser.
| -rw-r--r-- | Android.mk | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk index eaafa875b83a..30b17f5ac2c8 100644 --- a/Android.mk +++ b/Android.mk @@ -535,16 +535,23 @@ framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES := \ frameworks/base/docs/knowntags.txt sample_dir := development/samples +new_sample_dir := developers/samples/android # the list here should match the list of samples included in the sdk samples package # (see development/build/sdk.atree) # remove htmlified samples for now -- samples are still available through the SDK web_docs_sample_code_flags := \ -hdf android.hasSamples 1 \ + -samplecode $(new_sample_dir)/input/gestures/BasicGestureDetect/BasicGestureDetect \ + samples/BasicGestureDetect/ "Basic Gestures" \ -samplecode $(sample_dir)/AccelerometerPlay \ samples/AccelerometerPlay "Accelerometer Play" \ -samplecode $(sample_dir)/ActionBarCompat \ - samples/ActionBarCompat "Action Bar Compatibility" + samples/ActionBarCompat "Action Bar Compatibility" \ + -samplecode $(sample_dir)/BluetoothHDP \ + samples/BluetoothHDP "Bluetooth HDP Demo" \ + -samplecode $(sample_dir)/BluetoothLeGatt \ + samples/BluetoothLeGatt "Bluetooth HDP Demo" # -samplecode $(sample_dir)/AndroidBeamDemo \ # samples/AndroidBeamDemo "Android Beam Demo" \ # -samplecode $(sample_dir)/ApiDemos \ @@ -557,8 +564,6 @@ web_docs_sample_code_flags := \ # samples/BackupRestore "Backup and Restore" \ # -samplecode $(sample_dir)/BluetoothChat \ # samples/BluetoothChat "Bluetooth Chat" \ -# -samplecode $(sample_dir)/BluetoothHDP \ -# samples/BluetoothHDP "Bluetooth HDP Demo" \ # -samplecode $(sample_dir)/BusinessCard \ # samples/BusinessCard "Business Card" \ # -samplecode $(sample_dir)/ContactManager \ |