OSDN Git Service
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."
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
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.
Ying Wang [Tue, 29 Sep 2015 21:57:09 +0000 (21:57 +0000)]
am
cb31a535: Dist the otatools package.
* commit '
cb31a535077947e45a97ef31a04b6a3b211ceb25':
Dist the otatools package.
Claes Elgemark [Wed, 1 Apr 2015 09:29:29 +0000 (11:29 +0200)]
Don't fail build of otatools if there are no device certificates
Bug:
23552169
Change-Id: I32723701d952ef2243ce0234132fa9876f0f21b6
(cherry picked from commit
8d771971212069f77851163f437c782f581bf6db)
Baligh Uddin [Tue, 29 Sep 2015 21:53:25 +0000 (21:53 +0000)]
Merge "add otatools-package target" into cw-d-mr1-dev
Ying Wang [Tue, 25 Aug 2015 00:13:53 +0000 (17:13 -0700)]
Dist the otatools package.
Bug:
23495952
(cherry picked from commit
267e957373765ad1e3ce89abe61886a305277027)
Change-Id: I49fcb9fed599268a9d37de7b14280eeb65c34788
(cherry picked from commit
fc028e59c2bc36297f23cdf2ee4fe9b1b60aa1cd)
Doug Zongker [Fri, 22 Aug 2014 15:04:58 +0000 (08:04 -0700)]
add otatools-package target
Add a target to zip up all the otatools and releasetools, for easy
copying to the OTA builder machine.
Change-Id: I55a6d93c1de75ac936d941c0e3ae72897407f563
(cherry picked from commit
f22b0f43efbc16c548692dc239a387edda15d78f)
(cherry picked from commit
32bf3f32651ddff9ffa2168017d71ec4b151a0a9)
Colin Cross [Tue, 29 Sep 2015 21:15:58 +0000 (14:15 -0700)]
Revert "Have all targets in build.ninja"
--gen_all_targets seems to be dropping some intermediate targets,
causing problems when kati is passed a goal and then ninja is run with
checkbuild as a goal, for example with:
m -j PRODUCT-aosp_flounder-userdebug checkbuild
This reverts commit
92bbf5667d2d16682477556cb55e0d2f0a3b1e14.
Change-Id: If34a790028f8da98fcc713e3f7000d06c63dcf80
Colin Cross [Tue, 29 Sep 2015 20:20:47 +0000 (13:20 -0700)]
Revert "Pass all goals to kati when "dist" is in goals"
This isn't actually necessary, dist doesn't use MAKEDISTGOALS other than
to check if it contains any other real targets. The real issue is
caused by --gen_all_targets, and is broader than just "dist".
This reverts commit
d3701e9e967a7e1e97aa365af4c0080d3bad929e.
Change-Id: Iaea1f158dbd1d4b9035954efef40b33485e6c6b3
Ying Wang [Tue, 29 Sep 2015 18:28:43 +0000 (18:28 +0000)]
am
20e017b5: am
b1bee75f: am
3d6e194e: am
393c6254: Really include drawables for all densities.
* commit '
20e017b56209ecbdc003540fa618b91cbee51418':
Really include drawables for all densities.
Ying Wang [Tue, 29 Sep 2015 18:21:35 +0000 (18:21 +0000)]
am
b1bee75f: am
3d6e194e: am
393c6254: Really include drawables for all densities.
* commit '
b1bee75f79fb4addd25abb573e67ee66ce1f7ba6':
Really include drawables for all densities.
Ying Wang [Tue, 29 Sep 2015 18:13:03 +0000 (18:13 +0000)]
am
3d6e194e: am
393c6254: Really include drawables for all densities.
* commit '
3d6e194eafbb441c79d4cd306af85eeb34fb75e8':
Really include drawables for all densities.
Ying Wang [Tue, 29 Sep 2015 18:07:41 +0000 (18:07 +0000)]
am
393c6254: Really include drawables for all densities.
* commit '
393c62549a6340b3473f14b71d583e118d7e6a6d':
Really include drawables for all densities.
Tao Bao [Tue, 29 Sep 2015 17:47:49 +0000 (17:47 +0000)]
am
5bd910a5: am
7e9b4ec4: Merge "Pack libdivsufsort.so into otatools.zip."
* commit '
5bd910a56e90025539abe432e01c72f3bea15a2d':
Pack libdivsufsort.so into otatools.zip.
Tao Bao [Tue, 29 Sep 2015 17:42:44 +0000 (17:42 +0000)]
am
7e9b4ec4: Merge "Pack libdivsufsort.so into otatools.zip."
* commit '
7e9b4ec44c63cb2e89388250aa6547aa6eddcab8':
Pack libdivsufsort.so into otatools.zip.
Tao Bao [Tue, 29 Sep 2015 17:38:14 +0000 (17:38 +0000)]
Merge "Pack libdivsufsort.so into otatools.zip."
Colin Cross [Tue, 29 Sep 2015 17:18:54 +0000 (17:18 +0000)]
am
96caa978: am
02d04b4d: Merge "Pass all goals to kati when "dist" is in goals"
* commit '
96caa97814b2c439030dac0f2fc73aa87627ddcd':
Pass all goals to kati when "dist" is in goals
Colin Cross [Tue, 29 Sep 2015 17:13:24 +0000 (17:13 +0000)]
am
02d04b4d: Merge "Pass all goals to kati when "dist" is in goals"
* commit '
02d04b4ddceba1a949f2d3d3abf0e5bcb8508cbc':
Pass all goals to kati when "dist" is in goals
Colin Cross [Tue, 29 Sep 2015 17:09:03 +0000 (17:09 +0000)]
Merge "Pass all goals to kati when "dist" is in goals"
Ying Wang [Fri, 12 Jun 2015 17:33:59 +0000 (10:33 -0700)]
Really include drawables for all densities.
Previously with "PRODUCT_AAPT_CONFIG := normal" resource with modifier
"small" isn't included.
Bug:
21643610
Change-Id: I53940d716fb9705462b1abb882e04103e211f8af
Nicolas Geoffray [Tue, 29 Sep 2015 09:08:40 +0000 (09:08 +0000)]
am
3f054bdd: am
506857e9: Merge "Make linker configurable through environment."
* commit '
3f054bdd0d8201c6ebc7f5037a3af685d8eb8062':
Make linker configurable through environment.
Nicolas Geoffray [Tue, 29 Sep 2015 09:04:59 +0000 (09:04 +0000)]
am
506857e9: Merge "Make linker configurable through environment."
* commit '
506857e974ed1aac60bff96a71d0eb182865bed8':
Make linker configurable through environment.
Nicolas Geoffray [Tue, 29 Sep 2015 08:34:28 +0000 (08:34 +0000)]
Merge "Make linker configurable through environment."
Shinichiro Hamaji [Tue, 29 Sep 2015 07:07:13 +0000 (07:07 +0000)]
am
753550d1: am
03d8b188: Merge "Have all targets in build.ninja"
* commit '
753550d153507c2bc69a4aa573e12568dd3a7c4a':
Have all targets in build.ninja
Shinichiro Hamaji [Tue, 29 Sep 2015 06:58:51 +0000 (06:58 +0000)]
am
03d8b188: Merge "Have all targets in build.ninja"
* commit '
03d8b18881d845a22c44727c8156cada16630b49':
Have all targets in build.ninja
Shinichiro Hamaji [Tue, 29 Sep 2015 06:55:33 +0000 (06:55 +0000)]
Merge "Have all targets in build.ninja"
Shinichiro Hamaji [Tue, 29 Sep 2015 06:50:28 +0000 (15:50 +0900)]
Pass all goals to kati when "dist" is in goals
Bug:
24339367
Change-Id: Iee80d65fe169ec005900a96446aa7a432fc68872
Shinichiro Hamaji [Tue, 29 Sep 2015 05:18:59 +0000 (14:18 +0900)]
Have all targets in build.ninja
We should pass --gen_all_targets instead of --gen_all_phony_targets
to have targets which are not declared as .PHONY.
Bug:
24384320
Change-Id: I616d8c74e6efd9d69b1a935cfc5116b716f100ff
Shinichiro Hamaji [Tue, 29 Sep 2015 04:08:47 +0000 (04:08 +0000)]
am
31966bdb: am
ad8df5ad: Merge "Reland: Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"
* commit '
31966bdb8c3e4c001736fc714a9baf8fa2c2acb2':
Reland: Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS
Shinichiro Hamaji [Tue, 29 Sep 2015 04:03:44 +0000 (04:03 +0000)]
am
ad8df5ad: Merge "Reland: Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"
* commit '
ad8df5adac7d844014f74c60ce40e3cae02e5eaf':
Reland: Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS
Shinichiro Hamaji [Tue, 29 Sep 2015 03:54:59 +0000 (03:54 +0000)]
Merge "Reland: Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"
Colin Cross [Tue, 29 Sep 2015 01:52:46 +0000 (01:52 +0000)]
am
7ee3b85e: resolved conflicts for
953981db to stage-aosp-master
* commit '
7ee3b85eba08304cb9e396aaf52a77729f125532':
Don't add dependencies on Makefiles when using ninja
Colin Cross [Tue, 29 Sep 2015 01:45:23 +0000 (18:45 -0700)]
resolved conflicts for
953981db to stage-aosp-master
Change-Id: Ic1003a594ac5e5e91b124f249a569fb81123e973
Colin Cross [Tue, 29 Sep 2015 01:09:51 +0000 (01:09 +0000)]
Merge "Don't add dependencies on Makefiles when using ninja"
Stephen Hines [Tue, 29 Sep 2015 01:07:21 +0000 (18:07 -0700)]
Fix RS NDK usage so we always pull from "current" instead of NDK 8.
The 8 in this definition refers to NDK release 8, not the API level 8.
Setting it to "current" is better, since it still contains the relevant
target API level (9 in our case) for using/building our RS support APIs.
Change-Id: Ib216ea859e137643fba81c39c4b9d0077ec04455
Colin Cross [Mon, 28 Sep 2015 23:49:46 +0000 (23:49 +0000)]
am
98da13bb: resolved conflicts for
6c3bf1b8 to stage-aosp-master
* commit '
98da13bbd2db4b2247b90d83deec5e8befbee536':
Use zip -q for adding shared libraries
Tao Bao [Mon, 28 Sep 2015 23:37:27 +0000 (16:37 -0700)]
Pack libdivsufsort.so into otatools.zip.
This is to support the change to bsdiff which depends on
libdivsufsort.so and libdivsufsort64.so now.
Bug:
24332905
Change-Id: I232fc1b2abda67456f012a83fa4f69a99bc6ea14
Colin Cross [Mon, 28 Sep 2015 23:41:45 +0000 (16:41 -0700)]
resolved conflicts for
6c3bf1b8 to stage-aosp-master
Change-Id: If93ed1d9229f7fbe750f85ea4b3c3e4fce5dbb29
Colin Cross [Mon, 28 Sep 2015 23:26:00 +0000 (16:26 -0700)]
Don't add dependencies on Makefiles when using ninja
Ninja has an implicit dependency on the command being run, and kati will
regenerate the ninja manifest if any read makefile changes, so there is no
need to have dependencies on makefiles.
This won't catch all the cases where LOCAL_ADDITIONAL_DEPENDENCIES contains
a .mk file, because a few users of LOCAL_ADDITIONAL_DEPENDENCIES don't
include base_rules.mk, but it will fix the most common ones.
Bug:
23566977
Change-Id: I66de882421376303ab7233c8ce7274548f6b2199
Colin Cross [Mon, 28 Sep 2015 23:23:40 +0000 (23:23 +0000)]
Merge "Use zip -q for adding shared libraries"
Colin Cross [Mon, 28 Sep 2015 23:15:09 +0000 (16:15 -0700)]
Use zip -q for adding shared libraries
Make zip quiet when adding shared libraries to apks.
Bug:
24409581
Change-Id: I540510eb6e051b5fc9d1d2a7fa5565a5b774a602
Colin Cross [Mon, 28 Sep 2015 23:13:46 +0000 (23:13 +0000)]
am
e06e961c: am
7edec14c: Merge "Set BUILDING_WITH_NINJA flag when parsing makefiles for ninja build"
* commit '
e06e961cc69b48e562f42464d4db0adc2b8d81d9':
Set BUILDING_WITH_NINJA flag when parsing makefiles for ninja build
Colin Cross [Mon, 28 Sep 2015 23:04:57 +0000 (23:04 +0000)]
am
7edec14c: Merge "Set BUILDING_WITH_NINJA flag when parsing makefiles for ninja build"
* commit '
7edec14c8dfe4e499cba0d77dc20bc985af1f586':
Set BUILDING_WITH_NINJA flag when parsing makefiles for ninja build
Shinichiro Hamaji [Thu, 24 Sep 2015 05:33:27 +0000 (14:33 +0900)]
Reland: Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS
Only goals that modify the parsing need to be passed to kati, filter out
everything else and only pass it to ninja.
Also, always specify --gen_all_phony_targets. With this flag, kati emits
all phony targets in the ninja file so a ninja file generated only with
PARSE_TIME_MAKE_GOALS can handle targets which don't change the parsing.
This is a reland attempt of
https://android-review.googlesource.com/#/c/172800/
The two issues should have been fixed by Ying in internal trees.
Bug:
24339367
Change-Id: I8ba2254f9bff271da2a7aa7684fd3d987e07c9d3
Colin Cross [Mon, 28 Sep 2015 23:00:46 +0000 (23:00 +0000)]
Merge "Set BUILDING_WITH_NINJA flag when parsing makefiles for ninja build"
Colin Cross [Mon, 28 Sep 2015 22:36:18 +0000 (22:36 +0000)]
am
5540a746: am
f262f906: Merge "Remove "preparing StaticLib" messages"
* commit '
5540a746b6bb52b6511ab58fe7c14822e23947c1':
Remove "preparing StaticLib" messages
Colin Cross [Mon, 28 Sep 2015 22:36:05 +0000 (15:36 -0700)]
Set BUILDING_WITH_NINJA flag when parsing makefiles for ninja build
Distinguish between parsing makefiles in make for a pre-ninja build,
parsing makefiles in kati for a ninja build, and parsing makefiles in
make for a non-ninja build by leaving USE_NINJA=true enabled for the
kati pass but also setting BUILDING_WITH_NINJA.
Change-Id: I63f1ce1efe08cd86fdf41f8051901f720b38cfaf
Colin Cross [Mon, 28 Sep 2015 22:26:54 +0000 (22:26 +0000)]
am
f262f906: Merge "Remove "preparing StaticLib" messages"
* commit '
f262f906f28f1abedb32b1645b7f1ed5c0abbe45':
Remove "preparing StaticLib" messages