OSDN Git Service
Dan Willemsen [Thu, 29 Oct 2015 21:33:39 +0000 (21:33 +0000)]
Merge "Revert "Remove changing uids/timestamps from zip/jar files""
am:
49d8c5196e
* commit '
49d8c5196eb690fc987673c27cb61087c5886be4':
Revert "Remove changing uids/timestamps from zip/jar files"
Dan Willemsen [Thu, 29 Oct 2015 21:28:17 +0000 (21:28 +0000)]
Merge "Revert "Remove changing uids/timestamps from zip/jar files""
Dan Willemsen [Thu, 29 Oct 2015 21:26:18 +0000 (21:26 +0000)]
Revert "Remove changing uids/timestamps from zip/jar files"
This reverts commit
3c2c064c8791ed2d4b9d6780d7b87f406ab78f10.
zipalign depends on libandroidfw, and some setups don't include frameworks/base.
Bug:
24201956
Change-Id: I48ee95808924f6b2221f0a49ab205c2565096b1f
Dan Willemsen [Thu, 29 Oct 2015 19:12:37 +0000 (19:12 +0000)]
Merge "Remove changing uids/timestamps from zip/jar files"
am:
9f25219371
* commit '
9f252193714c82dbce702e8055ffaa7eec4afe66':
Remove changing uids/timestamps from zip/jar files
Dan Willemsen [Thu, 29 Oct 2015 19:07:36 +0000 (19:07 +0000)]
Merge "Remove changing uids/timestamps from zip/jar files"
Dan Willemsen [Tue, 27 Oct 2015 23:25:29 +0000 (16:25 -0700)]
Remove changing uids/timestamps from zip/jar files
Pass -X to zip so that Unix UID/GID and extra timestamps aren't
saved into the zip files.
Add a new option to zipalign, -t, to replace all timestamps with static
timestamps (2008 Jan 1 00:00:00). Use this for all non-APK zip files.
APK zip timestamps are set based on the certificate date in SignApk.
Bug:
24201956
Change-Id: Ifb619fc499ba9d99fc624f2acd5f8de36d78ef8e
Tao Bao [Thu, 29 Oct 2015 16:45:31 +0000 (16:45 +0000)]
Merge "Honor TARGET_NO_RECOVERY flag."
am:
c448e91c3d
* commit '
c448e91c3d3d095f8f200c9925f7db2ad525132f':
Honor TARGET_NO_RECOVERY flag.
Sami Tolvanen [Thu, 29 Oct 2015 16:45:14 +0000 (16:45 +0000)]
Merge "Error correction: Use block_image_recover in block OTAs"
am:
fe4e86c7fd
* commit '
fe4e86c7fd1b9c8903fda194b8515451c477ced9':
Error correction: Use block_image_recover in block OTAs
Tao Bao [Thu, 29 Oct 2015 16:13:52 +0000 (16:13 +0000)]
Merge "Honor TARGET_NO_RECOVERY flag."
Sami Tolvanen [Thu, 29 Oct 2015 16:05:46 +0000 (16:05 +0000)]
Merge "Error correction: Use block_image_recover in block OTAs"
Sami Tolvanen [Thu, 25 Jun 2015 10:48:29 +0000 (11:48 +0100)]
Error correction: Use block_image_recover in block OTAs
If block_image_verify fails, attempt to recover using FEC before giving up.
Bug:
21893453
Change-Id: Ibc1fe5d28b2a8099d2b5094277b572ec08229c3a
Ying Wang [Wed, 28 Oct 2015 23:55:10 +0000 (23:55 +0000)]
Merge "Normalize the product makefile path in inherit-product."
am:
aabff90bfe
* commit '
aabff90bfe2312a95d3cf57564845fef8dc469a2':
Normalize the product makefile path in inherit-product.
Ying Wang [Wed, 28 Oct 2015 23:51:57 +0000 (23:51 +0000)]
Merge "Normalize the product makefile path in inherit-product."
Ying Wang [Wed, 28 Oct 2015 21:33:40 +0000 (14:33 -0700)]
Normalize the product makefile path in inherit-product.
Some vendor product makefiles call $(inherit-product) on the same
product makefile with different paths, by using "../" in relative paths.
However inherit-product requires unique path as ID for a product
makefile, for bookkeeping purpose.
Normalize the product makefile path in inherit-product, if the path
contains "../".
Change-Id: I1a864ce120c713d8e79ec179213b9fc9352aba53
Colin Cross [Wed, 28 Oct 2015 21:12:02 +0000 (21:12 +0000)]
Merge "Remove use of .INTERMEDIATE"
am:
dda5e96b14
* commit '
dda5e96b144c15a75d625ceac7e92b50cf9c363a':
Remove use of .INTERMEDIATE
Colin Cross [Wed, 28 Oct 2015 21:09:05 +0000 (21:09 +0000)]
Merge "Remove use of .INTERMEDIATE"
Colin Cross [Wed, 28 Oct 2015 20:28:11 +0000 (13:28 -0700)]
Remove use of .INTERMEDIATE
make 3.81 has a bug where combining an up-to-date .INTERMEDIATE rule
with -j causes an infinite loop (http://savannah.gnu.org/bugs/?15919).
.INTERMEDIATE was only necessary to support multiple outputs while only
running a command once, remove .INTERMEDIATE by replacing
$(KATI_OUTPUTS) dependencies with $(KATI_BUILD_NINJA). We can assume
that $(KATI_NINJA_SH) will be updated at the same time as
$(KATI_BUILD_NINJA), and not explicitly depend on it.
Also remove generateonly and fastincremental, which are no longer
necessary and were overcomplicating ninja.mk. kati now always runs due
to FORCE, and ninja is run by a phony rule that depends on
$(KATI_BUILD_NINJA).
Bug:
25344116
Change-Id: I99d2713b1532ea11d83da9a11b1be26cfe13a5d2
Tao Bao [Wed, 28 Oct 2015 02:25:18 +0000 (19:25 -0700)]
Honor TARGET_NO_RECOVERY flag.
Don't generate recovery.img when calling 'make dist' if
TARGET_NO_RECOVERY is set. The build system passes the flag to the
packaging script which then generates recovery.img conditionally.
Bug:
25329471
Change-Id: Ifbc999300d5c31e897878f81e231ae7dd2aca660
Chih-hung Hsieh [Tue, 27 Oct 2015 23:12:23 +0000 (23:12 +0000)]
Merge "Move arm64 target to clang by default."
am:
befb82f204
* commit '
befb82f20429b469aaebf6c8e7d0a2c4a0d414e3':
Move arm64 target to clang by default.
Chih-hung Hsieh [Tue, 27 Oct 2015 23:12:13 +0000 (23:12 +0000)]
Merge "Move arm target to clang by default."
am:
873d394c54
* commit '
873d394c543e2d0ac96736db77b88e41acb5bc36':
Move arm target to clang by default.
Chih-hung Hsieh [Tue, 27 Oct 2015 23:02:26 +0000 (23:02 +0000)]
Merge "Move arm64 target to clang by default."
Chih-hung Hsieh [Tue, 27 Oct 2015 23:02:10 +0000 (23:02 +0000)]
Merge "Move arm target to clang by default."
Chih-Hung Hsieh [Tue, 27 Oct 2015 20:44:53 +0000 (13:44 -0700)]
Move arm64 target to clang by default.
Bug:
23163853
Change-Id: I59c311f552ca060bc7bd034fa4f1c03eb24802d5
Chih-Hung Hsieh [Tue, 27 Oct 2015 20:42:34 +0000 (13:42 -0700)]
Move arm target to clang by default.
Bug:
23163853
Change-Id: I4cb95ed652ca697461e2fb22811779aa2df8d262
Colin Cross [Tue, 27 Oct 2015 19:17:38 +0000 (19:17 +0000)]
Merge "Error out early on nonstandard JDK directory layouts"
am:
506113d267
* commit '
506113d2671e8f3dd5a46b63b7996accec6acb35':
Error out early on nonstandard JDK directory layouts
Colin Cross [Tue, 27 Oct 2015 19:12:40 +0000 (19:12 +0000)]
Merge "Error out early on nonstandard JDK directory layouts"
Ying Wang [Tue, 27 Oct 2015 18:49:07 +0000 (18:49 +0000)]
Merge "Revert "Enable gold linker for aarch64.""
am:
edfa0981c9
* commit '
edfa0981c958453215fbbfccdcf6d05662cf9583':
Revert "Enable gold linker for aarch64."
Ying Wang [Tue, 27 Oct 2015 18:36:47 +0000 (18:36 +0000)]
Merge "Revert "Enable gold linker for aarch64.""
Dan Albert [Tue, 27 Oct 2015 18:18:46 +0000 (18:18 +0000)]
Revert "Enable gold linker for aarch64."
Causes build failures on Darwin.
prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9/aarch64-linux-android/bin/ld.gold: warning: cannot scan executable section 5 of out/target/product/flounder/obj/SHARED_LIBRARIES/libdl_intermediates/libdl.o for Cortex-A53 erratum because it has no mapping symbols.
prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9/aarch64-linux-android/bin/ld.gold: warning: cannot scan executable section 8 of out/target/product/flounder/obj/SHARED_LIBRARIES/libdl_intermediates/libdl.o for Cortex-A53 erratum because it has no mapping symbols.
prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9/aarch64-linux-android/bin/ld.gold: warning: cannot scan executable section 11 of out/target/product/flounder/obj/SHARED_LIBRARIES/libdl_intermediates/libdl.o for Cortex-A53 erratum because it has no mapping symbols.
prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9/aarch64-linux-android/bin/ld.gold: error: treating warnings as errors
This reverts commit
127d110172818c7dce14fefcc72b07a18686ee9c.
Change-Id: I1d3de90f5ae777b66a8f94fbcc9ccde8a9e3001c
Ying Wang [Tue, 27 Oct 2015 00:12:53 +0000 (00:12 +0000)]
Merge "Strip LOCAL_MODULE before referencing it."
am:
411b2f90a9
* commit '
411b2f90a95e5a471f248ec769826cf22dd12296':
Strip LOCAL_MODULE before referencing it.
Ying Wang [Tue, 27 Oct 2015 00:08:05 +0000 (00:08 +0000)]
Merge "Strip LOCAL_MODULE before referencing it."
Ying Wang [Fri, 16 Oct 2015 00:47:09 +0000 (17:47 -0700)]
Strip LOCAL_MODULE before referencing it.
Bug:
24985980
Change-Id: Ic97e852aa7a8bf2d9224d3d6656d33145cc67800
(cherry-pick from commit
4d20a32a793a4a52d53b3a3a8e66cf04089093dc)
Dan Albert [Mon, 26 Oct 2015 21:10:15 +0000 (21:10 +0000)]
Merge "Drop GCC back to C++11."
am:
dba46710fe
* commit '
dba46710fe5bb0ea3bea8c3c0fea76273d343ff3':
Drop GCC back to C++11.
Dan Albert [Mon, 26 Oct 2015 21:05:39 +0000 (21:05 +0000)]
Merge "Drop GCC back to C++11."
Dan Albert [Mon, 26 Oct 2015 18:09:24 +0000 (11:09 -0700)]
Drop GCC back to C++11.
Our GCC does not use a valid C++14 ABI.
Bug: http://b/
25022512
Change-Id: I6f4b3450137c24a6a0c00bf956bae7a0ba280094
Than McIntosh [Mon, 26 Oct 2015 12:27:28 +0000 (12:27 +0000)]
Merge "Enable gold linker for aarch64."
am:
14c2d968b9
* commit '
14c2d968b913573e7a21fe72723254c9cc277210':
Enable gold linker for aarch64.
Than McIntosh [Mon, 26 Oct 2015 12:22:26 +0000 (12:22 +0000)]
Merge "Enable gold linker for aarch64."
Colin Cross [Sat, 24 Oct 2015 21:13:05 +0000 (21:13 +0000)]
Merge "Add dummy description for GET-INSTALL-PATH"
am:
9d192f1c10
* commit '
9d192f1c1090a757c9218296457482d2ba737989':
Add dummy description for GET-INSTALL-PATH
Colin Cross [Sat, 24 Oct 2015 21:09:34 +0000 (21:09 +0000)]
Merge "Add dummy description for GET-INSTALL-PATH"
Colin Cross [Sat, 24 Oct 2015 04:38:12 +0000 (21:38 -0700)]
Add dummy description for GET-INSTALL-PATH
kati takes the first @echo command in a rule and turns it in to a ninja
description that gets pretty-printed. The GET-INSTALL-PATH is only
@echo commands and is parsed by development/testrunner/runtest.py, so
it fails to parse the pretty-printed first test.
Add a dummy @echo to GET-INSTALL-PATH for kati to use as the
description, so the rest of the @echo commands are left unmodified.
Change-Id: I192fde48b26726a2f6760448f819243bd2f21312
Colin Cross [Fri, 23 Oct 2015 21:33:51 +0000 (14:33 -0700)]
Error out early on nonstandard JDK directory layouts
On Darwin, javac may be located in a nonstandard directory layout such as:
/System/Library/Frameworks/JavaVM.framework/Versions/Current/Commands/javac
The sed command to replace bin/javac with lib/tools.jar would fail to
match, resulting in the HOST_JDK_TOOLS_JAR being set to the javac path.
Since javac exists, the checks for missing tools.jar would all pass, and
javac would be added to the classpath instead of tools.jar, and causing
hard to debug errors about missing com.sun.javadoc when building doclava.
Change the sed command to replace /javac$, which should always be found,
with /../lib/tools.jar.
Change-Id: I5072f04636a5c14b3aeaa3a5cc3b366feae89c37
Ying Wang [Fri, 23 Oct 2015 20:24:52 +0000 (20:24 +0000)]
Merge "Normalize java source file paths before running "sort -u"."
am:
0d4dad46f4
* commit '
0d4dad46f44d6f4a498a1a8205a4b26ae2e55ac5':
Normalize java source file paths before running "sort -u".
Ying Wang [Fri, 23 Oct 2015 20:21:10 +0000 (20:21 +0000)]
Merge "Normalize java source file paths before running "sort -u"."
Ying Wang [Thu, 22 Oct 2015 23:30:00 +0000 (16:30 -0700)]
Normalize java source file paths before running "sort -u".
We rely on "sort -u" to dedupe aidl/logtags generated java files added
by both from $(all_java_sources) and from "find
$(PRIVATE_SOURCE_INTERMEDIATES_DIR) -name '*.java".
But "sort -u" doesn't work if any of the aidl/logtags source file path
has "../" in it.
This change fixes this issue by normalizing the source file paths before
passing them to "sort -u".
Change-Id: I12d2c4e0397bed9f426a1ed9b13608d72d01e0df
Tao Bao [Fri, 23 Oct 2015 18:45:35 +0000 (18:45 +0000)]
Merge "Bump up the BBOTA version to 4."
am:
ac4ec1a4ea
* commit '
ac4ec1a4ea83a150e08ccd43f30fe34de52cdebf':
Bump up the BBOTA version to 4.
Tao Bao [Fri, 23 Oct 2015 18:38:03 +0000 (18:38 +0000)]
Merge "Bump up the BBOTA version to 4."
Ying Wang [Fri, 23 Oct 2015 18:16:45 +0000 (18:16 +0000)]
Merge "Make sure R.stamp is always created"
am:
47e46f7725
* commit '
47e46f77257e172c3603208587cce55c0a9fc28f':
Make sure R.stamp is always created
Ying Wang [Fri, 23 Oct 2015 18:09:11 +0000 (18:09 +0000)]
Merge "Make sure R.stamp is always created"
Martin Arenlind [Tue, 15 Sep 2015 13:52:56 +0000 (15:52 +0200)]
Make sure R.stamp is always created
When an app has a resource directory, but the
directory contain no resources, R.stamp is not created.
This leads to that such apps are always rebuilt,
even when there are no changes.
This patch changes so that an empty R.stamp is
created even if there are no resources.
This leads to that affected apps are not rebuilt
unless changed.
Change-Id: Ia63e5b1913a4456402700b615ba7f9d56d2da852
Tao Bao [Wed, 21 Oct 2015 20:30:43 +0000 (13:30 -0700)]
Bump up the BBOTA version to 4.
To accommodate new changes (such as error correction in [1]) to BBOTA
in N release. We bump up the version to keep the OTA script backward
compatible.
Needs the matching CL in commit
1fdec8685af858c5ff4f45d2e3059186ab5ed2ab.
[1]: commit
0a7b47397db3648afe6f3aeb2abb175934c2cbca
Change-Id: Ib9158b455cd5905fe2d4742ce81feb1b7583054f
Alex Deymo [Fri, 23 Oct 2015 14:48:30 +0000 (14:48 +0000)]
Merge "Rename UPDATE_AB_PARTITIONS to AB_OTA_PARTITIONS."
am:
c82b873b9b
* commit '
c82b873b9b6c234da128cdbc0dde6624e45f5b6d':
Rename UPDATE_AB_PARTITIONS to AB_OTA_PARTITIONS.
Alex Deymo [Fri, 23 Oct 2015 14:45:05 +0000 (14:45 +0000)]
Merge "Rename UPDATE_AB_PARTITIONS to AB_OTA_PARTITIONS."
Alex Deymo [Fri, 23 Oct 2015 01:15:27 +0000 (18:15 -0700)]
Rename UPDATE_AB_PARTITIONS to AB_OTA_PARTITIONS.
In order to have all the A/B updater variables in the same AB_OTA_
namespace we rename UPDATE_AB_PARTITIONS to AB_OTA_PARTITIONS.
Bug: None
Test: `make dist` includes the partitions.txt file if properly configured.
Change-Id: Ied4faabd7e2f0ab8a5007afb44ad2f38df8d630d
Chih-hung Hsieh [Fri, 23 Oct 2015 00:30:05 +0000 (00:30 +0000)]
Merge "Move x86_64 target to clang by default."
am:
373a1e36a9
* commit '
373a1e36a99c7af15a00723c7561db3906281ab5':
Move x86_64 target to clang by default.
Chih-hung Hsieh [Fri, 23 Oct 2015 00:26:20 +0000 (00:26 +0000)]
Merge "Move x86_64 target to clang by default."
Chih-Hung Hsieh [Thu, 22 Oct 2015 23:29:59 +0000 (16:29 -0700)]
Move x86_64 target to clang by default.
Bug:
23163853
Change-Id: I0587ec75c0000ac99562233de33147ec8e120e65
Mike Frysinger [Thu, 22 Oct 2015 19:44:08 +0000 (19:44 +0000)]
Merge "use `find -exec ... +` everywhere"
am:
6ff6e9552c
* commit '
6ff6e9552c90d091adf4e3f686d2922585d8060f':
use `find -exec ... +` everywhere
Mike Frysinger [Thu, 22 Oct 2015 19:40:43 +0000 (19:40 +0000)]
Merge "use `find -exec ... +` everywhere"
Tao Bao [Thu, 22 Oct 2015 19:11:12 +0000 (19:11 +0000)]
Merge "Fix calculation of stashed blocks."
am:
db08d835d0
* commit '
db08d835d0d071b27fc6fcf14e0cf261a5f18f68':
Fix calculation of stashed blocks.
Tao Bao [Thu, 22 Oct 2015 18:57:42 +0000 (18:57 +0000)]
Merge "Fix calculation of stashed blocks."
Tao Bao [Thu, 22 Oct 2015 18:12:56 +0000 (18:12 +0000)]
Merge "blockimgdiff.py: Fix the script error for BBOTA v1."
am:
bcb9240a2b
* commit '
bcb9240a2b168c711e4a9543e9d34f9c58a6f0c2':
blockimgdiff.py: Fix the script error for BBOTA v1.
Tao Bao [Thu, 22 Oct 2015 18:09:27 +0000 (18:09 +0000)]
Merge "blockimgdiff.py: Fix the script error for BBOTA v1."
Mike Frysinger [Tue, 22 Sep 2015 22:13:48 +0000 (18:13 -0400)]
use `find -exec ... +` everywhere
This is more efficient as find itself can handle correctly passing
arguments down to the command, and this is in POSIX. The current
versions of OS X also support this form.
BUG=None
TEST=mgrep still works
Change-Id: Ie570867609113868daaf068658c4f7e6f4ae42fa
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
Yohann Roussel [Thu, 22 Oct 2015 10:50:40 +0000 (10:50 +0000)]
Merge changes from topic \'jack-server-1.3-a3\'
am:
e0c7b4ec96
* commit '
e0c7b4ec96d4aa584f79a24aea7c682a114143d8':
Remove LOCAL_JACK_EXTRA_ARGS
Allow control of jack used for compilation
Clean call-jack and its callers
Yohann Roussel [Thu, 22 Oct 2015 10:46:37 +0000 (10:46 +0000)]
Merge changes from topic 'jack-server-1.3-a3'
* changes:
Remove LOCAL_JACK_EXTRA_ARGS
Allow control of jack used for compilation
Clean call-jack and its callers
caozhiyuan [Wed, 21 Oct 2015 07:14:03 +0000 (15:14 +0800)]
Fix calculation of stashed blocks.
Change-Id: Ic3d607cb6691fc58e189a54a7244942cf3f3c387
Signed-off-by: caozhiyuan <cao.zhiyuan@zte.com.cn>
Tao Bao [Wed, 21 Oct 2015 20:36:01 +0000 (13:36 -0700)]
blockimgdiff.py: Fix the script error for BBOTA v1.
CL in [1] added an assertion to make sure an empty RangeSet cannot call
RangeSet.to_raw_string(). However, we may unintentionally hit that when
generating BBOTA v1 script (e.g. for "new" commands that always have
empty src_ranges).
[1] commit
e8f756137c39fc3292014f2eab5f84c6e5135797
Change-Id: I1723606967f354ace9286d2b888fdbc80ba10e39
Nick Kralevich [Wed, 21 Oct 2015 18:19:49 +0000 (18:19 +0000)]
Merge "allow qemu_props to set opengles.version"
am:
c5a33b0570
* commit '
c5a33b057071a0c2ea0374bbb28ba02ba2495aba':
allow qemu_props to set opengles.version
Nick Kralevich [Wed, 21 Oct 2015 18:10:53 +0000 (18:10 +0000)]
Merge "allow qemu_props to set opengles.version"
Nick Kralevich [Wed, 21 Oct 2015 17:55:21 +0000 (10:55 -0700)]
allow qemu_props to set opengles.version
Addresses the following denial:
init: avc: denied { set } for property=opengles.version scontext=u:r:qemu_props:s0 tcontext=u:object_r:default_prop:s0 tclass=property_service
Bug:
25148690
Change-Id: I4b197eeabfe37e794104e4e686e9e388b5bc3e0c
Stephen Hines [Wed, 21 Oct 2015 16:39:12 +0000 (16:39 +0000)]
Merge "Revert "Switch from clang 3.6 to new clang repository (with 3.8).""
am:
a7918b4948
* commit '
a7918b49488ad0daed6def7459fbf0f9d281b4b5':
Revert "Switch from clang 3.6 to new clang repository (with 3.8)."
Stephen Hines [Wed, 21 Oct 2015 16:29:28 +0000 (16:29 +0000)]
Merge "Revert "Switch from clang 3.6 to new clang repository (with 3.8).""
Stephen Hines [Wed, 21 Oct 2015 15:32:45 +0000 (08:32 -0700)]
Revert "Switch from clang 3.6 to new clang repository (with 3.8)."
This reverts commit
1332828b6ea25250c497609a1d4b2c7e28227ff9.
Bug:
25141123
Change-Id: Idd5d8757095b2b370046a84aea76bc95e16f3876
Yohann Roussel [Mon, 12 Oct 2015 16:02:51 +0000 (18:02 +0200)]
Remove LOCAL_JACK_EXTRA_ARGS
Use of DEFAULT_JACK_EXTRA_ARGS and LOCAL_JACK_FLAGS provides all needed
support.
(cherry picked from commit
d2b2983cc791f90a0d052699603723335ab94f5a)
Change-Id: I1cd76836792e7332bc3750408a860400b0957485
Yohann Roussel [Fri, 3 Jul 2015 13:46:51 +0000 (15:46 +0200)]
Allow control of jack used for compilation
Version of Jack used to compile a module can now be control from
a dedicated mk located in prebuilts/sdk/tools
Bug:
24564814
(cherry picked from commit
b68c9a498d1e2c631eb6e8c9092d4d5775402083)
Change-Id: I7809dc966026ff94b5cb2daa7e2c63762ca4768d
Yohann Roussel [Thu, 2 Jul 2015 10:10:17 +0000 (12:10 +0200)]
Clean call-jack and its callers
This is possible now that we have the new Jack server.
Also fix dependency from dex/jack target to jack script
instead of jack.jar.
(cherry picked from commit
5e50b342218fe2b9c1af20fd7da3c173bfac0499)
Change-Id: I8e7aa5087ba8d73cc93140ddfca8f4ab2f505175
Stephen Hines [Wed, 21 Oct 2015 00:22:02 +0000 (00:22 +0000)]
Merge "Switch from clang 3.6 to new clang repository (with 3.8)."
am:
f5782d6097
* commit '
f5782d609724b5f41506433392ca51e1bed9c828':
Switch from clang 3.6 to new clang repository (with 3.8).
Colin Cross [Wed, 21 Oct 2015 00:21:52 +0000 (00:21 +0000)]
Merge changes I2ba90314,I5f47307d
am:
fc8b331858
* commit '
fc8b331858747f8207e3861c0ada2c4fd359f648':
makeparallel: prepend flags to ninja command line
Put NINJA_ARGS last
Stephen Hines [Wed, 21 Oct 2015 00:18:05 +0000 (00:18 +0000)]
Merge "Switch from clang 3.6 to new clang repository (with 3.8)."
Colin Cross [Wed, 21 Oct 2015 00:15:33 +0000 (00:15 +0000)]
Merge changes I2ba90314,I5f47307d
* changes:
makeparallel: prepend flags to ninja command line
Put NINJA_ARGS last
Colin Cross [Tue, 20 Oct 2015 22:41:05 +0000 (15:41 -0700)]
makeparallel: prepend flags to ninja command line
Ninja stops parsing top level options after -t is used to select a
tool. Put any inserted command line options at the beginning of the
command.
Change-Id: I2ba903143366aaded63e21d749476248617c8962
Andreas Gampe [Tue, 20 Oct 2015 23:50:59 +0000 (23:50 +0000)]
Merge "Build: Fix DEX2OAT_TARGET_CPU_VARIANT setting"
am:
6c45f4493e
* commit '
6c45f4493e125f4632ee0d0ed95d0198018cbb80':
Build: Fix DEX2OAT_TARGET_CPU_VARIANT setting
Andreas Gampe [Tue, 20 Oct 2015 23:37:36 +0000 (23:37 +0000)]
Merge "Build: Fix DEX2OAT_TARGET_CPU_VARIANT setting"
Colin Cross [Mon, 5 Oct 2015 22:12:08 +0000 (15:12 -0700)]
Put NINJA_ARGS last
Put NINJA_ARGS at the end of the command line so it can contain tools,
which expect to be last.
Change-Id: I5f47307d01aa52eb74a333b19ffe3a7cd8950b01
Roland Levillain [Tue, 20 Oct 2015 21:44:10 +0000 (21:44 +0000)]
Merge "Typos in envsetup.sh."
am:
8503cfb49c
* commit '
8503cfb49c797bffa2568cffaab483071230fef0':
Typos in envsetup.sh.
Roland Levillain [Tue, 20 Oct 2015 21:30:10 +0000 (21:30 +0000)]
Merge "Typos in envsetup.sh."
Dan Willemsen [Tue, 20 Oct 2015 20:52:09 +0000 (20:52 +0000)]
Merge "Stop encoding absolute paths in symbols"
am:
9f576acde6
* commit '
9f576acde6c27149c9ca563f0a73e9f1c5e0e768':
Stop encoding absolute paths in symbols
Dan Willemsen [Tue, 20 Oct 2015 20:46:21 +0000 (20:46 +0000)]
Merge "Stop encoding absolute paths in symbols"
Chih-hung Hsieh [Tue, 20 Oct 2015 20:12:12 +0000 (20:12 +0000)]
Merge "Move x86 target to clang by default."
am:
a993bfff36
* commit '
a993bfff361b22902387fc66d734abe385ca3338':
Move x86 target to clang by default.
Chih-hung Hsieh [Tue, 20 Oct 2015 19:47:55 +0000 (19:47 +0000)]
Merge "Move x86 target to clang by default."
Chih-Hung Hsieh [Tue, 20 Oct 2015 19:16:57 +0000 (12:16 -0700)]
Move x86 target to clang by default.
Bug:
23163853
Change-Id: Ib5e9beddbeca8968d6e4365abeb44ae97cbe9981
Roland Levillain [Tue, 20 Oct 2015 11:48:19 +0000 (12:48 +0100)]
Typos in envsetup.sh.
Change-Id: I31cc811e1352b9c924bdf164561f334b032d6f5c
Andreas Gampe [Fri, 16 Oct 2015 03:43:29 +0000 (20:43 -0700)]
Build: Fix DEX2OAT_TARGET_CPU_VARIANT setting
The secondary variant fallback was not set. The build system expects
the variants, so system properties were malformed for x86-64:
[dalvik.vm.isa.x86.variant]: [dalvik.vm.isa.x86.features=default]
Bug:
24989387
Change-Id: Idbf54f81494f2650ad56080305807fd6b7ed4161
Christopher Wiley [Mon, 19 Oct 2015 23:49:58 +0000 (23:49 +0000)]
Merge "Invoke the aidl-cpp compiler to generate C++"
am:
ba39c5690a
* commit '
ba39c5690aae0bcd7102c0030a31b705ce1b92f1':
Invoke the aidl-cpp compiler to generate C++
Christopher Wiley [Mon, 19 Oct 2015 23:44:21 +0000 (23:44 +0000)]
Merge "Invoke the aidl-cpp compiler to generate C++"
Ying Wang [Mon, 19 Oct 2015 23:21:46 +0000 (23:21 +0000)]
Merge "envsetup: Show error when supplied dir isn\'t present with mmm"
am:
475054a16a
* commit '
475054a16ad57b184fa476c093cf1ce8e9ec3e15':
envsetup: Show error when supplied dir isn't present with mmm
Christopher Wiley [Thu, 15 Oct 2015 00:27:24 +0000 (17:27 -0700)]
Invoke the aidl-cpp compiler to generate C++
Bug:
23599697
Test: test application compiles generated code
Change-Id: I35255517dd0b7ef7a82134be1c862093eaa3ce6b
Ying Wang [Mon, 19 Oct 2015 22:44:03 +0000 (22:44 +0000)]
Merge "envsetup: Show error when supplied dir isn't present with mmm"
Dan Willemsen [Mon, 19 Oct 2015 21:24:53 +0000 (14:24 -0700)]
am
77493047: Merge "Add support for LOCAL_SRC_FILES_EXCLUDE"
* commit '
7749304741070af8239e02f68d688fc45fd877d1':
Add support for LOCAL_SRC_FILES_EXCLUDE