OSDN Git Service
Than McIntosh [Thu, 22 Oct 2015 13:44:48 +0000 (09:44 -0400)]
Enable gold linker for aarch64.
Switches default linker from -fuse-ld-bfd to
-fuse-ld=gold, and enables -Wl,--icf=safe. This
changes reduces /system/lib64/*.so text size
by about 2% for N9.
Change-Id: I0ef2483e1c47c34e63292dad6f6bf532359b733e
Tao Bao [Fri, 16 Oct 2015 22:41:45 +0000 (22:41 +0000)]
Merge "common.py: Fix the build."
Tao Bao [Fri, 16 Oct 2015 22:26:34 +0000 (15:26 -0700)]
common.py: Fix the build.
Should only use source_info_dict when creating incremental OTAs.
Change-Id: I6a4e5f8fa3613a1b36563ec915e433247965a2b8
Tao Bao [Fri, 16 Oct 2015 21:42:34 +0000 (21:42 +0000)]
Merge "Pass source's info_dict to vendor's releasetools.py."
Ying Wang [Fri, 16 Oct 2015 01:19:48 +0000 (01:19 +0000)]
Merge "Use direct dependency on the JNI so files."
Ying Wang [Thu, 15 Oct 2015 22:29:01 +0000 (15:29 -0700)]
Use direct dependency on the JNI so files.
With the order-only dependency if the jni so files is updated,
make won't rebuild the system.img, which has dependency only on the apk
file.
Bug:
24865400
Change-Id: I9d5bee82b8a712a2c24dabaa0cd4c50174ea219f
Dan Albert [Thu, 15 Oct 2015 18:39:42 +0000 (18:39 +0000)]
Merge "Use libgcov OR libclang_rt.profile, not both."
Ying Wang [Thu, 15 Oct 2015 18:35:26 +0000 (18:35 +0000)]
Merge "Remove duplicate local_time.default"
Steve Fung [Thu, 15 Oct 2015 18:13:41 +0000 (18:13 +0000)]
Merge "Add the Product ID to target_files.zip"
Nick Kralevich [Thu, 15 Oct 2015 09:42:17 +0000 (09:42 +0000)]
Merge "generic_x86: delete system_server execmem"
Nick Kralevich [Thu, 15 Oct 2015 09:37:40 +0000 (02:37 -0700)]
generic_x86: delete system_server execmem
https://android-review.googlesource.com/175922 removed all uses
of system_server execmem and neverallowed it. The x86 emulator policy
inappropriately includes this rule. Delete it.
Fixes the following build breakage:
libsepol.report_failure: neverallow on line 473 of external/sepolicy/system_server.te (or line 12452 of policy.conf) violated by allow system_server system_server:process { execmem };
libsepol.check_assertions: 1 neverallow failures occurred
Error while expanding policy
Change-Id: I7fbfaa0a09e8f4e8a372d2f1a64bbe58d5302204
Peter Qiu [Thu, 15 Oct 2015 04:00:38 +0000 (04:00 +0000)]
Merge "Export include path to D-Bus headers for multilib builds"
Ying Wang [Thu, 15 Oct 2015 01:10:44 +0000 (01:10 +0000)]
Merge "Use @arg-lsit-file for jar in add-carried-jack-resources"
Ying Wang [Wed, 14 Oct 2015 01:40:37 +0000 (18:40 -0700)]
Use @arg-lsit-file for jar in add-carried-jack-resources
Don't pass the arg list as argument in any bash command;
Instead store the arg list to the arg list file and
run "jar @arg-lsit-file".
Note we need to quote the arguments in the arg list file.
This fixed "argument list too long" build error on Mac.
Bug:
24789595
Change-Id: I718f84e540d82bb83516824894a473b2961da278
Peter Qiu [Wed, 14 Oct 2015 23:46:41 +0000 (16:46 -0700)]
Export include path to D-Bus headers for multilib builds
Bug:None
Change-Id: I6e3898c71f54ede08a27f5be93e95a2b219e5ea6
Ying Wang [Wed, 14 Oct 2015 23:09:14 +0000 (23:09 +0000)]
Merge "Revert "Use @arg-lsit-file for jar in add-carried-jack-resources""
Ying Wang [Wed, 14 Oct 2015 23:08:53 +0000 (23:08 +0000)]
Revert "Use @arg-lsit-file for jar in add-carried-jack-resources"
This reverts commit
16f93d5661afe23229ab3b08ddd5fde9bc9c7eb8.
Change-Id: I925dae6a2d07792c61fcd3b6fd8718391ab993f8
Steve Fung [Wed, 14 Oct 2015 22:54:51 +0000 (15:54 -0700)]
Add the Product ID to target_files.zip
When using the A/B updater, include the product id string to
target_files.zip.
This is needed by the Omaha backend.
Bug:
24946811
Change-Id: I2ce5f6cffe440c29a1820348ee215c71cec07861
Ying Wang [Wed, 14 Oct 2015 21:43:41 +0000 (21:43 +0000)]
Merge "Use @arg-lsit-file for jar in add-carried-jack-resources"
Sami Tolvanen [Wed, 14 Oct 2015 20:49:32 +0000 (20:49 +0000)]
Merge "Disable verity metadata for eng builds"
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
Ying Wang [Wed, 14 Oct 2015 01:40:37 +0000 (18:40 -0700)]
Use @arg-lsit-file for jar in add-carried-jack-resources
Don't pass the arg list as argument in any bash command;
Instead store the arg list to the arg list file and
run "jar @arg-lsit-file".
This fixed "argument list too long" build error on Mac.
Bug:
24789595
Change-Id: I3e5cd18fd988f12f0876b152b8bf07d07b56119e
Ying Wang [Wed, 14 Oct 2015 01: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
Tao Bao [Tue, 13 Oct 2015 23:37:12 +0000 (16:37 -0700)]
Pass source's info_dict to vendor's releasetools.py.
When building incremental packages, the info_dict from the source build
should be the one in use. We have done that for most of the partitions
(system and etc.), and should pass that to vendor's script as well.
Bug:
24898607
Change-Id: Ie2973d41b905637862616286663baf80df83bd88
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 08:26:16 +0000 (08:26 +0000)]
Merge "Fix for Java 8 toolchain builds"
Shinichiro Hamaji [Tue, 13 Oct 2015 05:35:50 +0000 (05:35 +0000)]
Merge "Stop passing --gen_all_phony_targets to kati"
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
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
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
Dan Albert [Thu, 8 Oct 2015 21:16:39 +0000 (14:16 -0700)]
Use libgcov OR libclang_rt.profile, not both.
Using both can cause duplicate symbol errors.
Change-Id: Id8ee13a81d32e3248ff1cdc468f49a26ecde6b57
Yohann Roussel [Thu, 8 Oct 2015 08:46:45 +0000 (08:46 +0000)]
Merge "Ensure dump-words-to-file creates the target"
Chih-Wei Huang [Thu, 8 Oct 2015 07:07:23 +0000 (15:07 +0800)]
Remove duplicate local_time.default
Seems it's copied from target/product/generic_no_telephony.mk
which had duplicate local_time.default before.
(fixed in commit
567ea28838678f1cea789538dbf79cd94db1f2d9)
Change-Id: I09dcdffc14de08b3d25a5fd08364d38b2712bb08
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
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: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: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: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: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: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"
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 [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"
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.
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: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.
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: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: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"
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
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: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"
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 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: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: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
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