OSDN Git Service
Ying Wang [Fri, 23 Oct 2015 20:31:52 +0000 (20:31 +0000)]
Merge "Normalize java source file paths before running "sort -u"." am:
0d4dad46f4 am:
471d347b89
am:
8ac0c4bebb
* commit '
8ac0c4bebb00e0335de2a5b7ed8b83b1f4393216':
Normalize java source file paths before running "sort -u".
Ying Wang [Fri, 23 Oct 2015 20:28:15 +0000 (20:28 +0000)]
Merge "Normalize java source file paths before running "sort -u"." am:
0d4dad46f4
am:
471d347b89
* commit '
471d347b8928e6b030d94869a2a9229086b79528':
Normalize java source file paths before running "sort -u".
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 [Fri, 23 Oct 2015 20:20:29 +0000 (20:20 +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:55:16 +0000 (18:55 +0000)]
Merge "Bump up the BBOTA version to 4." am:
ac4ec1a4ea am:
ada3927e53
am:
5ddc4ac802
* commit '
5ddc4ac8028e1bfdf0f2cb3ea6b80762c73cd281':
Bump up the BBOTA version to 4.
Tao Bao [Fri, 23 Oct 2015 18:49:59 +0000 (18:49 +0000)]
Merge "Bump up the BBOTA version to 4." am:
ac4ec1a4ea
am:
ada3927e53
* commit '
ada3927e53f5ff99beb6919162ea186924cb7621':
Bump up the BBOTA version to 4.
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:27:25 +0000 (18:27 +0000)]
Merge "Make sure R.stamp is always created" am:
47e46f7725 am:
3d7584d9c3
am:
a34fb5fe34
* commit '
a34fb5fe3445bf6f185720a3f029da4d39268dc6':
Make sure R.stamp is always created
Ying Wang [Fri, 23 Oct 2015 18:22:31 +0000 (18:22 +0000)]
Merge "Make sure R.stamp is always created" am:
47e46f7725
am:
3d7584d9c3
* commit '
3d7584d9c3b619619eaf10a0110f28f4f802f2cb':
Make sure R.stamp is always created
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:54:49 +0000 (14:54 +0000)]
Merge "Rename UPDATE_AB_PARTITIONS to AB_OTA_PARTITIONS." am:
c82b873b9b am:
7410ed86c6
am:
47d31960d5
* commit '
47d31960d5ea013e049ed3548c7dd5445caae6a6':
Rename UPDATE_AB_PARTITIONS to AB_OTA_PARTITIONS.
Alex Deymo [Fri, 23 Oct 2015 14:51:34 +0000 (14:51 +0000)]
Merge "Rename UPDATE_AB_PARTITIONS to AB_OTA_PARTITIONS." am:
c82b873b9b
am:
7410ed86c6
* commit '
7410ed86c6ffa165ee7cc4b142e9843c18ae61a6':
Rename UPDATE_AB_PARTITIONS to AB_OTA_PARTITIONS.
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:36:09 +0000 (00:36 +0000)]
Merge "Move x86_64 target to clang by default." am:
373a1e36a9 am:
bbe8225aca
am:
8d28df5804
* commit '
8d28df58045b6100a70dc605fa0878181cafbfcd':
Move x86_64 target to clang by default.
Chih-hung Hsieh [Fri, 23 Oct 2015 00:33:00 +0000 (00:33 +0000)]
Merge "Move x86_64 target to clang by default." am:
373a1e36a9
am:
bbe8225aca
* commit '
bbe8225acac3e35416e0fadea05589d98b647642':
Move x86_64 target to clang by default.
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."
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
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
Ian Pedowitz [Thu, 22 Oct 2015 22:20:07 +0000 (22:20 +0000)]
Bump Android to 6.0.1 am:
0a20c942c4 am:
1f9ba9f89e am:
4919ed4afc
am:
36bf4976bb -s ours
* commit '
36bf4976bb5916d2e619009e3e5732a3f578fd70':
Bump Android to 6.0.1
Zach Jang [Thu, 22 Oct 2015 22:09:16 +0000 (22:09 +0000)]
Update security string to 2015-12-01 am:
0f1512bc03 am:
7b4c7fe5b7 am:
5e994e0d9c
am:
dca5dd4f79
* commit '
dca5dd4f795d6f47591370c1ad27d45b2432b208':
Update security string to 2015-12-01
Ian Pedowitz [Thu, 22 Oct 2015 22:04:15 +0000 (22:04 +0000)]
Bump Android to 6.0.1 am:
0a20c942c4 am:
1f9ba9f89e
am:
4919ed4afc
* commit '
4919ed4afc0c289683bfb4932640f6f9b52ed9c7':
Bump Android to 6.0.1
Zach Jang [Thu, 22 Oct 2015 22:04:07 +0000 (22:04 +0000)]
Update security string to 2015-12-01 am:
0f1512bc03 am:
7b4c7fe5b7
am:
5e994e0d9c
* commit '
5e994e0d9cb29bbb5e57bb4389086a6e106f6acd':
Update security string to 2015-12-01
Ian Pedowitz [Thu, 22 Oct 2015 21:59:20 +0000 (21:59 +0000)]
Bump Android to 6.0.1 am:
0a20c942c4
am:
1f9ba9f89e
* commit '
1f9ba9f89eacd2b16805cf138df16e211b51b700':
Bump Android to 6.0.1
Zach Jang [Thu, 22 Oct 2015 21:59:13 +0000 (21:59 +0000)]
Update security string to 2015-12-01 am:
0f1512bc03
am:
7b4c7fe5b7
* commit '
7b4c7fe5b77e55ede46f0b3fd5eb4a98964ff956':
Update security string to 2015-12-01
Ian Pedowitz [Thu, 22 Oct 2015 21:53:27 +0000 (21:53 +0000)]
Bump Android to 6.0.1
am:
0a20c942c4
* commit '
0a20c942c4bb110ebd971e7959ed1b2fa53e452a':
Bump Android to 6.0.1
Zach Jang [Thu, 22 Oct 2015 21:53:13 +0000 (21:53 +0000)]
Update security string to 2015-12-01
am:
0f1512bc03
* commit '
0f1512bc03b7820a2b9b93757a2309fb872f6677':
Update security string to 2015-12-01
Ian Pedowitz [Sat, 10 Oct 2015 18:00:52 +0000 (11:00 -0700)]
Bump Android to 6.0.1
Bug:
24777474
Change-Id: Ibaca3c2d583aa92c8ca998b6d380ee720b71b1b8
Mike Frysinger [Thu, 22 Oct 2015 19:48:42 +0000 (19:48 +0000)]
Merge "use `find -exec ... +` everywhere" am:
6ff6e9552c am:
2bd3f6e12c
am:
ba517c4e2a
* commit '
ba517c4e2a992093871f4fcbb1e14cbe4bcbf267':
use `find -exec ... +` everywhere
Mike Frysinger [Thu, 22 Oct 2015 19:46:20 +0000 (19:46 +0000)]
Merge "use `find -exec ... +` everywhere" am:
6ff6e9552c
am:
2bd3f6e12c
* commit '
2bd3f6e12cc46efde050fb91a129c33f9a64e9f1':
use `find -exec ... +` everywhere
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:16:00 +0000 (19:16 +0000)]
Merge "Fix calculation of stashed blocks." am:
db08d835d0 am:
8287572f7f
am:
cae2a34bf8
* commit '
cae2a34bf839c3297958f253b9c1aa59da10b3e4':
Fix calculation of stashed blocks.
Tao Bao [Thu, 22 Oct 2015 19:13:42 +0000 (19:13 +0000)]
Merge "Fix calculation of stashed blocks." am:
db08d835d0
am:
8287572f7f
* commit '
8287572f7fefe72e4519aab96ea4e93d3c02ed2b':
Fix calculation of stashed blocks.
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:18:14 +0000 (18:18 +0000)]
Merge "blockimgdiff.py: Fix the script error for BBOTA v1." am:
bcb9240a2b am:
954024649e
am:
ecffed1a4a
* commit '
ecffed1a4a66838178f93cd06b5b81450d937d08':
blockimgdiff.py: Fix the script error for BBOTA v1.
Tao Bao [Thu, 22 Oct 2015 18:15:05 +0000 (18:15 +0000)]
Merge "blockimgdiff.py: Fix the script error for BBOTA v1." am:
bcb9240a2b
am:
954024649e
* commit '
954024649eaca7b257030846126329951e627ecd':
blockimgdiff.py: Fix the script error for BBOTA v1.
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
Yohann Roussel [Thu, 22 Oct 2015 11:39:05 +0000 (11:39 +0000)]
Merge changes from topic \'jack-server-1.3-a3\' am:
e0c7b4ec96 am:
8c8c868180
am:
ffb1c9cf5f -s ours
* commit '
ffb1c9cf5f79d9ad59087d8fcc8dc621583a3e69':
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:53:20 +0000 (10:53 +0000)]
Merge changes from topic \'jack-server-1.3-a3\' am:
e0c7b4ec96
am:
8c8c868180
* commit '
8c8c8681805b51fd42c01cdf42ba19e74ef72e52':
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: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
Ying Wang [Wed, 21 Oct 2015 21:20:38 +0000 (21:20 +0000)]
Merge "Fix cts split apk testcase copy pattern rule."
Ying Wang [Wed, 21 Oct 2015 21:14:50 +0000 (14:14 -0700)]
Fix cts split apk testcase copy pattern rule.
Bug:
21762834
Change-Id: Ib8ff956685c898132a11de45a0d7cfdd1009f48c
Nick Kralevich [Wed, 21 Oct 2015 18:29:12 +0000 (18:29 +0000)]
Merge "allow qemu_props to set opengles.version" am:
c5a33b0570 am:
c6c5b1a969
am:
58ddb6d8e8
* commit '
58ddb6d8e8e66e94594a26bbed9679a2bef2a6db':
allow qemu_props to set opengles.version
Nick Kralevich [Wed, 21 Oct 2015 18:24:21 +0000 (18:24 +0000)]
Merge "allow qemu_props to set opengles.version" am:
c5a33b0570
am:
c6c5b1a969
* commit '
c6c5b1a9692596f06a993db2d1ba810e44716cbd':
allow qemu_props to set opengles.version
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
Ying Wang [Wed, 21 Oct 2015 17:49:39 +0000 (17:49 +0000)]
Merge "Add LOCAL_FINDBUGS_FLAGS to support custom findbugs flags."
Ying Wang [Wed, 21 Oct 2015 17:49:23 +0000 (17:49 +0000)]
Merge "Set up CTS copy rules only once for multilib build."
Ying Wang [Wed, 21 Oct 2015 17:30:51 +0000 (10:30 -0700)]
Add LOCAL_FINDBUGS_FLAGS to support custom findbugs flags.
Use LOCAL_FINDBUGS_FLAGS to specify findbugs command line flags.
To use findbugs filters:
LOCAL_FINDBUGS_FLAGS := -exclude $(LOCAL_PATH)/exclude.xml -include \
$(LOCAL_PATH)/include.xml
where exclude.xml and include.xml are filter files.
The build system automatically adds the filter files as dependency of
findbugs' output xml.
Bug:
24948760
Change-Id: I82502c0ade910c5255001fa5f390316137ce0be6
Stephen Hines [Wed, 21 Oct 2015 16:52:42 +0000 (16:52 +0000)]
Merge "Revert "Switch from clang 3.6 to new clang repository (with 3.8)."" am:
a7918b4948 am:
adb12a039a
am:
4647caa921
* commit '
4647caa9214150f892c050f0986cf9b7e71b1a46':
Revert "Switch from clang 3.6 to new clang repository (with 3.8)."
Stephen Hines [Wed, 21 Oct 2015 16:46:29 +0000 (16:46 +0000)]
Merge "Revert "Switch from clang 3.6 to new clang repository (with 3.8)."" am:
a7918b4948
am:
adb12a039a
* commit '
adb12a039ab34f1b9a33f933a249b0c86e389737':
Revert "Switch from clang 3.6 to new clang repository (with 3.8)."
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
Ying Wang [Wed, 21 Oct 2015 01:18:40 +0000 (18:18 -0700)]
Set up CTS copy rules only once for multilib build.
Bug:
21762834
Change-Id: I488893b2fd26c9aaeb92ae494bc46e86dad1622d
Stephen Hines [Wed, 21 Oct 2015 00:34:27 +0000 (00:34 +0000)]
Merge "Switch from clang 3.6 to new clang repository (with 3.8)." am:
f5782d6097 am:
bbbd421809
am:
44fd42d6af
* commit '
44fd42d6afdd135c2e6760296c88f0af3fab1236':
Switch from clang 3.6 to new clang repository (with 3.8).
Colin Cross [Wed, 21 Oct 2015 00:34:21 +0000 (00:34 +0000)]
Merge changes I2ba90314,I5f47307d am:
fc8b331858 am:
8b63d67e1b
am:
5538dc8bfe
* commit '
5538dc8bfec3d92be8c982d439488ba44431890f':
makeparallel: prepend flags to ninja command line
Put NINJA_ARGS last
Stephen Hines [Wed, 21 Oct 2015 00:27:01 +0000 (00:27 +0000)]
Merge "Switch from clang 3.6 to new clang repository (with 3.8)." am:
f5782d6097
am:
bbbd421809
* commit '
bbbd42180952996fcfbde9a181ddddef7b415491':
Switch from clang 3.6 to new clang repository (with 3.8).
Colin Cross [Wed, 21 Oct 2015 00:26:52 +0000 (00:26 +0000)]
Merge changes I2ba90314,I5f47307d am:
fc8b331858
am:
8b63d67e1b
* commit '
8b63d67e1ba42d090e19cae32e802117b9cac852':
makeparallel: prepend flags to ninja command line
Put NINJA_ARGS last
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:59:45 +0000 (23:59 +0000)]
Merge "Build: Fix DEX2OAT_TARGET_CPU_VARIANT setting" am:
6c45f4493e am:
3c131856ee
am:
92a73a0f6c
* commit '
92a73a0f6c0c768d4bc612106e0c6ddcb7fb2846':
Build: Fix DEX2OAT_TARGET_CPU_VARIANT setting
Roland Levillain [Tue, 20 Oct 2015 23:59:13 +0000 (23:59 +0000)]
Merge "Typos in envsetup.sh." am:
8503cfb49c am:
fef5ba8ec7
am:
7f07d0bc4d
* commit '
7f07d0bc4d0af99ada46a540ed67118defe65dc4':
Typos in envsetup.sh.
Dan Willemsen [Tue, 20 Oct 2015 23:59:05 +0000 (23:59 +0000)]
Merge "Stop encoding absolute paths in symbols" am:
9f576acde6 am:
b93e8250d7
am:
05af959fbe
* commit '
05af959fbe4846ed5df4d74bd838042a8db9a818':
Stop encoding absolute paths in symbols
Chih-hung Hsieh [Tue, 20 Oct 2015 23:58:58 +0000 (23:58 +0000)]
Merge "Move x86 target to clang by default." am:
a993bfff36 am:
ebfadd8990
am:
9b2e93946e
* commit '
9b2e93946e20021f75802805d57e3fa56287ee35':
Move x86 target to clang by default.
Andreas Gampe [Tue, 20 Oct 2015 23:54:53 +0000 (23:54 +0000)]
Merge "Build: Fix DEX2OAT_TARGET_CPU_VARIANT setting" am:
6c45f4493e
am:
3c131856ee
* commit '
3c131856ee9e08c69830675cfc6c3597f783816a':
Build: Fix DEX2OAT_TARGET_CPU_VARIANT setting
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:54:03 +0000 (21:54 +0000)]
Merge "Typos in envsetup.sh." am:
8503cfb49c
am:
fef5ba8ec7
* commit '
fef5ba8ec719a9fdd5f8b3d91d61d01a353e1ede':
Typos in envsetup.sh.
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:58:31 +0000 (20:58 +0000)]
Merge "Stop encoding absolute paths in symbols" am:
9f576acde6
am:
b93e8250d7
* commit '
b93e8250d7ffbf0760bda670dbcd2ad25b504e90':
Stop encoding absolute paths in symbols
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:18:30 +0000 (20:18 +0000)]
Merge "Move x86 target to clang by default." am:
a993bfff36
am:
ebfadd8990
* commit '
ebfadd89905f4e703b81c024d9841fdd70595422':
Move x86 target to clang by default.
Christopher Wiley [Tue, 20 Oct 2015 20:14:50 +0000 (20:14 +0000)]
Merge "Invoke the aidl-cpp compiler to generate C++" am:
ba39c5690a am:
487cc7beaf
am:
9c694a6242
* commit '
9c694a6242a969e27fbd4f043fa7f43ef301b461':
Invoke the aidl-cpp compiler to generate C++
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.