Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b01252a authored by Dirk Dougherty's avatar Dirk Dougherty Committed by Android Git Automerger
Browse files

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

* commit '65fe1908':
  Enable samples browsing in builds.
parents e2e2a433 65fe1908

Android.mk

+6 −4
Original line number Diff line number Diff line
@@ -564,7 +564,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 \
@@ -623,6 +623,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 \
@@ -841,9 +843,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