diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2013-10-31 09:09:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-31 09:09:03 +0000 |
| commit | d51578ee163db8b80180e5eeb184b7dd10ed16d3 (patch) | |
| tree | 7cc77d42d9bdcee4ff0288bc5b3d12650509ba8f | |
| parent | c779c01eccd22550e3440953530442772792e6c1 (diff) | |
| parent | e8b32feb72bf4347c1bd98e6b21b18a506d2c5e3 (diff) | |
| download | frameworks_base-d51578ee163db8b80180e5eeb184b7dd10ed16d3.zip frameworks_base-d51578ee163db8b80180e5eeb184b7dd10ed16d3.tar.gz frameworks_base-d51578ee163db8b80180e5eeb184b7dd10ed16d3.tar.bz2 | |
Merge "Enable samples browsing in builds." into klp-dev
| -rw-r--r-- | Android.mk | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -560,7 +560,7 @@ sample_groups := -samplegroup Background \ web_docs_sample_code_flags := \ -hdf android.hasSamples 1 \ -samplecode $(sample_dir)/BasicAccessibility \ - samples/BasicAccessibility "dd" \ + samples/BasicAccessibility "" \ -samplecode $(sample_dir)/HorizontalPaging \ samples/HorizontalPaging "" \ -samplecode $(sample_dir)/ShareActionProvider \ @@ -619,6 +619,8 @@ web_docs_sample_code_flags := \ samples/BasicSyncAdapter "" \ -samplecode $(sample_dir)/StorageClient \ samples/StorageClient "" +# -samplecode $(sample_dir)/StorageProvider \ +# samples/StorageProvider "" # -samplecode $(sample_dir)/AndroidBeamDemo \ # samples/AndroidBeamDemo "Android Beam Demo" \ # -samplecode $(sample_dir)/ApiDemos \ @@ -837,9 +839,9 @@ LOCAL_MODULE := online-sdk LOCAL_DROIDDOC_OPTIONS:= \ $(framework_docs_LOCAL_DROIDDOC_OPTIONS) \ -toroot / \ - -hdf android.whichdoc online -# $(sample_groups) \ -# $(web_docs_sample_code_flags) + -hdf android.whichdoc online \ + $(sample_groups) \ + $(web_docs_sample_code_flags) LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk |