OSDN Git Service
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:16:07 +0000 (21:16 -0700)]
fix merge of all-named-files-under
Change-Id: Iad4c30abdcfca1e73a2a3d525dfcea57f92c5c40
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: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: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: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 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
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.
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: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: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: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
Yohann Roussel [Thu, 8 Oct 2015 08:46:45 +0000 (08:46 +0000)]
Merge "Ensure dump-words-to-file creates the target"
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
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
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
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
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
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
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
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
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
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
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
Steve Fung [Sat, 3 Oct 2015 02:02:38 +0000 (02:02 +0000)]
am
9782fc4c: am
46fbaa56: Merge "Exclude OTA/bin tools when using A/B OTA updater"
* commit '
9782fc4cddac3e31e1e08b1ec86fc61c84a943ec':
Exclude OTA/bin tools when using A/B OTA updater
Steve Fung [Sat, 3 Oct 2015 01:55:34 +0000 (01:55 +0000)]
am
46fbaa56: Merge "Exclude OTA/bin tools when using A/B OTA updater"
* commit '
46fbaa564071e682e3cef7580723249af153ca71':
Exclude OTA/bin tools when using A/B OTA updater
Steve Fung [Sat, 3 Oct 2015 01:50:54 +0000 (01:50 +0000)]
Merge "Exclude OTA/bin tools when using A/B OTA updater"
Colin Cross [Sat, 3 Oct 2015 00:51:02 +0000 (00:51 +0000)]
am
d98fe91a: am
6b02b76a: Merge "Fix gcc color diagnostics"
* commit '
d98fe91a7524d40808ae4ed562aeb38e9eedf593':
Fix gcc color diagnostics
Colin Cross [Sat, 3 Oct 2015 00:43:23 +0000 (00:43 +0000)]
am
6b02b76a: Merge "Fix gcc color diagnostics"
* commit '
6b02b76ab9ebb5c21743abc5616379d19bc1c304':
Fix gcc color diagnostics
Steve Fung [Fri, 2 Oct 2015 06:53:31 +0000 (23:53 -0700)]
Exclude OTA/bin tools when using A/B OTA updater
The OTA/bin tools are not needed in the target files zip when using
the A/B OTA updater.
Bug:
24577767
Change-Id: I7938a906e4d73709aaa944e8065f922536072e27
Colin Cross [Fri, 2 Oct 2015 23:52:58 +0000 (23:52 +0000)]
Merge "Fix gcc color diagnostics"
Colin Cross [Fri, 2 Oct 2015 22:17:47 +0000 (15:17 -0700)]
Fix gcc color diagnostics
gcc color diagnostics stopped working when the flag was moved to
TARGET_GLOBAL_CFLAGS, as that gets overwritten by combo/select.mk. Put
it back in COMMON_GLOBAL_CFLAGS, and then let the windows build filter
it out, similar to the way clang deals with unknown flags.
Change-Id: I2db221edb893d81f199494e7515d1b9282c12fae
Colin Cross [Fri, 2 Oct 2015 18:08:41 +0000 (18:08 +0000)]
am
210d2d08: am
b9599804: Merge "Move the dist-as-droid handling from make to ninja"
* commit '
210d2d0863c5d64695e2509d80144d69b5917ecf':
Move the dist-as-droid handling from make to ninja
Colin Cross [Fri, 2 Oct 2015 18:04:18 +0000 (18:04 +0000)]
am
b9599804: Merge "Move the dist-as-droid handling from make to ninja"
* commit '
b9599804877f00fd1efddb18f779216efae14d4f':
Move the dist-as-droid handling from make to ninja
Colin Cross [Fri, 2 Oct 2015 17:58:20 +0000 (17:58 +0000)]
Merge "Move the dist-as-droid handling from make to ninja"
Alex Deymo [Fri, 2 Oct 2015 03:52:50 +0000 (03:52 +0000)]
am
35907067: am
e89dd69c: Merge "Pack META/ab_partitions.txt when using the A/B OTA updater."
* commit '
3590706735ac41b6956ef07de20cac3994a046f2':
Pack META/ab_partitions.txt when using the A/B OTA updater.
Alex Deymo [Fri, 2 Oct 2015 03:46:07 +0000 (03:46 +0000)]
am
e89dd69c: Merge "Pack META/ab_partitions.txt when using the A/B OTA updater."
* commit '
e89dd69c7632e23bf1cf7db5be1cf1b0f6f345f8':
Pack META/ab_partitions.txt when using the A/B OTA updater.
Alex Deymo [Fri, 2 Oct 2015 03:40:47 +0000 (03:40 +0000)]
Merge "Pack META/ab_partitions.txt when using the A/B OTA updater."
Alex Deymo [Fri, 2 Oct 2015 00:38:09 +0000 (17:38 -0700)]
Pack META/ab_partitions.txt when using the A/B OTA updater.
The list of A/B partitions updated is product-specific. Normally you
would update boot and system, but the product could require to update
other partitions during a system update. This patch packages the list
of A/B partitions configured to be updated when using the A/B updater.
The list can be set in the product makefile by setting the make
variable UPDATE_AB_PARTITIONS.
Bug:
24387863
Test: `make dist` creates the META/ab_partitions.txt in the target_files.zip
Change-Id: I4226ab05c7c7cd74721b06f1da64c6cf4d0e52ac
Colin Cross [Thu, 1 Oct 2015 22:59:56 +0000 (22:59 +0000)]
am
f17f8b49: am
6ec320df: Merge "Have all targets in build.ninja"
* commit '
f17f8b49c92d5a10537cc28f29039e07b1ec17a5':
Have all targets in build.ninja
Colin Cross [Thu, 1 Oct 2015 22:11:27 +0000 (22:11 +0000)]
am
6ec320df: Merge "Have all targets in build.ninja"
* commit '
6ec320df174b6f1dd17023e20fc642f89bb83b4c':
Have all targets in build.ninja
Colin Cross [Thu, 1 Oct 2015 21:13:03 +0000 (21:13 +0000)]
Merge "Have all targets in build.ninja"
Kenny Root [Thu, 1 Oct 2015 18:10:46 +0000 (18:10 +0000)]
am
c58e9de8: am
9df1cb50: Merge "Remove old grandfathered ALL_PREBUILTS"
* commit '
c58e9de8078aedc7b290e15d14ef436860909d55':
Remove old grandfathered ALL_PREBUILTS
Kenny Root [Thu, 1 Oct 2015 18:05:48 +0000 (18:05 +0000)]
am
9df1cb50: Merge "Remove old grandfathered ALL_PREBUILTS"
* commit '
9df1cb507d4d3442c75ca083670bf06938c7d66e':
Remove old grandfathered ALL_PREBUILTS
Kenny Root [Thu, 1 Oct 2015 17:55:05 +0000 (17:55 +0000)]
Merge "Remove old grandfathered ALL_PREBUILTS"
Claes Elgemark [Thu, 1 Oct 2015 14:12:48 +0000 (14:12 +0000)]
am
8d7715ed: am
1b045b3d: am
5b08efb7: (-s ours) Don\'t fail build of otatools if there are no device certificates
* commit '
8d7715ed44b4af7d3c6cdb8828616c10e33fb612':
Don't fail build of otatools if there are no device certificates
Claes Elgemark [Thu, 1 Oct 2015 14:07:49 +0000 (14:07 +0000)]
am
1b045b3d: am
5b08efb7: (-s ours) Don\'t fail build of otatools if there are no device certificates
* commit '
1b045b3d66fb18ecf7deec31dd4fd33993f5ae83':
Don't fail build of otatools if there are no device certificates
Claes Elgemark [Thu, 1 Oct 2015 14:03:40 +0000 (14:03 +0000)]
am
5b08efb7: (-s ours) Don\'t fail build of otatools if there are no device certificates
* commit '
5b08efb73f1b114f6dfdb52284738f7210d0cf7e':
Don't fail build of otatools if there are no device certificates
Stephen Hines [Thu, 1 Oct 2015 05:38:06 +0000 (05:38 +0000)]
am
ba2355c9: resolved conflicts for
9073a5d9 to stage-aosp-master
* commit '
ba2355c9810ad3113e0705d106b28d9cdcbee759':
Fix RS NDK usage so we always pull from "current" instead of NDK 8.
Stephen Hines [Thu, 1 Oct 2015 05:32:05 +0000 (22:32 -0700)]
resolved conflicts for
9073a5d9 to stage-aosp-master
Change-Id: I9b048cb5fe70215a67ef025e8c7ef6aad86cffb3