summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Marie Henaff <jmhenaff@google.com>2015-06-18 15:52:02 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-06-18 15:52:02 +0000
commita631d99a9685ad29955cea6714c07130884f4d53 (patch)
tree11c253fd5db090d592c4ca56c9e2f8404fa77bc5
parent6adc97bf1632d12c6b2c89dac0736cdfcc8aae30 (diff)
parent241d8f3e8b11f1f919ced996f0ea56eaf4a28de2 (diff)
downloadtoolchain_jack-a631d99a9685ad29955cea6714c07130884f4d53.tar.gz
toolchain_jack-a631d99a9685ad29955cea6714c07130884f4d53.tar.bz2
toolchain_jack-a631d99a9685ad29955cea6714c07130884f4d53.zip
Merge "Add jack*-version.properties resource files" into ub-jack-brest
-rw-r--r--jack-api/rsc/jack-api-version.properties (renamed from jack-launcher/rsc/jack-launcher.properties)12
-rw-r--r--jack-launcher/rsc/jack-launcher-version.properties26
2 files changed, 37 insertions, 1 deletions
diff --git a/jack-launcher/rsc/jack-launcher.properties b/jack-api/rsc/jack-api-version.properties
index be45bd39..9a505b26 100644
--- a/jack-launcher/rsc/jack-launcher.properties
+++ b/jack-api/rsc/jack-api-version.properties
@@ -13,4 +13,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-jack-launcher.version=1.1-rc4
+version-file.version.code=1
+
+version=1.1-rc4
+version.release.name=Brest
+version.release.code=2
+version.sub-release.kind=CANDIDATE
+version.sub-release.code=17
+
+# These properties are added by the release step
+# version.buildid=<BUILDID>
+# version.sha=<SHA>
diff --git a/jack-launcher/rsc/jack-launcher-version.properties b/jack-launcher/rsc/jack-launcher-version.properties
new file mode 100644
index 00000000..9a505b26
--- /dev/null
+++ b/jack-launcher/rsc/jack-launcher-version.properties
@@ -0,0 +1,26 @@
+#
+# Copyright (C) 2015 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+version-file.version.code=1
+
+version=1.1-rc4
+version.release.name=Brest
+version.release.code=2
+version.sub-release.kind=CANDIDATE
+version.sub-release.code=17
+
+# These properties are added by the release step
+# version.buildid=<BUILDID>
+# version.sha=<SHA>