Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add a few more samples to browser." into jb-mr2-docs

Browse Source
This commit is contained in:
Dirk Dougherty
2013-09-05 05:19:41 +00:00
committed by Android (Google) Code Review
parent 002057bf04 2826df3f3d
commit 4ef51c3c42
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Android.mk
View File

@@ -465,16 +465,23 @@ framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES := \
frameworks/base/docs/knowntags.txt frameworks/base/docs/knowntags.txt
sample_dir := development/samples 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 # the list here should match the list of samples included in the sdk samples package
# (see development/build/sdk.atree) # (see development/build/sdk.atree)
# remove htmlified samples for now -- samples are still available through the SDK # remove htmlified samples for now -- samples are still available through the SDK
web_docs_sample_code_flags := \ web_docs_sample_code_flags := \
-hdf android.hasSamples 1 \ -hdf android.hasSamples 1 \
-samplecode $(new_sample_dir)/input/gestures/BasicGestureDetect/BasicGestureDetect \
samples/BasicGestureDetect/ "Basic Gestures" \
-samplecode $(sample_dir)/AccelerometerPlay \ -samplecode $(sample_dir)/AccelerometerPlay \
samples/AccelerometerPlay "Accelerometer Play" \ samples/AccelerometerPlay "Accelerometer Play" \
-samplecode $(sample_dir)/ActionBarCompat \ -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 \ # -samplecode $(sample_dir)/AndroidBeamDemo \
# samples/AndroidBeamDemo "Android Beam Demo" \ # samples/AndroidBeamDemo "Android Beam Demo" \
# -samplecode $(sample_dir)/ApiDemos \ # -samplecode $(sample_dir)/ApiDemos \
@@ -487,8 +494,6 @@ web_docs_sample_code_flags := \
# samples/BackupRestore "Backup and Restore" \ # samples/BackupRestore "Backup and Restore" \
# -samplecode $(sample_dir)/BluetoothChat \ # -samplecode $(sample_dir)/BluetoothChat \
# samples/BluetoothChat "Bluetooth Chat" \ # samples/BluetoothChat "Bluetooth Chat" \
# -samplecode $(sample_dir)/BluetoothHDP \
# samples/BluetoothHDP "Bluetooth HDP Demo" \
# -samplecode $(sample_dir)/BusinessCard \ # -samplecode $(sample_dir)/BusinessCard \
# samples/BusinessCard "Business Card" \ # samples/BusinessCard "Business Card" \
# -samplecode $(sample_dir)/ContactManager \ # -samplecode $(sample_dir)/ContactManager \