OSDN Git Service

android-x86/build.git
8 years agoam ee299938: am 5d012538: am 37572684: Merge "Use @arg-lsit-file for jar in add-carri...
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

8 years agoam 5d012538: am 37572684: Merge "Use @arg-lsit-file for jar in add-carried-jack-resou...
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

8 years agoam 37572684: Merge "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

8 years agoMerge "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"

8 years agoam b568c7a8: am 99fe0556: am f635a586: Merge "Disable verity metadata for eng builds"
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

8 years agoam ba3f5e9e: am f8c6575f: am 191da9bc: Merge "Let get-prebuilt-src-arch return empty...
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

8 years agoam 99fe0556: am f635a586: Merge "Disable verity metadata for eng builds"
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

8 years agoam f635a586: Merge "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

8 years agoam f8c6575f: am 191da9bc: Merge "Let get-prebuilt-src-arch return empty if the input...
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

8 years agoMerge "Disable verity metadata for eng builds"
Sami Tolvanen [Wed, 14 Oct 2015 20:49:32 +0000 (20:49 +0000)]
Merge "Disable verity metadata for eng builds"

8 years agoam 191da9bc: Merge "Let get-prebuilt-src-arch return empty if the input is empty"
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

8 years agoMerge "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"

8 years agoDisable verity metadata for eng builds
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)

8 years agoLet get-prebuilt-src-arch return empty if the input is empty
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

8 years agoam 539c7400: fix merge of all-named-files-under
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

8 years agoam 3dcbc592: am aaa03ede: am b70b496f: am 57a64e01: Add all-named-(dirs|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

8 years agoam e647fc38: am 1ed3bb79: am 2473c641: am 7a74e5ee: Add all-cpp-files-under
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

8 years agofix merge of all-named-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

8 years agoam e1cd50d9: resolved conflicts for b2415086 to mnc-dr-dev-plus-aosp
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)

8 years agoam aaa03ede: am b70b496f: am 57a64e01: Add all-named-(dirs|files)-under and related
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

8 years agoam 1ed3bb79: am 2473c641: am 7a74e5ee: Add all-cpp-files-under
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

8 years agoresolved conflicts for b2415086 to mnc-dr-dev-plus-aosp
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

8 years agoam b70b496f: am 57a64e01: Add all-named-(dirs|files)-under and related
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

8 years agoam 2473c641: am 7a74e5ee: Add all-cpp-files-under
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

8 years agoam 304d073b: am 76a89d3a: Sort all files found via
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)

8 years agoam 57a64e01: Add all-named-(dirs|files)-under and related
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

8 years agoam 7a74e5ee: Add all-cpp-files-under
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

8 years agoam 76a89d3a: Sort all files found via
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)

8 years agoUse @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".

This fixed "argument list too long" build error on Mac.

Bug: 24789595
Change-Id: I3e5cd18fd988f12f0876b152b8bf07d07b56119e

8 years agoam 6613ae1c: am 6bdbcece: am 723a2653: Merge "Allow to build against Mac OS X SDK...
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.

8 years agoam 6bdbcece: am 723a2653: Merge "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.

8 years agoam 723a2653: Merge "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.

8 years agoMerge "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."

8 years agoAllow 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

8 years agoAdd 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

8 years agoAdd all-cpp-files-under
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

8 years agoSort all files found via $(shell find)
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

8 years agoam 123b060f: am 5df7366e: am f698ca63: Merge "Add the product version to target_files...
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.

8 years agoam 5df7366e: am f698ca63: Merge "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.

8 years agoam f698ca63: Merge "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.

8 years agoMerge "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."

8 years agoam 9789c5f7: am f0eab404: am 9d14d317: Merge "Fix for Java 8 toolchain builds"
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

8 years agoam f0eab404: am 9d14d317: Merge "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

8 years agoam 9d14d317: Merge "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

8 years agoMerge "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"

8 years agoam 7f92b459: am c016366d: am b7462534: Merge "Stop passing --gen_all_phony_targets...
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

8 years agoam fb0b3cf2: am 0566be64: (-s ours) am 8638de1f: am ab4d8594: Switch from Calculator...
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

8 years agoam c016366d: am b7462534: Merge "Stop passing --gen_all_phony_targets to kati"
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

8 years agoam b7462534: Merge "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

8 years agoMerge "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"

8 years agoam 0566be64: (-s ours) am 8638de1f: am ab4d8594: Switch from Calculator to ExactCalcu...
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

8 years agoam 8638de1f: am ab4d8594: 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

8 years agoam ab4d8594: 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

8 years agoam d7d5fec3: am 518d732c: am 90ddd588: Merge "Add all-named-(dirs|files)-under and...
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

8 years agoam 6c8f587d: (-s ours) am 829b2f23: am ed48af8d: am b03d55aa: Merge "DO NOT MERGE...
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.

8 years agoam 7a2e6de1: am 85a85924: (-s ours) am 43f24a32: am aecadc06: Merge "Don\'t add build...
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.

8 years agoSwitch from Calculator to ExactCalculator
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

8 years agoam 518d732c: am 90ddd588: Merge "Add all-named-(dirs|files)-under and related"
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

8 years agoam 90ddd588: Merge "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

8 years agoMerge "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"

8 years agoAdd 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

8 years agoam 829b2f23: am ed48af8d: am b03d55aa: Merge "DO NOT MERGE: Only use a fixed timestam...
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.

8 years agoam ed48af8d: am b03d55aa: Merge "DO NOT MERGE: Only use a fixed timestamp when packag...
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.

8 years agoam b03d55aa: Merge "DO NOT MERGE: Only use a fixed timestamp when packaging." into...
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.

8 years agoMerge "DO NOT MERGE: Only use a fixed timestamp when packaging." into mnc-dr-dev
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

8 years agoam 85a85924: (-s ours) am 43f24a32: am aecadc06: Merge "Don\'t add build number to...
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.

8 years agoInclude the new "cmd" command-line tool in all Android builds.
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

8 years agoam 43f24a32: am aecadc06: Merge "Don\'t add build number to apps\' version name for...
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.

8 years agoam aecadc06: Merge "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.

8 years agoMerge "Don't add build number to apps' version name for platform build." into mnc...
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

8 years agoDO NOT MERGE: Only use a fixed timestamp when packaging.
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)

8 years agoFix for Java 8 toolchain builds
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

8 years agoam 8563700a: am 761fcbe7: am fed4cf89: am 1b5eef1b: am b16edb5f: Merge "add unique...
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.

8 years agoam 761fcbe7: am fed4cf89: am 1b5eef1b: am b16edb5f: Merge "add unique ID to each...
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.

8 years agoam fed4cf89: am 1b5eef1b: am b16edb5f: Merge "add unique ID to each windows download...
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.

8 years agoam 1b5eef1b: am b16edb5f: Merge "add unique ID to each windows download link. These...
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.

8 years agoam b16edb5f: Merge "add unique ID to each windows download link. These IDs are necess...
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.

8 years agoMerge "add unique ID to each windows download link. These IDs are necessary for the...
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

8 years agoadd unique ID to each windows download link.
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

8 years agoAdd the product version to target_files.zip.
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

8 years agoam b3e8bd18: am 96e59f2c: Merge commit \'f414f45e1d99b6fcfd8c451cf6880c3b78a6bf84...
Bill Yi [Thu, 8 Oct 2015 21:38:20 +0000 (21:38 +0000)]
am b3e8bd18: am 96e59f2c: Merge commit \'f414f45e1d99b6fcfd8c451cf6880c3b78a6bf84\' into HEAD

* commit 'b3e8bd1842bed254561918f3d6467334eba2111a':

8 years agoam 96e59f2c: Merge commit \'f414f45e1d99b6fcfd8c451cf6880c3b78a6bf84\' into HEAD
Bill Yi [Thu, 8 Oct 2015 21:32:58 +0000 (21:32 +0000)]
am 96e59f2c: Merge commit \'f414f45e1d99b6fcfd8c451cf6880c3b78a6bf84\' into HEAD

* commit '96e59f2c34b3174f31b7c7c9ce0a995acb90a6c4':

8 years agoMerge commit 'f414f45e1d99b6fcfd8c451cf6880c3b78a6bf84' into HEAD
Bill Yi [Thu, 8 Oct 2015 17:34:18 +0000 (10:34 -0700)]
Merge commit 'f414f45e1d99b6fcfd8c451cf6880c3b78a6bf84' into HEAD

8 years agoam 43b95dcf: am 6a8146f2: Merge "Ensure dump-words-to-file creates the target"
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

8 years agoam 6a8146f2: Merge "Ensure dump-words-to-file creates the target"
Yohann Roussel [Thu, 8 Oct 2015 09:15:30 +0000 (09:15 +0000)]
am 6a8146f2: Merge "Ensure dump-words-to-file creates the target"

* commit '6a8146f2a2286dd4be231c22f9d0465c94a3ab00':
  Ensure dump-words-to-file creates the target

8 years agoMerge "Ensure dump-words-to-file creates the target"
Yohann Roussel [Thu, 8 Oct 2015 08:46:45 +0000 (08:46 +0000)]
Merge "Ensure dump-words-to-file creates the target"

8 years agoStop passing --gen_all_phony_targets to kati
Shinichiro Hamaji [Thu, 8 Oct 2015 06:25:16 +0000 (15:25 +0900)]
Stop passing --gen_all_phony_targets to kati

https://github.com/google/kati/commit/6ff74ce8ee4a618060a5bc7dac408be909151518

should have made this workaround unnecessary. Now, even with
old build/core, "m -j32 PRODUCT-aosp_mips64-eng dist" does not
output a ninja file with "$(cat )".

Bug: 24384320
Change-Id: I262edf00dce39f39ec4e55d5ed7b1b6f8d931f33

8 years agoEnsure dump-words-to-file creates the target
Yohann Roussel [Tue, 6 Oct 2015 13:28:38 +0000 (15:28 +0200)]
Ensure dump-words-to-file creates the target

Even if word list is empty.

Not creating the file was causing print of error messages that were
not preventing compilation to continue when compiling Java module with
no source.

Change-Id: I095b85f85ed6fcef5882afa39d4af51b78124c7c

8 years agoam f414f45e: am a78d357d: am a9b2f303: am 124a59ae: Reverting Android Security Patch...
Zach Jang [Tue, 6 Oct 2015 01:36:49 +0000 (01:36 +0000)]
am f414f45e: am a78d357d: am a9b2f303: am 124a59ae: Reverting Android Security Patch Level string back to 2015-10-01

* commit 'f414f45e1d99b6fcfd8c451cf6880c3b78a6bf84':
  Reverting Android Security Patch Level string back to 2015-10-01

8 years agoam a78d357d: am a9b2f303: am 124a59ae: Reverting Android Security Patch Level string...
Zach Jang [Tue, 6 Oct 2015 01:33:27 +0000 (01:33 +0000)]
am a78d357d: am a9b2f303: am 124a59ae: Reverting Android Security Patch Level string back to 2015-10-01

* commit 'a78d357d185c1bd45e52ad110d59b53540f2949c':
  Reverting Android Security Patch Level string back to 2015-10-01

8 years agoam a9b2f303: am 124a59ae: Reverting Android Security Patch Level string back to 2015...
Zach Jang [Tue, 6 Oct 2015 01:26:51 +0000 (01:26 +0000)]
am a9b2f303: am 124a59ae: Reverting Android Security Patch Level string back to 2015-10-01

* commit 'a9b2f3030f99650e8af1b7ec35c171801cbcdae6':
  Reverting Android Security Patch Level string back to 2015-10-01

8 years agoam 124a59ae: Reverting Android Security Patch Level string back to 2015-10-01
Zach Jang [Tue, 6 Oct 2015 01:21:03 +0000 (01:21 +0000)]
am 124a59ae: Reverting Android Security Patch Level string back to 2015-10-01

* commit '124a59aecc0323c1c80469c3ad5d22305c279a49':
  Reverting Android Security Patch Level string back to 2015-10-01

8 years agoReverting Android Security Patch Level string back to 2015-10-01
Zach Jang [Tue, 6 Oct 2015 01:01:12 +0000 (18:01 -0700)]
Reverting Android Security Patch Level string back to 2015-10-01

Change-Id: I0ecc1c9103e7686dffcb8b7009d52aa8d546ae0b

8 years agoam 10abe694: am b43cf696: am 848b8e9d: am fa2ce3b3: am f73f79f1: Merge "Use /filelist...
Brian Carlstrom [Sun, 4 Oct 2015 20:11:53 +0000 (20:11 +0000)]
am 10abe694: am b43cf696: am 848b8e9d: am fa2ce3b3: am f73f79f1: Merge "Use /filelist when OUT_DIR is set" into mnc-dev

* commit '10abe694783012a99aa4d75318d5588df6937f28':
  Use $OUT_DIR/filelist when OUT_DIR is set

8 years agoam b43cf696: am 848b8e9d: am fa2ce3b3: am f73f79f1: Merge "Use /filelist when OUT_DIR...
Brian Carlstrom [Sun, 4 Oct 2015 20:05:54 +0000 (20:05 +0000)]
am b43cf696: am 848b8e9d: am fa2ce3b3: am f73f79f1: Merge "Use /filelist when OUT_DIR is set" into mnc-dev

* commit 'b43cf69672c72c025f0fe764d49ec950e3b57b81':
  Use $OUT_DIR/filelist when OUT_DIR is set

8 years agoam 848b8e9d: am fa2ce3b3: am f73f79f1: Merge "Use /filelist when OUT_DIR is set"...
Brian Carlstrom [Sun, 4 Oct 2015 20:00:56 +0000 (20:00 +0000)]
am 848b8e9d: am fa2ce3b3: am f73f79f1: Merge "Use /filelist when OUT_DIR is set" into mnc-dev

* commit '848b8e9d2cc9f8229c95b3f2d9f92c97726ad8a6':
  Use $OUT_DIR/filelist when OUT_DIR is set

8 years agoam fa2ce3b3: am f73f79f1: Merge "Use /filelist when OUT_DIR is set" into mnc-dev
Brian Carlstrom [Sun, 4 Oct 2015 19:53:49 +0000 (19:53 +0000)]
am fa2ce3b3: am f73f79f1: Merge "Use /filelist when OUT_DIR is set" into mnc-dev

* commit 'fa2ce3b38be8889a0ccaa5968ebdeae80f33b0de':
  Use $OUT_DIR/filelist when OUT_DIR is set

8 years agoam f73f79f1: Merge "Use /filelist when OUT_DIR is set" into mnc-dev
Brian Carlstrom [Sun, 4 Oct 2015 19:47:22 +0000 (19:47 +0000)]
am f73f79f1: Merge "Use /filelist when OUT_DIR is set" into mnc-dev

* commit 'f73f79f1b63c7cb7679264a6c6e4f86fdd78309c':
  Use $OUT_DIR/filelist when OUT_DIR is set

8 years agoMerge "Use $OUT_DIR/filelist when OUT_DIR is set" into mnc-dev
Brian Carlstrom [Sun, 4 Oct 2015 19:40:41 +0000 (19:40 +0000)]
Merge "Use $OUT_DIR/filelist when OUT_DIR is set" into mnc-dev

8 years agoam a9722e29: am 9782fc4c: am 46fbaa56: Merge "Exclude OTA/bin tools when using A...
Steve Fung [Sat, 3 Oct 2015 02:05:31 +0000 (02:05 +0000)]
am a9722e29: am 9782fc4c: am 46fbaa56: Merge "Exclude OTA/bin tools when using A/B OTA updater"

* commit 'a9722e29278710c32d84604fd338a4e05ebbb320':
  Exclude OTA/bin tools when using A/B OTA updater