OSDN Git Service
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)
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
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"
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
Stephen Hines [Thu, 1 Oct 2015 05:19:50 +0000 (05:19 +0000)]
Merge "Fix RS NDK usage so we always pull from "current" instead of NDK 8."
Brian Carlstrom [Thu, 1 Oct 2015 03:28:54 +0000 (20:28 -0700)]
Use $OUT_DIR/filelist when OUT_DIR is set
Change-Id: Iadf3f05e752d71371d3d74e670ade3e937b1cd92
Tao Bao [Thu, 1 Oct 2015 00:00:06 +0000 (00:00 +0000)]
am
ce9635ec: am
2124d7e1: Merge "Only use a fixed timestamp when packaging."
* commit '
ce9635ec7ad6bcc6b9bc74136edb91847fe9e4ff':
Only use a fixed timestamp when packaging.
Dan Willemsen [Wed, 30 Sep 2015 23:59:46 +0000 (23:59 +0000)]
am
05bb4fed: am
edc3e6cd: Merge "Sort more instances of wildcard and find"
* commit '
05bb4fed0d0e701ba13fef5f20b57eb1642cc40a':
Sort more instances of wildcard and find
Dan Willemsen [Wed, 30 Sep 2015 23:59:45 +0000 (23:59 +0000)]
am
24b5fcf9: am
604e532f: Merge "Add all-cpp-files-under"
* commit '
24b5fcf92aeba5a17bf0b4d1720318602cf51a16':
Add all-cpp-files-under
Tao Bao [Wed, 30 Sep 2015 23:50:49 +0000 (23:50 +0000)]
am
2124d7e1: Merge "Only use a fixed timestamp when packaging."
* commit '
2124d7e1e2dec91ce4ab15c6a215d61f7693a8d6':
Only use a fixed timestamp when packaging.
Tao Bao [Wed, 30 Sep 2015 23:45:45 +0000 (23:45 +0000)]
Merge "Only use a fixed timestamp when packaging."
Dan Willemsen [Wed, 30 Sep 2015 23:44:10 +0000 (23:44 +0000)]
am
edc3e6cd: Merge "Sort more instances of wildcard and find"
* commit '
edc3e6cd6a0d6af4df3d6f07f40de17980b66ad0':
Sort more instances of wildcard and find
Dan Willemsen [Wed, 30 Sep 2015 23:44:01 +0000 (23:44 +0000)]
am
604e532f: Merge "Add all-cpp-files-under"
* commit '
604e532f842fa38982eb47708e3afb5415ba4b72':
Add all-cpp-files-under
Tao Bao [Wed, 30 Sep 2015 23:01:14 +0000 (16:01 -0700)]
Only use a fixed timestamp when packaging.
[1] changed to use a fixed timestamp for all the generated images
(either the one under $ANDROID_PRODUCT_OUT/ or the one added into the
target_files zip). It makes 'adb sync' after 'fastboot flashall' to
resync all the files. This CL changes to use a fixed timestamp only when
packaging into the target_files zip.
[1]: commit
052ae3542be93d30108e742c5c21d5c45d9b7cf8
Bug:
24377993
Bug:
24536411
Change-Id: I209318966109fd4902468dfe96caf777464f9fe1
Colin Cross [Wed, 30 Sep 2015 22:41:51 +0000 (15:41 -0700)]
Have all targets in build.ninja
We should pass --gen_all_targets to have targets which are not declared
as .PHONY. However, this triggers some nasty behavior inherited from
make, where targets can get variables from things that depend on them.
--gen_all_targets will traverse the targets starting at random points in
the dependency tree, and any variables set higher in the tree will not
be visible. To work around this, keep --gen_all_phony_targets, which
will start traversing at the phony targets first. This will enter the
tree traversal at points we know don't use inherited variables, like
checkbuild or the PARSE_TIME_MAKE_GOALS, and will reach all the
dependencies that use inherited variables in the right order.
--gen_all_targets will then fill in any remaining targets that were not
in the main dependency tree, and hopefully none of them use any
inherited variables.
Bug:
24384320
Change-Id: I1ff07b7ef26e9481baae678e7fe0933b6d05f2a7
Dan Willemsen [Wed, 30 Sep 2015 22:36:30 +0000 (22:36 +0000)]
Merge "Sort more instances of wildcard and find"
Dan Willemsen [Tue, 29 Sep 2015 23:30:21 +0000 (16:30 -0700)]
Sort more instances of wildcard and find
Many of these may not make a difference in the output images, but it's a
good idea to keep the make system as repeatable as possible.
Change-Id: I31804b8ad5805148ed08be7426a242a16f4d0df3
Dan Willemsen [Wed, 30 Sep 2015 22:15:50 +0000 (22:15 +0000)]
Merge "Add all-cpp-files-under"
David Zeuthen [Wed, 30 Sep 2015 21:59:11 +0000 (21:59 +0000)]
am
2fb9d090: am
0238e879: Merge "envsetup.sh: Add \'provision\' function."
* commit '
2fb9d0904f25f01cbe87603abad0fc55bccdeaf4':
envsetup.sh: Add 'provision' function.
Kenny Root [Wed, 30 Sep 2015 21:53:51 +0000 (14:53 -0700)]
Remove old grandfathered ALL_PREBUILTS
Many of the packages on ALL_PREBUILTS grandfathered list are no longer
in the tree. Remove them to whittle the list down, so we can tackle the
remaining items.
Change-Id: Id6c026727ed7bef36d1803719df05d2e50afc5cc
David Zeuthen [Wed, 30 Sep 2015 21:51:55 +0000 (21:51 +0000)]
am
0238e879: Merge "envsetup.sh: Add \'provision\' function."
* commit '
0238e879893bbbbab4e75b0fd1355c43547ca31e':
envsetup.sh: Add 'provision' function.
Colin Cross [Wed, 30 Sep 2015 21:48:16 +0000 (21:48 +0000)]
am
850ca4fd: am
cd7bcd86: Merge "Move ninja files to "
* commit '
850ca4fd372b532e3edf7b85ec399901ffd51b84':
Move ninja files to $(OUT_DIR)
David Zeuthen [Wed, 30 Sep 2015 21:45:40 +0000 (21:45 +0000)]
Merge "envsetup.sh: Add 'provision' function."
Colin Cross [Wed, 30 Sep 2015 21:43:14 +0000 (21:43 +0000)]
am
cd7bcd86: Merge "Move ninja files to "
* commit '
cd7bcd86e5b7a8ba5cd6dde7dda04cadcf656e56':
Move ninja files to $(OUT_DIR)
Colin Cross [Wed, 30 Sep 2015 21:35:52 +0000 (21:35 +0000)]
Merge "Move ninja files to $(OUT_DIR)"
Colin Cross [Wed, 30 Sep 2015 04:37:40 +0000 (21:37 -0700)]
Move ninja files to $(OUT_DIR)
Move the ninja files from $(PRODUCT_OUT)/build.ninja to
$(OUT_DIR)/build-$(TARGET_PRODUCT).ninja. This will improve incremental
builds of host modules after swithing target products, because the
.ninja_deps file will be accurate across builds.
Change-Id: Ia12746ccde0de31f6fccd111b2bdbd48fc6900d7
David Zeuthen [Wed, 30 Sep 2015 21:10:48 +0000 (17:10 -0400)]
envsetup.sh: Add 'provision' function.
This will run ${ANDROID_PRODUCT_OUT}/provision-device which in turn can
run fastboot (and other vendor-specific bits, if needed) to repartition
the device and reflash all partitions with known versions. Options
passed to the 'provision' command will be passed on to said script which
is expected to pass them on to fastboot.
Since this is a rather destructive operation involving data loss etc.,
user confirmation is required. This confirmation can be bypassed using
the option --no-confirmation.
Change-Id: Iec5667f2f5070b95d2eb70ad1b2984909ae4184c
Alex Deymo [Wed, 30 Sep 2015 20:16:46 +0000 (20:16 +0000)]
am
dbfe5a7e: am
06ba28c3: Merge "Pack the update_engine_config.txt when using the A/B OTA updater."
* commit '
dbfe5a7ecb3d891201ffcb255d4d6af62b5d07ff':
Pack the update_engine_config.txt when using the A/B OTA updater.
Baligh Uddin [Wed, 30 Sep 2015 20:15:34 +0000 (20:15 +0000)]
am
dffe42e7: am
d9cdf5be: am
22ff0124: (-s ours) Merge "add otatools-package target" into cw-d-mr1-dev
* commit '
dffe42e7f6868878cf70a725e266fc0d872d7f23':
add otatools-package target
Baligh Uddin [Wed, 30 Sep 2015 20:11:08 +0000 (20:11 +0000)]
am
d9cdf5be: am
22ff0124: (-s ours) Merge "add otatools-package target" into cw-d-mr1-dev
* commit '
d9cdf5be20b8804d289da24e60724245ad7d15eb':
add otatools-package target
Alex Deymo [Wed, 30 Sep 2015 20:10:45 +0000 (20:10 +0000)]
am
06ba28c3: Merge "Pack the update_engine_config.txt when using the A/B OTA updater."
* commit '
06ba28c31e9bea93ae3e3994bfe766a0a4a0073e':
Pack the update_engine_config.txt when using the A/B OTA updater.
Baligh Uddin [Wed, 30 Sep 2015 18:39:15 +0000 (18:39 +0000)]
am
22ff0124: (-s ours) Merge "add otatools-package target" into cw-d-mr1-dev
* commit '
22ff0124fdde970072cea303b4328024994cd78c':
add otatools-package target
Alex Deymo [Wed, 30 Sep 2015 18:08:20 +0000 (18:08 +0000)]
Merge "Pack the update_engine_config.txt when using the A/B OTA updater."
Alex Deymo [Wed, 30 Sep 2015 02:05:37 +0000 (19:05 -0700)]
Pack the update_engine_config.txt when using the A/B OTA updater.
This config file pulled directly from the source specifies the update
payload version supported by the code. When generating an incremental
update payload for the A/B updater, the generated payload format will
match the version supported by the old version.
Bug:
24406755
Test: `make dist` on Brillo.
Change-Id: Ib7ac6828d0d34eb31e786dbaae5d59ecf26c3576
Colin Cross [Wed, 30 Sep 2015 05:22:29 +0000 (05:22 +0000)]
am
9fc7d3d6: am
2ce7528a: Merge "makeparallel needs global CFLAGS now"
* commit '
9fc7d3d61e0e2061e662bfb99f7e86d5a9a68fd8':
makeparallel needs global CFLAGS now
Colin Cross [Wed, 30 Sep 2015 05:17:20 +0000 (05:17 +0000)]
am
2ce7528a: Merge "makeparallel needs global CFLAGS now"
* commit '
2ce7528a92d132523317dcb1252cf0c47459038b':
makeparallel needs global CFLAGS now
Colin Cross [Wed, 30 Sep 2015 05:12:33 +0000 (05:12 +0000)]
Merge "makeparallel needs global CFLAGS now"
Colin Cross [Wed, 30 Sep 2015 04:54:33 +0000 (21:54 -0700)]
makeparallel needs global CFLAGS now
After
3ad354951923f5c3593dd5f957ecd518126b41bc (Don't add CFLAGS to
CPPFLAGS), makeparallel now needs to explicitly include CFLAGS like
kati.
Change-Id: Ib50328da147f03647bb5b99f6d69948d644eece9
Colin Cross [Wed, 30 Sep 2015 00:11:42 +0000 (17:11 -0700)]
Move the dist-as-droid handling from make to ninja
dist is a strange dual-use target, as both a flag and a goal. make dist
<target> means build <target>, but copy any dist-for-goals files to
$DIST_DIR. make dist without a target means build droid with
dist-for-goals files. This requires special handling of MAKECMDGOALS to
detect the case where dist is the only goal, which breaks when ninja.mk
doesn't pass all the goals to kati. Instead, let ninja handle the
default goal. Pass dist to kati if it is specified in order to turn on
the dist-for-goal rules, but filter it out of the goals passed to
ninja. If there are any other goals, ninja will build them. If there
are no goals, ninja will fall back to the default goal, which is droid.
Change-Id: Iafb184d28cb312cb7c5682cd3ff4f310b2d9f7e9
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
Colin Cross [Tue, 29 Sep 2015 22:54:59 +0000 (22:54 +0000)]
am
1197f00e: am
12d7867f: Merge changes If34a7900,Iaea1f158
* commit '
1197f00e40d71ece08523401d4cd74acd2037680':
Revert "Have all targets in build.ninja"
Revert "Pass all goals to kati when "dist" is in goals"
Colin Cross [Tue, 29 Sep 2015 22:47:50 +0000 (22:47 +0000)]
am
12d7867f: Merge changes If34a7900,Iaea1f158
* commit '
12d7867f5fe23203de952b7f876d01d63f8294d1':
Revert "Have all targets in build.ninja"
Revert "Pass all goals to kati when "dist" is in goals"
Colin Cross [Tue, 29 Sep 2015 22:41:42 +0000 (22:41 +0000)]
Merge changes If34a7900,Iaea1f158
* changes:
Revert "Have all targets in build.ninja"
Revert "Pass all goals to kati when "dist" is in goals"
Ying Wang [Tue, 29 Sep 2015 22:09:31 +0000 (22:09 +0000)]
am
e7b833c2: am
98f3c213: am
cb31a535: Dist the otatools package.
* commit '
e7b833c24f2d9326d484188aa2026c726ff1422e':
Dist the otatools package.
Ying Wang [Tue, 29 Sep 2015 22:04:28 +0000 (22:04 +0000)]
am
98f3c213: am
cb31a535: Dist the otatools package.
* commit '
98f3c213df26b7d997d6171882a7f02b90e1cb2b':
Dist the otatools package.