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

am b2a905f0: am d51578ee: Merge "Enable samples browsing in builds." into klp-dev

Browse Source 
* commit 'b2a905f031ef98c52f1a1b75d921323aa4c8293e':
  Enable samples browsing in builds.
This commit is contained in:
Dirk Dougherty
2013-10-31 02:12:38 -07:00
committed by Android Git Automerger
parent 9da992eb59 b2a905f031
commit 65fe1908fc
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Android.mk
View File

@@ -560,7 +560,7 @@ sample_groups := -samplegroup Background \
web_docs_sample_code_flags := \ web_docs_sample_code_flags := \
-hdf android.hasSamples 1 \ -hdf android.hasSamples 1 \
-samplecode $(sample_dir)/BasicAccessibility \ -samplecode $(sample_dir)/BasicAccessibility \
samples/BasicAccessibility "dd" \ samples/BasicAccessibility "" \
-samplecode $(sample_dir)/HorizontalPaging \ -samplecode $(sample_dir)/HorizontalPaging \
samples/HorizontalPaging "" \ samples/HorizontalPaging "" \
-samplecode $(sample_dir)/ShareActionProvider \ -samplecode $(sample_dir)/ShareActionProvider \
@@ -619,6 +619,8 @@ web_docs_sample_code_flags := \
samples/BasicSyncAdapter "" \ samples/BasicSyncAdapter "" \
-samplecode $(sample_dir)/StorageClient \ -samplecode $(sample_dir)/StorageClient \
samples/StorageClient "" samples/StorageClient ""
# -samplecode $(sample_dir)/StorageProvider \
# samples/StorageProvider ""
# -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 \
@@ -837,9 +839,9 @@ LOCAL_MODULE := online-sdk
LOCAL_DROIDDOC_OPTIONS:= \ LOCAL_DROIDDOC_OPTIONS:= \
$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \ $(framework_docs_LOCAL_DROIDDOC_OPTIONS) \
-toroot / \ -toroot / \
-hdf android.whichdoc online -hdf android.whichdoc online \
# $(sample_groups) \ $(sample_groups) \
# $(web_docs_sample_code_flags) $(web_docs_sample_code_flags)
LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk