OSDN Git Service
Shinichiro Hamaji [Wed, 13 Apr 2016 05:13:20 +0000 (05:13 +0000)]
Merge "Always use ensure_start to ensure goma\'s daemon runs"
am:
f221cbb
* commit '
f221cbba4255a0ade9a222715bb401c544250939':
Always use ensure_start to ensure goma's daemon runs
Change-Id: I57af0d64742ddf4585cfcc036f53244e0c2d6226
Shinichiro Hamaji [Wed, 13 Apr 2016 05:07:00 +0000 (05:07 +0000)]
Merge "Always use ensure_start to ensure goma's daemon runs"
Christopher Wiley [Tue, 12 Apr 2016 22:12:07 +0000 (22:12 +0000)]
Merge "Add support for LOCAL_EXPORT_*_LIBRARY_HEADERS"
am:
5f3b368
* commit '
5f3b3689af234bf5b16671cc01ae4d14956fac0a':
Add support for LOCAL_EXPORT_*_LIBRARY_HEADERS
Change-Id: I38db1f575907c48355d8e88e52d273bedc3b139a
Treehugger Robot [Tue, 12 Apr 2016 21:24:51 +0000 (21:24 +0000)]
Merge "Add support for LOCAL_EXPORT_*_LIBRARY_HEADERS"
Tao Bao [Tue, 12 Apr 2016 16:44:34 +0000 (16:44 +0000)]
Merge "releasetools: Use fixed timestamp in otacerts.zip."
am:
7b049f7
* commit '
7b049f715c4dc241ffb23ddee8374742246936de':
releasetools: Use fixed timestamp in otacerts.zip.
Change-Id: I3708511770fb022618592753d9de6ddc0c4df23b
Tao Bao [Tue, 12 Apr 2016 16:32:32 +0000 (16:32 +0000)]
Merge "releasetools: Use fixed timestamp in otacerts.zip."
Christopher Wiley [Mon, 11 Apr 2016 19:40:36 +0000 (12:40 -0700)]
Add support for LOCAL_EXPORT_*_LIBRARY_HEADERS
Listing a library in any of:
LOCAL_EXPORT_SHARED_LIBRARY_HEADERS
LOCAL_EXPORT_STATIC_LIBRARY_HEADERS
will cause the headers exported by that library to be exported from
the current library target as well.
This means that when library A's public headers include headers from
library B, library C which consumes A no longer has to explicitly list
A and B in its LOCAL_SHARED_LIBRARIES for the purpose of picking up B's
headers.
Bug:
27804373
Test: Introduced dependency on libbase to libbinder at the header level.
Libraries that consume libbinder do not need to explicitly depend
on libbase.
Change-Id: If69079f058a4a182c5ef5a3c5ba15035570da22d
Tao Bao [Tue, 12 Apr 2016 06:05:52 +0000 (23:05 -0700)]
releasetools: Use fixed timestamp in otacerts.zip.
We were using zipfile.write() to write system/etc/security/otacerts.zip
when signing for release. It led to unexpected timestamp change in the
generated otacerts.zip and non-idempotent signed images when signing the
same target_files.zip.
Replace with common.ZipWrite() to always use a fixed timestamp.
Bug:
28122968
Change-Id: Ia6cf4b7d380cbf72ed7050ebb60c932dc8826d87
(cherry picked from commit
7ee3a9678e7191c48f0ba4e04792fe97925c1aa1)
Shinichiro Hamaji [Tue, 12 Apr 2016 09:14:28 +0000 (18:14 +0900)]
Always use ensure_start to ensure goma's daemon runs
Recent goma client automatically restarts when GOMA_*
environment variable changes. http://b/
25676777 was fixed
2 months ago, so there wouldn't be old goma client.
Change-Id: I3b5419ce4bae4cf8180d8d0a53d2b4218d317fec
Andreas Gampe [Tue, 12 Apr 2016 03:01:39 +0000 (03:01 +0000)]
Merge "Build: Add ART_BOOT_IMAGE_EXTRA_ARGS"
am:
8a547f1
* commit '
8a547f19b859e06baaf3c9495f3a2fc0eaa5905d':
Build: Add ART_BOOT_IMAGE_EXTRA_ARGS
Change-Id: If44d2747e10e2b549e83c96f1916ca05b9af9d04
Andreas Gampe [Tue, 12 Apr 2016 02:46:58 +0000 (02:46 +0000)]
Merge "Build: Add ART_BOOT_IMAGE_EXTRA_ARGS"
Andreas Gampe [Mon, 11 Apr 2016 22:10:09 +0000 (15:10 -0700)]
Build: Add ART_BOOT_IMAGE_EXTRA_ARGS
Allow to modify the boot image compilation. Can be used to easily
dump initialization failures.
Bug:
27265238
Change-Id: I9d54c562a2e623b23b7c1dea9cdbe303786c95dd
Sebastien Hertz [Mon, 11 Apr 2016 14:41:01 +0000 (14:41 +0000)]
Merge "Update code coverage filtering"
am:
cb49804
* commit '
cb49804e06adab2882bbcd15230b188f4977eb5a':
Update code coverage filtering
Change-Id: Ia7f5f6a659cea62553865bb1030bc76e48c99b57
Sebastien Hertz [Mon, 11 Apr 2016 14:31:35 +0000 (14:31 +0000)]
Merge "Update code coverage filtering"
Sebastien Hertz [Wed, 6 Apr 2016 16:18:47 +0000 (18:18 +0200)]
Update code coverage filtering
Replaces old LOCAL_EMMA_COVERAGE_FILTER by new variables:
- LOCAL_JACK_COVERAGE_INCLUDE_FILTER for included classes
- LOCAL_JACK_COVERAGE_EXCLUDE_FILTER for excluded classes
Both variables can contain a comma-separated list of class names,
where * and ? are accepted wildcard (like foo.?ar.*).
When code coverage is enabled, we will use these variables to
pass code coverage filters on the Jack command-line.
Bug:
28014424
Change-Id: Ic29c99b6feb7ea2251c29d659e7ea1f1c46d1ed1
Shinichiro Hamaji [Fri, 8 Apr 2016 04:55:11 +0000 (04:55 +0000)]
Merge "Add jack\'s argument files to prerequisites"
am:
06dbe19
* commit '
06dbe198b9f50d71bf24b52819110594007b14ae':
Add jack's argument files to prerequisites
Change-Id: Ib95413246000676fc050ee1c1e892dd8ea1b6b3f
Shinichiro Hamaji [Fri, 8 Apr 2016 04:45:23 +0000 (04:45 +0000)]
Merge "Add jack's argument files to prerequisites"
Maria Bornski [Thu, 7 Apr 2016 22:06:17 +0000 (22:06 +0000)]
Merge "Correct usage message for build_image.py"
am:
d63ec28
* commit '
d63ec28bcfa69692b15b76510eb3f74372e10d3f':
Correct usage message for build_image.py
Change-Id: I338b5b675a6bcac87b02f78d448896195f2b6eb7
Ying Wang [Thu, 7 Apr 2016 21:51:21 +0000 (21:51 +0000)]
Merge "Correct usage message for build_image.py"
Alex Klyubin [Thu, 7 Apr 2016 20:07:35 +0000 (20:07 +0000)]
Merge "Remove support for DSA with SHA-512 from v2 signing."
am:
d71e120
* commit '
d71e12028bc8602569153f175c822f7757af2611':
Remove support for DSA with SHA-512 from v2 signing.
Change-Id: I71b2b99a5808b231334ab616c2b6e2a660c35870
Alex Klyubin [Thu, 7 Apr 2016 19:56:03 +0000 (19:56 +0000)]
Merge "Remove support for DSA with SHA-512 from v2 signing."
Colin Cross [Thu, 7 Apr 2016 18:09:32 +0000 (18:09 +0000)]
Merge "makeparallel: reset make\'s unlimited stack"
am:
a034129
* commit '
a034129176d8821efc2bc8d33e06d9aeb4d3fd16':
makeparallel: reset make's unlimited stack
Change-Id: I6e159629c5fe2441f53e0e2687ab0e0478b68499
Colin Cross [Thu, 7 Apr 2016 18:03:59 +0000 (18:03 +0000)]
Merge "makeparallel: reset make's unlimited stack"
Alex Klyubin [Thu, 7 Apr 2016 17:24:56 +0000 (10:24 -0700)]
Remove support for DSA with SHA-512 from v2 signing.
Android platform does not support DSA with SHA-512. Thus, it does not
make sense to support this unsupported algorithm in APK Signature
Scheme v2.
Bug:
24331392
Change-Id: Ifba90ad5b11188bb968c28d9e0ed3f9cb13ce2e7
Shinichiro Hamaji [Thu, 7 Apr 2016 09:56:42 +0000 (18:56 +0900)]
Add jack's argument files to prerequisites
Dex files should be updated when jack-default.args or
proguard*.flags are modified.
Bug:
27954979
Change-Id: I72a7084302f4ef92a89a8068f03f790dd7acd582
Shinichiro Hamaji [Thu, 7 Apr 2016 03:53:42 +0000 (03:53 +0000)]
Merge "Add Bison binary and its data to prerequisite"
am:
4d69fbf
* commit '
4d69fbf5beeb7f56c878ed8b3286b23521029f74':
Add Bison binary and its data to prerequisite
Change-Id: I5ee7077db82707a4aaa5c7801e8dbc0b564316bb
Shinichiro Hamaji [Thu, 7 Apr 2016 03:53:41 +0000 (03:53 +0000)]
Merge "Fix dependencies of protoc with nanopb-c plugin"
am:
5e2d7f3
* commit '
5e2d7f320423bddb5494cdc1564afa040b98d004':
Fix dependencies of protoc with nanopb-c plugin
Change-Id: Ib343e45fbe14ac06cb0b8205952cbfc3d57b59c6
Shinichiro Hamaji [Thu, 7 Apr 2016 03:48:31 +0000 (03:48 +0000)]
Merge "Add Bison binary and its data to prerequisite"
Shinichiro Hamaji [Thu, 7 Apr 2016 03:48:02 +0000 (03:48 +0000)]
Merge "Fix dependencies of protoc with nanopb-c plugin"
Colin Cross [Thu, 7 Apr 2016 00:59:14 +0000 (17:59 -0700)]
makeparallel: reset make's unlimited stack
make 3.81 sets its own stack size to be unlimited, but accidentally
leaves it unlimited for all child processes. If it is unlimited, reset
it back to a reasonable default (8MB).
See http://savannah.gnu.org/bugs/?22010
Change-Id: Ieb0289823f12a421b59d8ab5292d3df3c6dfc27e
Maria Bornski [Fri, 4 Sep 2015 18:13:16 +0000 (11:13 -0700)]
Correct usage message for build_image.py
target_out_dir is now a required argument. Include this in the usage message.
Change-Id: If77d94ec5350b2c737d1dd1df28a51167b173058
Shinichiro Hamaji [Tue, 5 Apr 2016 08:34:51 +0000 (17:34 +0900)]
Fix dependencies of protoc with nanopb-c plugin
Bug:
27954979
Change-Id: Ic06b5288b092d8ea5225516069845bfc2ffa9cd1
Shinichiro Hamaji [Tue, 5 Apr 2016 11:12:48 +0000 (20:12 +0900)]
Add Bison binary and its data to prerequisite
Bug:
27954979
Change-Id: Id68425ef85c07b9bd06d9640f4bf96270af1b893
Dan Albert [Tue, 5 Apr 2016 18:57:31 +0000 (18:57 +0000)]
Merge "Remove mips special case."
am:
a6a6285
* commit '
a6a6285686a753aaedebc2edcbf94f14cb7b6fdf':
Remove mips special case.
Change-Id: I772f6383a3b26c39758be600f194e3f511ec6aa0
Dan Albert [Tue, 5 Apr 2016 18:51:16 +0000 (18:51 +0000)]
Merge "Remove mips special case."
Sebastien Hertz [Tue, 5 Apr 2016 09:24:40 +0000 (09:24 +0000)]
Merge "Fix code coverage for apps"
am:
2e8a1fc
* commit '
2e8a1fc96695478be7e0d9efc3f99a305b10930b':
Fix code coverage for apps
Change-Id: I0fc712c82c55079dc88b5d58ff29958e06f4885d
Sebastien Hertz [Tue, 5 Apr 2016 09:20:21 +0000 (09:20 +0000)]
Merge "Fix code coverage for apps"
Dan Albert [Tue, 5 Apr 2016 07:26:43 +0000 (00:26 -0700)]
Remove mips special case.
The NDK doesn't have an r6 subdir.
Bug: http://b/
28009632
Change-Id: I482723a1b7400ed13dc70acad24fbed96683f460
William Roberts [Mon, 4 Apr 2016 22:44:34 +0000 (22:44 +0000)]
Merge "fs_config: introduce TARGET_FS_CONFIG_GEN"
am:
54cb05c
* commit '
54cb05c01a464d0efb2cfc43c3379eb15d6a2bf0':
fs_config: introduce TARGET_FS_CONFIG_GEN
Change-Id: I16bf8c0f489a4cbc7d55c2383f63cdefd2b18719
Mark Salyzyn [Mon, 4 Apr 2016 22:37:33 +0000 (22:37 +0000)]
Merge "fs_config: introduce TARGET_FS_CONFIG_GEN"
Sen Jiang [Mon, 4 Apr 2016 21:48:14 +0000 (21:48 +0000)]
Merge "Remove libdivsufsort shared library from otatools."
am:
aef8e28
* commit '
aef8e28fa6f44f7da092aeee34ce2a7f3ec3d020':
Remove libdivsufsort shared library from otatools.
Change-Id: If97e4bd6571ef64700e302f58080e203282b460f
Sen Jiang [Mon, 4 Apr 2016 21:43:11 +0000 (21:43 +0000)]
Merge "Remove libdivsufsort shared library from otatools."
Elliott Hughes [Mon, 4 Apr 2016 20:47:40 +0000 (20:47 +0000)]
Merge "libm\'s headers have moved to live with their libc cousins."
am:
fcbd4d8
* commit '
fcbd4d8bfc9e8e6a6067d6e18205c39d16c4bfbb':
libm's headers have moved to live with their libc cousins.
Change-Id: Ieff5329667f91a72e844d4febfcd1c88505b4d2c
Elliott Hughes [Mon, 4 Apr 2016 20:44:35 +0000 (20:44 +0000)]
Merge "libm's headers have moved to live with their libc cousins."
Sen Jiang [Mon, 4 Apr 2016 20:44:06 +0000 (13:44 -0700)]
Remove libdivsufsort shared library from otatools.
The library is now a static library.
Bug:
26955860
Change-Id: I64525737da1451895c255a30904a1e3e4ad8d253
Dan Albert [Mon, 4 Apr 2016 20:35:41 +0000 (20:35 +0000)]
Merge "Update NDK libc++ header paths."
am:
66dcc50
* commit '
66dcc50c71cd6bc198e8e411ea902405bc48fabe':
Update NDK libc++ header paths.
Change-Id: I6cb300e1ba26485ca0af9625127de3229a4c7882
Dan Albert [Mon, 4 Apr 2016 20:27:42 +0000 (20:27 +0000)]
Merge "Update NDK libc++ header paths."
Elliott Hughes [Mon, 4 Apr 2016 19:58:50 +0000 (12:58 -0700)]
libm's headers have moved to live with their libc cousins.
(To reduce the need for this kind of thing in the various build systems.)
Change-Id: I4430a76a749262b0234c194434b331f7294da009
Mohamad Ayyash [Mon, 4 Apr 2016 19:50:08 +0000 (19:50 +0000)]
Merge "Always build squashfs host tools"
am:
ce30869
* commit '
ce3086971357779878ccf1f45e77e5ada82f8a59':
Always build squashfs host tools
Change-Id: Ib0f919c80845d6442b548454ac539029d61ebff4
Mohamad Ayyash [Mon, 4 Apr 2016 19:42:25 +0000 (19:42 +0000)]
Merge "Always build squashfs host tools"
Mohamad Ayyash [Mon, 4 Apr 2016 19:31:41 +0000 (12:31 -0700)]
Always build squashfs host tools
Now that mac compatibility has been fixed
BUG:
27657762
Change-Id: I49933ccedf74b9d172967dad721971a752047da6
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Sebastien Hertz [Thu, 31 Mar 2016 14:48:26 +0000 (16:48 +0200)]
Fix code coverage for apps
When building apps with EMMA_INSTRUMENT=true, we must ensure that
jacoco is at least on the classpath (or even embedded for unbundled
branches) and that proguard will ignore jacoco classes. Otherwise
the Jack compilation would fail.
For unbundled build, we include the proguard configuration file
build/core/proguard.jacoco.flags to ignore jacoco classes.
For full build, we ensure jacoco is on the classpath during the
jack compilation.
Bug:
27607712
(cherry picked from commit
d9641e01f300ffc359a034a3e897fd8ada78237a)
Change-Id: Ib46c91d03721f2418b15c17546d4f322f2f90a28
Miao Wang [Fri, 1 Apr 2016 20:35:58 +0000 (20:35 +0000)]
Merge "[RenderScript] Update the build rules for x86_64 support lib."
am:
5d4d1d8
* commit '
5d4d1d8ebb8e2322fc6ae57bd15db001f314bf27':
[RenderScript] Update the build rules for x86_64 support lib.
Change-Id: I634e3c552cad73d289ebfa63ed8cdcbd0dab8400
Miao Wang [Fri, 1 Apr 2016 20:22:41 +0000 (20:22 +0000)]
Merge "[RenderScript] Update the build rules for x86_64 support lib."
Chih-Hung Hsieh [Fri, 1 Apr 2016 16:30:41 +0000 (16:30 +0000)]
Merge "Recognize more Clang-Tidy google warning patterns."
am:
29667bf
* commit '
29667bf9d84ae79b5d2e64f42be00335e36b4653':
Recognize more Clang-Tidy google warning patterns.
Change-Id: Idcadd39c327e9998d9854baec43eaec680223f9b
Chih-hung Hsieh [Fri, 1 Apr 2016 16:15:57 +0000 (16:15 +0000)]
Merge "Recognize more Clang-Tidy google warning patterns."
Dan Albert [Thu, 31 Mar 2016 23:18:21 +0000 (23:18 +0000)]
Merge "Add LOCAL_NDK_VERSION."
am:
4410c29
* commit '
4410c29fd0eb3dd0c03c5a3f7d28deec4f23e96b':
Add LOCAL_NDK_VERSION.
Change-Id: Ica79c1e5e912a728232aea5b35154e1b5cc28c3f
Chih-Hung Hsieh [Thu, 31 Mar 2016 23:14:55 +0000 (16:14 -0700)]
Recognize more Clang-Tidy google warning patterns.
* Many AOSP C/C++ code have google-readability warnings.
Bug: http://b/
27779618
Change-Id: Ic7d33b957da5c1062410f48ef18bb68a5aa259e9
Dan Albert [Thu, 31 Mar 2016 23:11:26 +0000 (23:11 +0000)]
Merge "Add LOCAL_NDK_VERSION."
Miao Wang [Wed, 30 Mar 2016 20:29:42 +0000 (13:29 -0700)]
[RenderScript] Update the build rules for x86_64 support lib.
Bug:
19735423
- Unlike other archs, x86_64 has both usr/lib and usr/lib64. we need
to search for libm.so and libc.so in lib64/. Otherwise the linker
will report error.
Change-Id: I2859bee066a9eb100828d90da8adf0f9817d77e6
(cherry picked from commit
57ef7ea4901bf4a7c89a078b1c859310abf1d79c)
Dan Albert [Wed, 23 Mar 2016 00:17:40 +0000 (17:17 -0700)]
Update NDK libc++ header paths.
The r11 libc++ uses libc++abi instead of libgabi++.
Bug: http://b/
27801981
Change-Id: I5b90c14125dc024b2b290897bb3ef1c8d9546a7b
Dan Albert [Wed, 30 Mar 2016 21:13:50 +0000 (14:13 -0700)]
Add LOCAL_NDK_VERSION.
Used to select between releases of the NDK (r10, r11, etc).
Some of the libraries we use in Android come as prebuilts from
google3, which are most likely built against an older NDK than what
we have in the platform. Since things may not be ABI compatible
release to release, we need to keep legacy versions accessible for
those to keep building.
Change-Id: Ia3df42fa6f3a7bd5108ff6bbb0f2ca06239c3be9
Ying Wang [Thu, 31 Mar 2016 16:59:09 +0000 (16:59 +0000)]
Merge "Remove support of disabling Jack."
am:
77b6353
* commit '
77b63536892a115361e3574474ddcb34ce5cedf0':
Remove support of disabling Jack.
Change-Id: Ic28400f1a80353ba026ab23e7119b72c4743b196
Ying Wang [Thu, 31 Mar 2016 16:52:57 +0000 (16:52 +0000)]
Merge "Replace in recipe with subshell."
am:
0fda1ea
* commit '
0fda1eaa43c8d6018e757671a2c92d635e681d93':
Replace $(shell) in recipe with subshell.
Change-Id: Ia9f2f0a55a2c44cece5af4311383f26d686d456f
Ying Wang [Thu, 31 Mar 2016 16:52:49 +0000 (16:52 +0000)]
Merge "Remove support of disabling Jack."
Ying Wang [Thu, 31 Mar 2016 16:46:18 +0000 (16:46 +0000)]
Merge "Replace $(shell) in recipe with subshell."
Ying Wang [Thu, 31 Mar 2016 01:34:43 +0000 (18:34 -0700)]
Replace $(shell) in recipe with subshell.
Bug:
27925180
Change-Id: I4a735755e4f818f6ce608c87ad111b9dd205ef41
Dan Willemsen [Wed, 30 Mar 2016 21:39:12 +0000 (21:39 +0000)]
Merge "Remove extraneous /"
am:
8db170d
* commit '
8db170d914a9f0452dd87e66238429df1a5e2e6a':
Remove extraneous /
Change-Id: I4f92709421baa50ae7adced763ca465f6e805ef9
Dan Willemsen [Wed, 30 Mar 2016 21:24:08 +0000 (21:24 +0000)]
Merge "Remove extraneous /"
Ying Wang [Tue, 29 Mar 2016 01:39:42 +0000 (18:39 -0700)]
Remove support of disabling Jack.
We removed code and variables related to running dx on classes.jar in
this change. Also removed target emma rules (but kept the emma rules for
host java libraries), for it's now done by Jack.
We still support to build classes.jar (and javalib.jar for static Java
libraries) using javac, because tools like javadoc need class files as
input.
Removed the obsolete install-dex-debug.
Bug:
27400061
Change-Id: If0bcdfe62cb181a98754fb0dbe1c12c92e38d3e8
Dan Willemsen [Wed, 30 Mar 2016 20:36:01 +0000 (13:36 -0700)]
Remove extraneous /
This matches the line we use in Soong, and behaves no differently.
Change-Id: I4487f7f5555edd08dc67a22d547f8218d46ccd8f
Sebastien Hertz [Wed, 30 Mar 2016 17:09:17 +0000 (17:09 +0000)]
Merge "Keep emma files for host rules"
am:
c79c95d
* commit '
c79c95d3d8035fa9bf93a7005f1094923da43f51':
Keep emma files for host rules
Change-Id: I0b7679b691242c7877ada6fc78ed058c12c7fbd9
Ying Wang [Wed, 30 Mar 2016 16:56:54 +0000 (16:56 +0000)]
Merge "Keep emma files for host rules"
Chih-Hung Hsieh [Wed, 30 Mar 2016 16:23:25 +0000 (16:23 +0000)]
Merge "Recognize Clang-Tidy warning messages."
am:
af90d19
* commit '
af90d199374c52a992c4f4ac7c2a151e1251807f':
Recognize Clang-Tidy warning messages.
Change-Id: I87a39f0c3f6326a6d0ed356fe2f579dfa12d9cdf
Chih-hung Hsieh [Wed, 30 Mar 2016 16:12:34 +0000 (16:12 +0000)]
Merge "Recognize Clang-Tidy warning messages."
Sebastien Hertz [Wed, 30 Mar 2016 07:38:09 +0000 (09:38 +0200)]
Keep emma files for host rules
Keep coverage.em file name for host rules where Jack is not called.
(Partially reverts change
491c9ce48add521e7c0cdbe1c1fa7ea392b775a5)
Bug:
27822188
Change-Id: Ia9344e17ecbecfb9c335608740ab7dc5490c48d5
Dan Willemsen [Wed, 30 Mar 2016 00:49:50 +0000 (00:49 +0000)]
Merge "Darwin: Use the same `ar` as Soong"
am:
a223b1c
* commit '
a223b1cff7e943369364e60656a837f8fb2015dc':
Darwin: Use the same `ar` as Soong
Change-Id: I177f8a25158dbc2bb93b2c452fe52f7fb350b060
Dan Willemsen [Wed, 30 Mar 2016 00:38:32 +0000 (00:38 +0000)]
Merge "Darwin: Use the same `ar` as Soong"
Dan Willemsen [Tue, 29 Mar 2016 23:21:32 +0000 (16:21 -0700)]
Darwin: Use the same `ar` as Soong
Soong uses the copy of `ar` in the OSX SDK instead of the wrapper in
/usr/bin/ar. /usr/bin/ar appears to be a thin wrapper that looks up the
current SDK and passes execution to it. Soong does this so that it can
actually set up a dependency on the tool.
Change-Id: Ia4e4fbe3287539933fa98a1354c3ccee91f4d552
Chih-Hung Hsieh [Tue, 29 Mar 2016 22:33:11 +0000 (15:33 -0700)]
Recognize Clang-Tidy warning messages.
* Put all Clang-Tidy warning messages in a group for now.
There are too many coding style warnings.
* Change the 'top' link to the top of the page.
* Add a few more new clang compiler warnings.
Bug: http://b/
27779618
Change-Id: I385b9db927a397704b56f53440301352da8694cf
Dan Willemsen [Tue, 29 Mar 2016 20:59:52 +0000 (20:59 +0000)]
Merge "Forbid Clang for Windows"
am:
e4d5e08
* commit '
e4d5e08c2ec0d9db6b2baa160d4bf847331a331f':
Forbid Clang for Windows
Change-Id: Idf4637ba20b1744f33b7425384ce1759b87c8fe3
Dan Willemsen [Tue, 29 Mar 2016 20:54:23 +0000 (20:54 +0000)]
Merge "Forbid Clang for Windows"
Shinichiro Hamaji [Tue, 29 Mar 2016 20:48:00 +0000 (20:48 +0000)]
Merge "Fix dependencies around tools/*-event-log-tags.py"
am:
4487319
* commit '
4487319141c9447b8ef88e1d5ac9e8ecea7c619b':
Fix dependencies around tools/*-event-log-tags.py
Change-Id: I35ce90562fc3ad6b9db20ac85b095debc904746c
Shinichiro Hamaji [Tue, 29 Mar 2016 20:40:31 +0000 (20:40 +0000)]
Merge "Fix dependencies around tools/*-event-log-tags.py"
Dan Willemsen [Tue, 29 Mar 2016 19:34:03 +0000 (12:34 -0700)]
Forbid Clang for Windows
Clang and MinGW are not expected to work together currently, and you get
strange errors when this is attempted. Instead, error out with a clear
error message.
Before the windows build rewrite, we'd just explicitly set my_clang to
false without checking what the module asked for. Now, error out if the
module explicitly asked for clang, since by default they'd have it
already if it wasn't for windows. That way when Clang+Windows does
become possible, it can gradually be tested by setting LOCAL_CLANG to
true.
Change-Id: I9e0b0dca30946d94894119443f2fd0593cee1793
Allen Hair [Tue, 29 Mar 2016 19:25:50 +0000 (19:25 +0000)]
Merge "Only add jacocoagent if the package contains some java code."
am:
616f086
* commit '
616f08696e69b52207929e99fc66c65e7566dc5d':
Only add jacocoagent if the package contains some java code.
Change-Id: I056b15c99218de8636703f38cde23d6fef8b9577
allenhair [Tue, 29 Mar 2016 19:20:10 +0000 (19:20 +0000)]
Merge "Only add jacocoagent if the package contains some java code."
Shinichiro Hamaji [Mon, 28 Mar 2016 18:29:21 +0000 (03:29 +0900)]
Fix dependencies around tools/*-event-log-tags.py
We should regenerate merged tag files and java sources when
these scripts are updated.
Change-Id: Id5f11d6f480f3f74dab08f01e929ee2d7fafd2d0
Allen Hair [Mon, 28 Mar 2016 19:52:37 +0000 (12:52 -0700)]
Only add jacocoagent if the package contains some java code.
Bug:
27877982
Change-Id: I8bf05d67a823402e7e488990753cc9005ec5e90b
Sebastien Hertz [Tue, 29 Mar 2016 07:23:11 +0000 (07:23 +0000)]
Merge "Rename emma coverage files"
am:
f7e06ef
* commit '
f7e06ef3b40da7931cee62210f880b7cb00787ce':
Rename emma coverage files
Change-Id: I39a861d672f754f1b3380838ad9b45d584f5c7a7
Sebastien Hertz [Tue, 29 Mar 2016 07:17:12 +0000 (07:17 +0000)]
Merge "Rename emma coverage files"
Ying Wang [Sat, 26 Mar 2016 01:46:49 +0000 (01:46 +0000)]
Merge "Remove javac support in host dex rules."
am:
8fe0fc9
* commit '
8fe0fc90653bfd40634d946002fd0e12b59f1022':
Remove javac support in host dex rules.
Ying Wang [Sat, 26 Mar 2016 01:41:38 +0000 (01:41 +0000)]
Merge "Remove javac support in host dex rules."
Ying Wang [Sat, 26 Mar 2016 01:35:32 +0000 (01:35 +0000)]
Merge "[DO NOT MERGE] Remove code pulled in by accident."
am:
550e885 -s ours
* commit '
550e885f47bf454f4a6d5ab5cc322674df6e061f':
[DO NOT MERGE] Remove code pulled in by accident.
Ying Wang [Sat, 26 Mar 2016 01:27:32 +0000 (01:27 +0000)]
Merge "[DO NOT MERGE] Remove code pulled in by accident."
Ying Wang [Sat, 26 Mar 2016 01:14:49 +0000 (18:14 -0700)]
[DO NOT MERGE] Remove code pulled in by accident.
Remove code pulled in by accident in cherry-pick commit
fbc5b9f56.
Change-Id: I4e4a336faf71782c208631c581b2587a5364212f
Ying Wang [Fri, 25 Mar 2016 21:41:41 +0000 (21:41 +0000)]
Merge "Support x86+arm multilib build."
Ying Wang [Thu, 17 Mar 2016 02:53:19 +0000 (19:53 -0700)]
Support x86+arm multilib build.
Support TARGET_2ND_ARCH as the binary translation arch.
See target/board/generic_x86_arm/BoardConfig.mk and
target/product/aosp_x86_arm.mk as example for the setup.
In BoardConfig, use the TARGET_2ND_ARCH/etc. variables to set up the
binary translation arch;
Set "TARGET_TRANSLATE_2ND_ARCH := true" to tell the build system it's
not a typical 64-bit multilib configuration.
In product makefile, use "PRODUCT_PACKAGES += libfoo_<2nd_arch>" to
install the TARGET_2ND_ARCH libraries. This also pulls in any dependency
libraries.
By default we don't install any TARGET_2ND_ARCH modules, unless it's
pulled in by PRODUCT_PACKAGES.
Bug:
27526885
Change-Id: I0578e9c80da0532d2fa886a8fcdb140bbc703009
(cherry-pick from commit
277e75a488b1b6599482aed9f7c046747baa10df)
Ying Wang [Fri, 25 Mar 2016 20:16:31 +0000 (20:16 +0000)]
Merge "Use $(BUILD_SYSTEM) as the LOCAL_PATH of auto-generated modules."
Ying Wang [Fri, 25 Mar 2016 20:16:25 +0000 (20:16 +0000)]
Merge "Rebuild odex files in PDK fusion build."