SDK repo: use a template for samples/source.properties.
Use a template for samples/source.properties so that it automatically
picks up the current platform API level.
Also merges 52feec594a769653625f6089cfcd5398332922ea
("Update rev numbers of SDK packages.")
Change-Id: I89574842d2b0290cc6cf454f82a3721644cae0f0
diff --git a/build/Android.mk b/build/Android.mk
index 1cb0653..730f6a4 100644
--- a/build/Android.mk
+++ b/build/Android.mk
@@ -4,7 +4,11 @@
ALL_SDK_FILES += $(patsubst \
$(TOPDIR)development/sdk/%_source.prop_template, \
$(HOST_OUT)/development/sdk/%_source.properties, \
- $(wildcard $(TOPDIR)development/sdk/*_source.prop_template))
+ $(wildcard $(TOPDIR)development/sdk/*_source.prop_template)) \
+ $(patsubst \
+ $(TOPDIR)development/samples/%_source.prop_template, \
+ $(HOST_OUT)/development/samples/%_source.properties, \
+ $(wildcard $(TOPDIR)development/samples/*_source.prop_template))
# Rule to convert a source.prop template into the desired source.property
# Rewritten variables:
@@ -19,6 +23,14 @@
-e 's/$${PLATFORM_VERSION_CODENAME}/$(subst REL,,$(PLATFORM_VERSION_CODENAME))/' \
$< > $@
+$(HOST_OUT)/development/samples/%_source.properties : $(TOPDIR)development/samples/%_source.prop_template
+ @echo Generate $@
+ $(hide) mkdir -p $(dir $@)
+ $(hide) sed -e 's/$${PLATFORM_VERSION}/$(PLATFORM_VERSION)/' \
+ -e 's/$${PLATFORM_SDK_VERSION}/$(PLATFORM_SDK_VERSION)/' \
+ -e 's/$${PLATFORM_VERSION_CODENAME}/$(subst REL,,$(PLATFORM_VERSION_CODENAME))/' \
+ $< > $@
+
# ===== Android Support/Compatibility Library =====
diff --git a/build/sdk.atree b/build/sdk.atree
index e632b64..6d53f57 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -151,8 +151,8 @@
#
# the list here should match the list of samples that we generate docs for,
# (see web_docs_sample_code_flags in frameworks/base/Android.mk)
-development/apps/GestureBuilder samples/${PLATFORM_NAME}/GestureBuilder
-development/samples/source.properties samples/${PLATFORM_NAME}/source.properties
+development/apps/GestureBuilder samples/${PLATFORM_NAME}/GestureBuilder
+development/samples/samples_source.properties samples/${PLATFORM_NAME}/source.properties
#
# PLEASE KEEP THE SAMPLES IN ALPHABETICAL ORDER.
#
diff --git a/samples/samples_source.prop_template b/samples/samples_source.prop_template
new file mode 100644
index 0000000..d3cdfd5
--- /dev/null
+++ b/samples/samples_source.prop_template
@@ -0,0 +1,4 @@
+Pkg.UserSrc=false
+Pkg.Revision=1
+AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
+AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
diff --git a/samples/source.properties b/samples/source.properties
deleted file mode 100644
index d0b390b..0000000
--- a/samples/source.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-Pkg.UserSrc=false
-Pkg.Revision=1
-AndroidVersion.ApiLevel=15
-#AndroidVersion.CodeName=
diff --git a/sdk/support_source.properties b/sdk/support_source.properties
index 85af1a7..855afb3 100644
--- a/sdk/support_source.properties
+++ b/sdk/support_source.properties
@@ -1,5 +1,5 @@
Pkg.UserSrc=false
-Pkg.Revision=6
+Pkg.Revision=8
Extra.Vendor=android
Extra.Path=support
Extra.OldPaths=compatibility