OSDN Git Service
Peter Qiu [Thu, 15 Oct 2015 04:21:02 +0000 (04:21 +0000)]
am
a80dfcb6: am
cf58d1f5: am
7d3690eb: Merge "Export include path to D-Bus headers for multilib builds"
* commit '
a80dfcb69b0fdae915b4a94ee9549cb173bc03f2':
Export include path to D-Bus headers for multilib builds
Peter Qiu [Thu, 15 Oct 2015 04:15:11 +0000 (04:15 +0000)]
am
cf58d1f5: am
7d3690eb: Merge "Export include path to D-Bus headers for multilib builds"
* commit '
cf58d1f5fed741836f6d06820dce5502e4770dd5':
Export include path to D-Bus headers for multilib builds
Peter Qiu [Thu, 15 Oct 2015 04:08:50 +0000 (04:08 +0000)]
am
7d3690eb: Merge "Export include path to D-Bus headers for multilib builds"
* commit '
7d3690eb3572477b65c04c7a7964a3367c2f69a6':
Export include path to D-Bus headers for multilib builds
Peter Qiu [Thu, 15 Oct 2015 04:00:38 +0000 (04:00 +0000)]
Merge "Export include path to D-Bus headers for multilib builds"
Ying Wang [Thu, 15 Oct 2015 03:21:30 +0000 (03:21 +0000)]
am
8c6af7ba: am
ef67c196: am
84c5ae52: Merge "Use @arg-lsit-file for jar in add-carried-jack-resources"
* commit '
8c6af7ba8fc66000c97ab6bdfaf98de7653c38d6':
Use @arg-lsit-file for jar in add-carried-jack-resources
Ying Wang [Thu, 15 Oct 2015 01:21:28 +0000 (01:21 +0000)]
am
ef67c196: am
84c5ae52: Merge "Use @arg-lsit-file for jar in add-carried-jack-resources"
* commit '
ef67c1963fa7fec143d53f0e63792d80445f781c':
Use @arg-lsit-file for jar in add-carried-jack-resources
Ying Wang [Thu, 15 Oct 2015 01:15:34 +0000 (01:15 +0000)]
am
84c5ae52: Merge "Use @arg-lsit-file for jar in add-carried-jack-resources"
* commit '
84c5ae523201f17b94b5b0afe85a9af3f26c8231':
Use @arg-lsit-file for jar in add-carried-jack-resources
Ying Wang [Thu, 15 Oct 2015 01:10:44 +0000 (01:10 +0000)]
Merge "Use @arg-lsit-file for jar in add-carried-jack-resources"
Ying Wang [Wed, 14 Oct 2015 01:40:37 +0000 (18:40 -0700)]
Use @arg-lsit-file for jar in add-carried-jack-resources
Don't pass the arg list as argument in any bash command;
Instead store the arg list to the arg list file and
run "jar @arg-lsit-file".
Note we need to quote the arguments in the arg list file.
This fixed "argument list too long" build error on Mac.
Bug:
24789595
Change-Id: I718f84e540d82bb83516824894a473b2961da278
Peter Qiu [Wed, 14 Oct 2015 23:46:41 +0000 (16:46 -0700)]
Export include path to D-Bus headers for multilib builds
Bug:None
Change-Id: I6e3898c71f54ede08a27f5be93e95a2b219e5ea6
Ying Wang [Wed, 14 Oct 2015 23:45:50 +0000 (23:45 +0000)]
am
927f00d4: am
5b7aaeaa: am
ed4b0eeb: Merge "Revert "Use @arg-lsit-file for jar in add-carried-jack-resources""
* commit '
927f00d46918f8257b9da04d62550b72e8799d3a':
Revert "Use @arg-lsit-file for jar in add-carried-jack-resources"
Ying Wang [Wed, 14 Oct 2015 23:40:46 +0000 (23:40 +0000)]
am
5b7aaeaa: am
ed4b0eeb: Merge "Revert "Use @arg-lsit-file for jar in add-carried-jack-resources""
* commit '
5b7aaeaa2e71cac30609263364082f33ce43bfbf':
Revert "Use @arg-lsit-file for jar in add-carried-jack-resources"
Ying Wang [Wed, 14 Oct 2015 23:32:18 +0000 (23:32 +0000)]
am
ed4b0eeb: Merge "Revert "Use @arg-lsit-file for jar in add-carried-jack-resources""
* commit '
ed4b0eeb435903d9be502dcebd2c000f143df575':
Revert "Use @arg-lsit-file for jar in add-carried-jack-resources"
Ying Wang [Wed, 14 Oct 2015 23:08:53 +0000 (23:08 +0000)]
Revert "Use @arg-lsit-file for jar in add-carried-jack-resources"
This reverts commit
16f93d5661afe23229ab3b08ddd5fde9bc9c7eb8.
Change-Id: I925dae6a2d07792c61fcd3b6fd8718391ab993f8
Ying Wang [Wed, 14 Oct 2015 23:09:14 +0000 (23:09 +0000)]
Merge "Revert "Use @arg-lsit-file for jar in add-carried-jack-resources""
Ying Wang [Wed, 14 Oct 2015 23:08:53 +0000 (23:08 +0000)]
Revert "Use @arg-lsit-file for jar in add-carried-jack-resources"
This reverts commit
16f93d5661afe23229ab3b08ddd5fde9bc9c7eb8.
Change-Id: I925dae6a2d07792c61fcd3b6fd8718391ab993f8
Ying Wang [Wed, 14 Oct 2015 22:02:13 +0000 (22:02 +0000)]
am
ee299938: am
5d012538: am
37572684: Merge "Use @arg-lsit-file for jar in add-carried-jack-resources"
* commit '
ee299938bf67772efa38544cd2b4475e3fe7269f':
Use @arg-lsit-file for jar in add-carried-jack-resources
Ying Wang [Wed, 14 Oct 2015 21:56:38 +0000 (21:56 +0000)]
am
5d012538: am
37572684: Merge "Use @arg-lsit-file for jar in add-carried-jack-resources"
* commit '
5d012538fbebf44a97539e0430f7190c016d2a4c':
Use @arg-lsit-file for jar in add-carried-jack-resources
Ying Wang [Wed, 14 Oct 2015 21:47:50 +0000 (21:47 +0000)]
am
37572684: Merge "Use @arg-lsit-file for jar in add-carried-jack-resources"
* commit '
3757268466d8fe9438e45e989728a74f14a162c6':
Use @arg-lsit-file for jar in add-carried-jack-resources
Ying Wang [Wed, 14 Oct 2015 21:43:41 +0000 (21:43 +0000)]
Merge "Use @arg-lsit-file for jar in add-carried-jack-resources"
Sami Tolvanen [Wed, 14 Oct 2015 21:06:16 +0000 (21:06 +0000)]
am
b568c7a8: am
99fe0556: am
f635a586: Merge "Disable verity metadata for eng builds"
* commit '
b568c7a8fa6422227f64b51e2d219bc0f087c4a0':
Disable verity metadata for eng builds
Ying Wang [Wed, 14 Oct 2015 21:02:05 +0000 (21:02 +0000)]
am
ba3f5e9e: am
f8c6575f: am
191da9bc: Merge "Let get-prebuilt-src-arch return empty if the input is empty"
* commit '
ba3f5e9e8f2c88d7df20e44092a77542b559fdfc':
Let get-prebuilt-src-arch return empty if the input is empty
Sami Tolvanen [Wed, 14 Oct 2015 20:58:12 +0000 (20:58 +0000)]
am
99fe0556: am
f635a586: Merge "Disable verity metadata for eng builds"
* commit '
99fe05567b5a76d2b3379ee91e9941272cb67219':
Disable verity metadata for eng builds
Sami Tolvanen [Wed, 14 Oct 2015 20:53:28 +0000 (20:53 +0000)]
am
f635a586: Merge "Disable verity metadata for eng builds"
* commit '
f635a586e8f4790455ef3dad8c1291c9eb95747e':
Disable verity metadata for eng builds
Ying Wang [Wed, 14 Oct 2015 20:51:27 +0000 (20:51 +0000)]
am
f8c6575f: am
191da9bc: Merge "Let get-prebuilt-src-arch return empty if the input is empty"
* commit '
f8c6575fceed4de9d54d70f3c4165d68422e7b96':
Let get-prebuilt-src-arch return empty if the input is empty
Sami Tolvanen [Wed, 14 Oct 2015 20:49:32 +0000 (20:49 +0000)]
Merge "Disable verity metadata for eng builds"
Ying Wang [Wed, 14 Oct 2015 20:45:49 +0000 (20:45 +0000)]
am
191da9bc: Merge "Let get-prebuilt-src-arch return empty if the input is empty"
* commit '
191da9bc08360409fa2951567e427168a8d1f76d':
Let get-prebuilt-src-arch return empty if the input is empty
Ying Wang [Wed, 14 Oct 2015 20:41:30 +0000 (20:41 +0000)]
Merge "Let get-prebuilt-src-arch return empty if the input is empty"
Sami Tolvanen [Tue, 15 Sep 2015 16:21:15 +0000 (17:21 +0100)]
Disable verity metadata for eng builds
We don't have dm-verity enabled on eng builds, so don't waste time
generating metadata for images.
Change-Id: Ib2c8d459bb50c30dc32a4ea1fdedc152c09a3a0f
(cherry picked from commit
beae6395fc934ae24955a5e96ec04cda5535d952)
Chih-Wei Huang [Sun, 4 Oct 2015 16:28:47 +0000 (00:28 +0800)]
Let get-prebuilt-src-arch return empty if the input is empty
The list of archs of a pure java apk (no native libs) is empty.
In this case get-prebuilt-src-arch still return 'none'.
If it's set to LOCAL_MODULE_TARGET_ARCH, it makes the apk
be incompatible with the building target. It's not good.
Just return empty in this case.
Change-Id: Ide75cdb08c8480c8e7d3a0ac59f41831fbc18bd5
Dan Willemsen [Wed, 14 Oct 2015 04:25:40 +0000 (04:25 +0000)]
am
539c7400: fix merge of all-named-files-under
* commit '
539c7400468ba526253bc46771590aa9c68ec392':
fix merge of all-named-files-under
Dan Willemsen [Wed, 14 Oct 2015 04:20:28 +0000 (04:20 +0000)]
am
3dcbc592: am
aaa03ede: am
b70b496f: am
57a64e01: Add all-named-(dirs|files)-under and related
* commit '
3dcbc592a28fdaf62c09e204cba559328139bc66':
Add all-named-(dirs|files)-under and related
Dan Willemsen [Wed, 14 Oct 2015 04:20:27 +0000 (04:20 +0000)]
am
e647fc38: am
1ed3bb79: am
2473c641: am
7a74e5ee: Add all-cpp-files-under
* commit '
e647fc385af83b1157cc99a2d6b9775f34209545':
Add all-cpp-files-under
Dan Willemsen [Wed, 14 Oct 2015 04:16:07 +0000 (21:16 -0700)]
fix merge of all-named-files-under
Change-Id: Iad4c30abdcfca1e73a2a3d525dfcea57f92c5c40
Dan Willemsen [Wed, 14 Oct 2015 04:16:25 +0000 (04:16 +0000)]
am
e1cd50d9: resolved conflicts for
b2415086 to mnc-dr-dev-plus-aosp
* commit '
e1cd50d9854ab94f487fae63ca4f4e0717047d96':
Sort all files found via $(shell find)
Dan Willemsen [Wed, 14 Oct 2015 04:13:22 +0000 (04:13 +0000)]
am
aaa03ede: am
b70b496f: am
57a64e01: Add all-named-(dirs|files)-under and related
* commit '
aaa03edef90a758c246da7c5e64dee1d6b3cb771':
Add all-named-(dirs|files)-under and related
Dan Willemsen [Wed, 14 Oct 2015 04:13:21 +0000 (04:13 +0000)]
am
1ed3bb79: am
2473c641: am
7a74e5ee: Add all-cpp-files-under
* commit '
1ed3bb79a9e7071913ce1f5f2a2a73c2b8620d74':
Add all-cpp-files-under
Dan Willemsen [Wed, 14 Oct 2015 04:10:09 +0000 (21:10 -0700)]
resolved conflicts for
b2415086 to mnc-dr-dev-plus-aosp
Change-Id: I99200c7efa00c52ab0e85b362c07fa3e919d44fd
Dan Willemsen [Wed, 14 Oct 2015 03:58:06 +0000 (03:58 +0000)]
am
b70b496f: am
57a64e01: Add all-named-(dirs|files)-under and related
* commit '
b70b496fd7574120e61e5e4ea3d63cf6192ba785':
Add all-named-(dirs|files)-under and related
Dan Willemsen [Wed, 14 Oct 2015 03:58:05 +0000 (03:58 +0000)]
am
2473c641: am
7a74e5ee: Add all-cpp-files-under
* commit '
2473c641baef739bed99c13036200ad8e9812d75':
Add all-cpp-files-under
Dan Willemsen [Wed, 14 Oct 2015 03:58:04 +0000 (03:58 +0000)]
am
304d073b: am
76a89d3a: Sort all files found via
* commit '
304d073b83a8e8eb7d143945996b7c279807abd4':
Sort all files found via $(shell find)
Dan Willemsen [Wed, 14 Oct 2015 03:52:38 +0000 (03:52 +0000)]
am
57a64e01: Add all-named-(dirs|files)-under and related
* commit '
57a64e015c0dd670f9adf5a2016526678ce96a1e':
Add all-named-(dirs|files)-under and related
Dan Willemsen [Wed, 14 Oct 2015 03:52:37 +0000 (03:52 +0000)]
am
7a74e5ee: Add all-cpp-files-under
* commit '
7a74e5ee0e6c41395493d9259ccfff80717a4eaf':
Add all-cpp-files-under
Dan Willemsen [Wed, 14 Oct 2015 03:52:37 +0000 (03:52 +0000)]
am
76a89d3a: Sort all files found via
* commit '
76a89d3a0a39ffa2c9172728165da42c3b3379be':
Sort all files found via $(shell find)
Ying Wang [Wed, 14 Oct 2015 01:40:37 +0000 (18:40 -0700)]
Use @arg-lsit-file for jar in add-carried-jack-resources
Don't pass the arg list as argument in any bash command;
Instead store the arg list to the arg list file and
run "jar @arg-lsit-file".
This fixed "argument list too long" build error on Mac.
Bug:
24789595
Change-Id: I3e5cd18fd988f12f0876b152b8bf07d07b56119e
Ying Wang [Wed, 14 Oct 2015 01:13:07 +0000 (01:13 +0000)]
am
6613ae1c: am
6bdbcece: am
723a2653: Merge "Allow to build against Mac OS X SDK 10.11."
* commit '
6613ae1c8411fb3214a08e8e142a27f140d8734c':
Allow to build against Mac OS X SDK 10.11.
Ying Wang [Wed, 14 Oct 2015 01:10:04 +0000 (01:10 +0000)]
am
6bdbcece: am
723a2653: Merge "Allow to build against Mac OS X SDK 10.11."
* commit '
6bdbcece583592aed87621ab0b8aa52fec99adfa':
Allow to build against Mac OS X SDK 10.11.
Ying Wang [Wed, 14 Oct 2015 01:05:41 +0000 (01:05 +0000)]
am
723a2653: Merge "Allow to build against Mac OS X SDK 10.11."
* commit '
723a26530f801640e8fb9fe037a9f6ca9abe1f39':
Allow to build against Mac OS X SDK 10.11.
Ying Wang [Wed, 14 Oct 2015 01:03:10 +0000 (01:03 +0000)]
Merge "Allow to build against Mac OS X SDK 10.11."
Ying Wang [Wed, 14 Oct 2015 01:00:45 +0000 (18:00 -0700)]
Allow to build against Mac OS X SDK 10.11.
Bug:
24739158
Change-Id: I7c57e141dd02a0d2de5a7a1ccbc72ffe422a8d6f
Dan Willemsen [Mon, 12 Oct 2015 22:26:52 +0000 (15:26 -0700)]
Add all-named-(dirs|files)-under and related
To consolidate the number of places that we're using 'find' in the tree,
add some more helpers:
all-named-dirs-under
all-subdir-named-dirs
all-named-files-under
all-subdir-named-files
This change also makes many of the current helpers use these helpers
instead of using their own implementation.
The 'dirs' helpers are using '-type d' so that they only output
directories. It's probably safe to use '-type f' for the files helpers,
but that increased the kati load time by ~20%.
Bug:
24204119
Change-Id: I3312e2fe8c146f10955e1d986ad15d9c8be494e1
Dan Willemsen [Tue, 29 Sep 2015 23:26:28 +0000 (16:26 -0700)]
Add all-cpp-files-under
There are multiple versions of this in the tree. Let's standardize on
one that will work for everyone, and will sort the results.
Bug:
24204119
Change-Id: I09fcd80e1e8e35e64d8a8a62bbc096f87b02603f
Dan Willemsen [Tue, 22 Sep 2015 23:54:12 +0000 (16:54 -0700)]
Sort all files found via $(shell find)
Don't rely on filesystem ordering to make these the same for all builds.
Bug:
24204119
Change-Id: I7313062157764091acecf45f4b57405c28858546
Bertrand Simonnet [Tue, 13 Oct 2015 20:22:10 +0000 (20:22 +0000)]
am
123b060f: am
5df7366e: am
f698ca63: Merge "Add the product version to target_files.zip."
* commit '
123b060f042349f64e336b5202dc1e2d92e262fd':
Add the product version to target_files.zip.
Bertrand Simonnet [Tue, 13 Oct 2015 20:14:55 +0000 (20:14 +0000)]
am
5df7366e: am
f698ca63: Merge "Add the product version to target_files.zip."
* commit '
5df7366e124da1b3c4c8b410da02a460258966b2':
Add the product version to target_files.zip.
Bertrand Simonnet [Tue, 13 Oct 2015 20:08:37 +0000 (20:08 +0000)]
am
f698ca63: Merge "Add the product version to target_files.zip."
* commit '
f698ca63d970e1ed7f9b5c4090d2cf5cfa659e55':
Add the product version to target_files.zip.
Bertrand Simonnet [Tue, 13 Oct 2015 19:59:42 +0000 (19:59 +0000)]
Merge "Add the product version to target_files.zip."
Neil Fuller [Tue, 13 Oct 2015 09:24:59 +0000 (09:24 +0000)]
am
9789c5f7: am
f0eab404: am
9d14d317: Merge "Fix for Java 8 toolchain builds"
* commit '
9789c5f7dffad0a9d14b671b9ed26e0dfb1c0242':
Fix for Java 8 toolchain builds
Neil Fuller [Tue, 13 Oct 2015 09:19:57 +0000 (09:19 +0000)]
am
f0eab404: am
9d14d317: Merge "Fix for Java 8 toolchain builds"
* commit '
f0eab40487b2894fed06eb59eda1c8877b0d483b':
Fix for Java 8 toolchain builds
Neil Fuller [Tue, 13 Oct 2015 09:14:16 +0000 (09:14 +0000)]
am
9d14d317: Merge "Fix for Java 8 toolchain builds"
* commit '
9d14d317c8b0f128903db72bfb1cfda0f3468280':
Fix for Java 8 toolchain builds
Neil Fuller [Tue, 13 Oct 2015 08:26:16 +0000 (08:26 +0000)]
Merge "Fix for Java 8 toolchain builds"
Shinichiro Hamaji [Tue, 13 Oct 2015 06:58:56 +0000 (06:58 +0000)]
am
7f92b459: am
c016366d: am
b7462534: Merge "Stop passing --gen_all_phony_targets to kati"
* commit '
7f92b459861faa4a2df8fa3feaaf5d495cec4eac':
Stop passing --gen_all_phony_targets to kati
Hans Boehm [Tue, 13 Oct 2015 06:58:54 +0000 (06:58 +0000)]
am
fb0b3cf2: am
0566be64: (-s ours) am
8638de1f: am
ab4d8594: Switch from Calculator to ExactCalculator
* commit '
fb0b3cf278d8adfe54c29dcad76baa11445736c7':
Switch from Calculator to ExactCalculator
Shinichiro Hamaji [Tue, 13 Oct 2015 05:45:34 +0000 (05:45 +0000)]
am
c016366d: am
b7462534: Merge "Stop passing --gen_all_phony_targets to kati"
* commit '
c016366dc883729f1b2cd6cae79e21098afda383':
Stop passing --gen_all_phony_targets to kati
Shinichiro Hamaji [Tue, 13 Oct 2015 05:39:04 +0000 (05:39 +0000)]
am
b7462534: Merge "Stop passing --gen_all_phony_targets to kati"
* commit '
b7462534f23145b8413fdd631fe419d0e38b335a':
Stop passing --gen_all_phony_targets to kati
Shinichiro Hamaji [Tue, 13 Oct 2015 05:35:50 +0000 (05:35 +0000)]
Merge "Stop passing --gen_all_phony_targets to kati"
Hans Boehm [Tue, 13 Oct 2015 04:55:16 +0000 (04:55 +0000)]
am
0566be64: (-s ours) am
8638de1f: am
ab4d8594: Switch from Calculator to ExactCalculator
* commit '
0566be645e3efbf86898538fab65512b50e74ef1':
Switch from Calculator to ExactCalculator
Hans Boehm [Tue, 13 Oct 2015 03:55:13 +0000 (03:55 +0000)]
am
8638de1f: am
ab4d8594: Switch from Calculator to ExactCalculator
* commit '
8638de1f6f8186d4cb8b82b6c0f365f3ce8a0b24':
Switch from Calculator to ExactCalculator
Hans Boehm [Tue, 13 Oct 2015 03:49:41 +0000 (03:49 +0000)]
am
ab4d8594: Switch from Calculator to ExactCalculator
* commit '
ab4d8594591b715934d7a1106d5284e9721070ba':
Switch from Calculator to ExactCalculator
Dan Willemsen [Tue, 13 Oct 2015 01:25:56 +0000 (01:25 +0000)]
am
d7d5fec3: am
518d732c: am
90ddd588: Merge "Add all-named-(dirs|files)-under and related"
* commit '
d7d5fec3a37695be89c659faa85043cba59fb1a6':
Add all-named-(dirs|files)-under and related
Tao Bao [Tue, 13 Oct 2015 01:25:25 +0000 (01:25 +0000)]
am
6c8f587d: (-s ours) am
829b2f23: am
ed48af8d: am
b03d55aa: Merge "DO NOT MERGE: Only use a fixed timestamp when packaging." into mnc-dr-dev
* commit '
6c8f587d2be05298c9be785b1a98a87dd4e352d1':
DO NOT MERGE: Only use a fixed timestamp when packaging.
Ying Wang [Tue, 13 Oct 2015 01:23:47 +0000 (01:23 +0000)]
am
7a2e6de1: am
85a85924: (-s ours) am
43f24a32: am
aecadc06: Merge "Don\'t add build number to apps\' version name for platform build." into mnc-dr-dev
* commit '
7a2e6de10b243d7db0f207859a6ea33a0d45ae72':
Don't add build number to apps' version name for platform build.
Hans Boehm [Tue, 13 Oct 2015 00:08:04 +0000 (17:08 -0700)]
Switch from Calculator to ExactCalculator
Bug:
24875598
Use ExactCalculator for AOSP builds.
This is a manual (due to intervening commits) cherrypick of
commit
53c5891460408ffe37f2aecc2044320d49cef801 (ag/748830).
Change-Id: I6c0acef640e62f8a70b7b2832b7eea662a0d301b
Dan Willemsen [Mon, 12 Oct 2015 23:33:52 +0000 (23:33 +0000)]
am
518d732c: am
90ddd588: Merge "Add all-named-(dirs|files)-under and related"
* commit '
518d732c6296e3590d84d7881fd399e16d75ff8b':
Add all-named-(dirs|files)-under and related
Dan Willemsen [Mon, 12 Oct 2015 23:28:41 +0000 (23:28 +0000)]
am
90ddd588: Merge "Add all-named-(dirs|files)-under and related"
* commit '
90ddd58826c65f3d8d8aad197d5dbd8e3036199c':
Add all-named-(dirs|files)-under and related
Dan Willemsen [Mon, 12 Oct 2015 23:24:10 +0000 (23:24 +0000)]
Merge "Add all-named-(dirs|files)-under and related"
Dan Willemsen [Mon, 12 Oct 2015 22:26:52 +0000 (15:26 -0700)]
Add all-named-(dirs|files)-under and related
To consolidate the number of places that we're using 'find' in the tree,
add some more helpers:
all-named-dirs-under
all-subdir-named-dirs
all-named-files-under
all-subdir-named-files
This change also makes many of the current helpers use these helpers
instead of using their own implementation.
The 'dirs' helpers are using '-type d' so that they only output
directories. It's probably safe to use '-type f' for the files helpers,
but that increased the kati load time by ~20%.
Bug:
24204119
Change-Id: I3312e2fe8c146f10955e1d986ad15d9c8be494e1
Tao Bao [Mon, 12 Oct 2015 22:05:02 +0000 (22:05 +0000)]
am
829b2f23: am
ed48af8d: am
b03d55aa: Merge "DO NOT MERGE: Only use a fixed timestamp when packaging." into mnc-dr-dev
* commit '
829b2f236e371afa362c8b143233ff865aef5aaa':
DO NOT MERGE: Only use a fixed timestamp when packaging.
Tao Bao [Mon, 12 Oct 2015 18:48:13 +0000 (18:48 +0000)]
am
ed48af8d: am
b03d55aa: Merge "DO NOT MERGE: Only use a fixed timestamp when packaging." into mnc-dr-dev
* commit '
ed48af8d5b997915b209eee0ad0d580938d679a1':
DO NOT MERGE: Only use a fixed timestamp when packaging.
Tao Bao [Mon, 12 Oct 2015 18:42:21 +0000 (18:42 +0000)]
am
b03d55aa: Merge "DO NOT MERGE: Only use a fixed timestamp when packaging." into mnc-dr-dev
* commit '
b03d55aaeb5962690631ed1a25d8e628667d8ad2':
DO NOT MERGE: Only use a fixed timestamp when packaging.
Tao Bao [Mon, 12 Oct 2015 18:39:11 +0000 (18:39 +0000)]
Merge "DO NOT MERGE: Only use a fixed timestamp when packaging." into mnc-dr-dev
Ying Wang [Mon, 12 Oct 2015 17:52:42 +0000 (17:52 +0000)]
am
85a85924: (-s ours) am
43f24a32: am
aecadc06: Merge "Don\'t add build number to apps\' version name for platform build." into mnc-dr-dev
* commit '
85a85924e1e818b3e3cb50323c3c8e0f75d9f70e':
Don't add build number to apps' version name for platform build.
Dianne Hackborn [Thu, 8 Oct 2015 00:36:46 +0000 (17:36 -0700)]
Include the new "cmd" command-line tool in all Android builds.
Change-Id: I93f415ddde0f4e273be04af3379ee706962416d2
Ying Wang [Mon, 12 Oct 2015 17:34:19 +0000 (17:34 +0000)]
am
43f24a32: am
aecadc06: Merge "Don\'t add build number to apps\' version name for platform build." into mnc-dr-dev
* commit '
43f24a323ce95e848ef56ec5a2a1f02b41d14ffc':
Don't add build number to apps' version name for platform build.
Ying Wang [Mon, 12 Oct 2015 17:28:03 +0000 (17:28 +0000)]
am
aecadc06: Merge "Don\'t add build number to apps\' version name for platform build." into mnc-dr-dev
* commit '
aecadc06bf49a747c6e0c42dbe8cc73451360db2':
Don't add build number to apps' version name for platform build.
Ying Wang [Mon, 12 Oct 2015 17:22:45 +0000 (17:22 +0000)]
Merge "Don't add build number to apps' version name for platform build." into mnc-dr-dev
Tao Bao [Wed, 30 Sep 2015 23:01:14 +0000 (16:01 -0700)]
DO NOT MERGE: Only use a fixed timestamp when packaging.
This CL changes to use a fixed timestamp only when packaging
into the target_files zip.
Bug:
24377993
Change-Id: I01d136f4b99e1eff80c559192d93db83a3c5c0a4
(cherry picked from commit
822f5840c0f498e33829a0a00f383d9be3a7e913)
Neil Fuller [Mon, 12 Oct 2015 16:29:45 +0000 (17:29 +0100)]
Fix for Java 8 toolchain builds
We don't need to assume the OpenJDK (i.e. for Mac builds).
Change-Id: I1ac1856813045c7b1478dee6b08ad7b49300e4d7
Joe Fernandez [Sat, 10 Oct 2015 00:54:42 +0000 (00:54 +0000)]
am
8563700a: am
761fcbe7: am
fed4cf89: am
1b5eef1b: am
b16edb5f: Merge "add unique ID to each windows download link. These IDs are necessary for the TOS wall to identify which link should be applied to the download button." into mnc-dev
* commit '
8563700a72d17e783ffaf8cc1b55f24e465777a9':
add unique ID to each windows download link. These IDs are necessary for the TOS wall to identify which link should be applied to the download button.
Joe Fernandez [Sat, 10 Oct 2015 00:20:36 +0000 (00:20 +0000)]
am
761fcbe7: am
fed4cf89: am
1b5eef1b: am
b16edb5f: Merge "add unique ID to each windows download link. These IDs are necessary for the TOS wall to identify which link should be applied to the download button." into mnc-dev
* commit '
761fcbe7920ccc3fc2e85fde2844f19ce9163658':
add unique ID to each windows download link. These IDs are necessary for the TOS wall to identify which link should be applied to the download button.
Joe Fernandez [Sat, 10 Oct 2015 00:13:38 +0000 (00:13 +0000)]
am
fed4cf89: am
1b5eef1b: am
b16edb5f: Merge "add unique ID to each windows download link. These IDs are necessary for the TOS wall to identify which link should be applied to the download button." into mnc-dev
* commit '
fed4cf896d2ba46a97bbbb753fd019f98bb42d90':
add unique ID to each windows download link. These IDs are necessary for the TOS wall to identify which link should be applied to the download button.
Joe Fernandez [Sat, 10 Oct 2015 00:08:09 +0000 (00:08 +0000)]
am
1b5eef1b: am
b16edb5f: Merge "add unique ID to each windows download link. These IDs are necessary for the TOS wall to identify which link should be applied to the download button." into mnc-dev
* commit '
1b5eef1b490cc143474ec74d58369aac9bf6629e':
add unique ID to each windows download link. These IDs are necessary for the TOS wall to identify which link should be applied to the download button.
Joe Fernandez [Fri, 9 Oct 2015 23:59:07 +0000 (23:59 +0000)]
am
b16edb5f: Merge "add unique ID to each windows download link. These IDs are necessary for the TOS wall to identify which link should be applied to the download button." into mnc-dev
* commit '
b16edb5f3ef9032b7e19c29aac2496c34bb8ac76':
add unique ID to each windows download link. These IDs are necessary for the TOS wall to identify which link should be applied to the download button.
Joe Fernandez [Fri, 9 Oct 2015 23:54:46 +0000 (23:54 +0000)]
Merge "add unique ID to each windows download link. These IDs are necessary for the TOS wall to identify which link should be applied to the download button." into mnc-dev
smain@google.com [Fri, 9 Oct 2015 23:30:05 +0000 (16:30 -0700)]
add unique ID to each windows download link.
These IDs are necessary for the TOS wall to identify which link should be applied to the download button.
Change-Id: I1b5b8b516a5b8d7fd8433c02011cb4fb2044b71f
Bertrand SIMONNET [Thu, 8 Oct 2015 22:32:40 +0000 (15:32 -0700)]
Add the product version to target_files.zip.
When using the A/B updater, include the product version string to
target_files.zip.
This is needed by the Omaha backend.
BUG:
24743570
Change-Id: Idaba06624c1de452b1e1f9d3ebec851229af987a
Bill Yi [Thu, 8 Oct 2015 21:38:20 +0000 (21:38 +0000)]
Bill Yi [Thu, 8 Oct 2015 21:32:58 +0000 (21:32 +0000)]
Bill Yi [Thu, 8 Oct 2015 17:34:18 +0000 (10:34 -0700)]
Yohann Roussel [Thu, 8 Oct 2015 09:19:43 +0000 (09:19 +0000)]
am
43b95dcf: am
6a8146f2: Merge "Ensure dump-words-to-file creates the target"
* commit '
43b95dcff1befabec0cf57a32e4c2a5b398bcc40':
Ensure dump-words-to-file creates the target