OSDN Git Service
Ying Wang [Fri, 4 Mar 2016 22:10:23 +0000 (22:10 +0000)]
Merge "Small fixes."
am:
dfa0d1063a
* commit '
dfa0d1063a8b07c22d79116be799ffda537211e8':
Small fixes.
Ying Wang [Fri, 4 Mar 2016 21:58:08 +0000 (21:58 +0000)]
Merge "Small fixes."
Ying Wang [Fri, 4 Mar 2016 21:56:23 +0000 (13:56 -0800)]
Small fixes.
Change-Id: Ia949ed0bc93edb78d0b029f3bd3dd584e9a00dc8
Dan Willemsen [Fri, 4 Mar 2016 20:59:24 +0000 (20:59 +0000)]
Merge "Do not apply GLOBAL_CFLAGS_NO_OVERRIDE to host *.S"
am:
6d813d8c92
* commit '
6d813d8c9223ba6e55e98f23a8a8c2248466feff':
Do not apply GLOBAL_CFLAGS_NO_OVERRIDE to host *.S
Dan Willemsen [Fri, 4 Mar 2016 20:52:57 +0000 (20:52 +0000)]
Merge "Do not apply GLOBAL_CFLAGS_NO_OVERRIDE to host *.S"
Tao Bao [Fri, 4 Mar 2016 19:30:01 +0000 (19:30 +0000)]
Merge "releasetools: Fix one missing case for --oem_no_mount."
am:
4e677900f7
* commit '
4e677900f7b0017fcd926dc66d778e355e6a1bae':
releasetools: Fix one missing case for --oem_no_mount.
Tao Bao [Fri, 4 Mar 2016 19:20:15 +0000 (19:20 +0000)]
Merge "releasetools: Fix one missing case for --oem_no_mount."
Ying Wang [Fri, 4 Mar 2016 19:06:53 +0000 (19:06 +0000)]
Merge "Speed up lunch/tapas/etc. shell utility functions."
am:
d3c08f8b76
* commit '
d3c08f8b763c1d8f865896cf7d03d1794bdd14fe':
Speed up lunch/tapas/etc. shell utility functions.
Ying Wang [Fri, 4 Mar 2016 19:03:56 +0000 (19:03 +0000)]
Merge "Speed up lunch/tapas/etc. shell utility functions."
Ying Wang [Fri, 4 Mar 2016 04:57:21 +0000 (20:57 -0800)]
Speed up lunch/tapas/etc. shell utility functions.
1. Combined ~10 calls to the make build system to only one.
We added a phony target "dump-many-vars" to the build system to dump
"<var>=<value>" pairs. We then store the pairs as shell variables.
With this cache get_build_var/get_abs_build_var can just return
the shell variables instead of querying the build system.
2. Prune .git when we search for AndroidProduct.mks.
In internal source tree lunch time was reduced from ~15s to ~1.5s.
Bug:
27429759
Change-Id: I24e88598f6fab598ef26518885fd5e86e71a772d
Ying Wang [Fri, 4 Mar 2016 18:54:25 +0000 (18:54 +0000)]
Merge "Align up java-lib-files and java-lib-deps."
am:
58b8c86f84
* commit '
58b8c86f84ad0bf8fb3bb7dfc259fd1e3ce0dae1':
Align up java-lib-files and java-lib-deps.
Ying Wang [Fri, 4 Mar 2016 18:40:05 +0000 (18:40 +0000)]
Merge "Align up java-lib-files and java-lib-deps."
Ying Wang [Thu, 3 Mar 2016 01:25:01 +0000 (17:25 -0800)]
Align up java-lib-files and java-lib-deps.
- For host Java libraries, java-lib-files should return javalib.jar.
- Host dalvik Java libraries are special: factor out
host-dex-java-lib-files.
- Be explict that jack-lib-deps equals jack-lib-files.
Bug:
27451686
Change-Id: I9235384354e119ef7ebbf29b7e525d1ceea242e0
(cherry-pick from commit
063d0455e0f3a14f2577a26715f82e0bf3e79ee9)
Tao Bao [Fri, 4 Mar 2016 17:45:03 +0000 (09:45 -0800)]
releasetools: Fix one missing case for --oem_no_mount.
The CL in [1] added support for --oem_no_mount. It missed one place that
guards the OEM mounting.
[1] commit
8608cde944d64dece63e8c770deb78c1d092c719
Change-Id: I6ecaa94cd0866e0fd4fc88cb0aa3ebf55cde2968
Neil Fuller [Fri, 4 Mar 2016 13:09:22 +0000 (13:09 +0000)]
Merge "Add JarJar support to BUILD_HOST_JAVA_LIBRARY"
am:
b97ce3bb61
* commit '
b97ce3bb613c1ea18c9aea42e829ac34039b7679':
Add JarJar support to BUILD_HOST_JAVA_LIBRARY
Neil Fuller [Fri, 4 Mar 2016 12:58:44 +0000 (12:58 +0000)]
Merge "Add JarJar support to BUILD_HOST_JAVA_LIBRARY"
Neil Fuller [Wed, 2 Mar 2016 11:19:41 +0000 (11:19 +0000)]
Add JarJar support to BUILD_HOST_JAVA_LIBRARY
This will allow us to convert icu4j-icudata / icu4j-icutzdata
targets to "host" targets rather than "target" targets.
Right now they are forcing Jack off just so they can use
javac + jarjar (even though the resulting file is used on
host).
Bug:
27218410
(cherry picked from commit
30b21ad579fab9669ec00845bfa092e4318eed10)
Change-Id: I4f16896606bcfdd00164078eeb142d05b29bb832
Dan Willemsen [Fri, 4 Mar 2016 01:37:50 +0000 (17:37 -0800)]
Do not apply GLOBAL_CFLAGS_NO_OVERRIDE to host *.S
Target assembly files do not get these cflags, align the host
definitions to do the same.
Change-Id: Idadfa1f367c3ebea44460c5798225a85dd319371
Yabin Cui [Thu, 3 Mar 2016 19:02:56 +0000 (19:02 +0000)]
Merge "Enable LOCAL_POST_LINK_CMD for non-static executables."
am:
1f310530fc
* commit '
1f310530fcd3c15b0d5d2b067d1ad320bc4faef2':
Enable LOCAL_POST_LINK_CMD for non-static executables.
Yabin Cui [Thu, 3 Mar 2016 18:59:38 +0000 (18:59 +0000)]
Merge "Enable LOCAL_POST_LINK_CMD for non-static executables."
Yabin Cui [Wed, 2 Mar 2016 22:03:41 +0000 (14:03 -0800)]
Enable LOCAL_POST_LINK_CMD for non-static executables.
It is needed to insert testdata section into simpleperf cts test.
Bug:
27387280
Change-Id: I58cea106d135f535626d8624a016bd2aaceeb8ea
Ying Wang [Wed, 2 Mar 2016 19:21:23 +0000 (19:21 +0000)]
Merge "Clean generated source dir if .proto/.rs is gonee."
am:
591fa1284a
* commit '
591fa1284aa29ec8b2ff8917ce86f81c5b14ad0a':
Clean generated source dir if .proto/.rs is gonee.
Ying Wang [Wed, 2 Mar 2016 19:21:12 +0000 (19:21 +0000)]
Merge "Support arch specific variants of LOCAL_STRIP_MODULE/LOCAL_PACK_MODULE_RELOCATIONS"
am:
de9e5d40ef
* commit '
de9e5d40ef8d9433ad22bb41fa428c7cec5e1549':
Support arch specific variants of LOCAL_STRIP_MODULE/LOCAL_PACK_MODULE_RELOCATIONS
Ying Wang [Wed, 2 Mar 2016 19:01:28 +0000 (19:01 +0000)]
Merge "Clean generated source dir if .proto/.rs is gonee."
Ying Wang [Wed, 2 Mar 2016 19:01:24 +0000 (19:01 +0000)]
Merge "Support arch specific variants of LOCAL_STRIP_MODULE/LOCAL_PACK_MODULE_RELOCATIONS"
Ying Wang [Wed, 2 Mar 2016 06:05:25 +0000 (22:05 -0800)]
Clean generated source dir if .proto/.rs is gonee.
Similar to how we clean the generated source dir if .aidl becomes
obsolete.
Bug:
26688474
Change-Id: I66c5b6d6513259b5f4f4bac84f384f4bf953d82a
(cherry-pick from commit
d5ffec938344defd437d8e315d6a3376b1100a5a)
Ying Wang [Wed, 2 Mar 2016 04:14:52 +0000 (20:14 -0800)]
Support arch specific variants of LOCAL_STRIP_MODULE/LOCAL_PACK_MODULE_RELOCATIONS
So that we can disable only one in multilib modules.
Bug:
27442756
Change-Id: I4ca379fac997f9165c47cb93d34bf1f483f5a241
(cherry-pick from commit
b6eb8ddbde11de0bc59cfedf7adb91a83c27d279)
Dan Willemsen [Wed, 2 Mar 2016 18:25:58 +0000 (18:25 +0000)]
Merge "Ensure prebuilt executables are executable"
am:
c92dc59c86
* commit '
c92dc59c86f09526735625c605b8e7ded1070e90':
Ensure prebuilt executables are executable
Dan Willemsen [Wed, 2 Mar 2016 18:12:06 +0000 (18:12 +0000)]
Merge "Ensure prebuilt executables are executable"
Yohann Roussel [Wed, 2 Mar 2016 09:04:20 +0000 (09:04 +0000)]
Merge "Use Jack to check build"
am:
6a9d0f9718
* commit '
6a9d0f9718f127475d702ae6831a2bec3be976b6':
Use Jack to check build
Yohann Roussel [Wed, 2 Mar 2016 08:46:24 +0000 (08:46 +0000)]
Merge "Use Jack to check build"
Dan Willemsen [Wed, 2 Mar 2016 06:04:57 +0000 (22:04 -0800)]
Ensure prebuilt executables are executable
Use 'chmod +x' to make sure that they're executable, even if the source
file is not.
Change-Id: Id155f6b4ff188f5c909fd6237fd64183af264f79
Dan Willemsen [Tue, 1 Mar 2016 23:19:33 +0000 (23:19 +0000)]
Merge changes I12810c1b,I62287a80,Ied96fdc3
am:
a65b01fc09
* commit '
a65b01fc09b47c83e59dc4757c76eafba1e15cbc':
Remove LOCAL_ACP_UNAVAILABLE
Remove unused dependencies on $(ACP)
Replace some uses of acp with cp
Dan Willemsen [Tue, 1 Mar 2016 23:18:27 +0000 (23:18 +0000)]
Merge changes I12810c1b,I62287a80,Ied96fdc3
* changes:
Remove LOCAL_ACP_UNAVAILABLE
Remove unused dependencies on $(ACP)
Replace some uses of acp with cp
Ari Hausman-Cohen [Tue, 1 Mar 2016 22:45:24 +0000 (22:45 +0000)]
Merge "Adding a brillo_tests task."
am:
3bbaa8a8ff
* commit '
3bbaa8a8ffe18a2afc3d9d2ee36dfcf74775aba8':
Adding a brillo_tests task.
Ari Hausman-Cohen [Tue, 1 Mar 2016 22:38:07 +0000 (22:38 +0000)]
Merge "Adding a brillo_tests task."
Dan Willemsen [Mon, 29 Feb 2016 21:20:29 +0000 (13:20 -0800)]
Remove LOCAL_ACP_UNAVAILABLE
Now that copy-file-to-target doesn't use acp, nothing in the acp build
path uses acp, so we don't need to special case it to prevent loops.
Change-Id: I12810c1b064d0c03135a80077a76bc4c9cc18b24
Dan Willemsen [Tue, 1 Mar 2016 01:52:39 +0000 (17:52 -0800)]
Remove unused dependencies on $(ACP)
Most of these are calling to copy-file-to-target or similar, which no
longer use $(ACP).
Change-Id: I62287a80c577c34df587b74e70055c2f56050ce7
Dan Willemsen [Mon, 29 Feb 2016 20:45:18 +0000 (12:45 -0800)]
Replace some uses of acp with cp
ACP was originally created to overcome differences with cp between
Linux, Darwin, and Windows. We've since dropped Windows as a build host,
and don't use features like '-u' anymore.
For most of our current usecases, 'acp' is identical to 'cp' except that
it splits 'cp -p' into 'acp -p' for mode and ownership, and 'acp -t' for
timestamps. On Linux, this could be specified using
'--preserve=mode,ownership', but Darwin doesn't have this.
Since we're removing the destination file before copying, 'cp' already
preserves the mode (modulated by the umask). So the only extra thing
that gets preserved with 'acp -p' is ownership, which we should not care
about in the build system. (In many cases we shouldn't be preserving
mode either, so that readonly source trees can actually be marked
readonly, but that will be a future change)
Change-Id: Ied96fdc303ac5c774347c07363daec8b6dfb22e4
Dan Willemsen [Tue, 1 Mar 2016 18:50:46 +0000 (18:50 +0000)]
Merge "Remove unused config variables"
am:
1dde47d0b6
* commit '
1dde47d0b6796c3f9c1ec2d41c6c2597f9f13242':
Remove unused config variables
Dan Willemsen [Tue, 1 Mar 2016 18:49:37 +0000 (18:49 +0000)]
Merge "Remove unused config variables"
Dan Willemsen [Tue, 1 Mar 2016 18:21:17 +0000 (18:21 +0000)]
Merge "Remove destination before copying file"
am:
469665ded5
* commit '
469665ded53d758a6cb5b5462e1219efe4135108':
Remove destination before copying file
Dan Willemsen [Tue, 1 Mar 2016 18:20:06 +0000 (18:20 +0000)]
Merge "Remove destination before copying file"
Yohann Roussel [Tue, 18 Aug 2015 17:18:18 +0000 (19:18 +0200)]
Use Jack to check build
Run jack with no outputs as a quick check for compilation errors and use
a timestamp to store that check was made.
Bug:
19069325
(cherry picked from commit
43084d9f49a994a7eaebd3c94758d0ebf4c74b6e)
Change-Id: I9b84b503b28cfdfa245f91da0061ee3a79386b28
Dan Willemsen [Tue, 1 Mar 2016 09:14:03 +0000 (01:14 -0800)]
Remove unused config variables
These either don't exist or are not used.
Change-Id: I219e4691337223357797fae47ce112df8428bdfa
Dan Willemsen [Tue, 1 Mar 2016 07:06:44 +0000 (07:06 +0000)]
Merge "Remove special cases in installclean"
am:
fc7c3d33b8
* commit '
fc7c3d33b8b32042f8c12687fd269270b4e8ec90':
Remove special cases in installclean
Dan Willemsen [Tue, 1 Mar 2016 07:04:40 +0000 (07:04 +0000)]
Merge "Remove special cases in installclean"
Dan Willemsen [Mon, 29 Feb 2016 20:45:18 +0000 (12:45 -0800)]
Remove destination before copying file
If there's a symlink as the destination to one of these macros,
currently we'll write to the destination of that symlink instead of
overwriting the symlink. We've run into this a few times when a module
is added to replace a symlink that used to exist via
LOCAL_POST_INSTALL_CMD. These have required manual discovery, and
additions to CleanSpec.mk files:
http://android-review.googlesource.com/143334
Use `rm -f` for single-file targets to remove the destination before
copying. On Linux, `cp --remove-destination` can work, but is not
supported by Darwin or acp.
There may still be problems with dependencies when symlinks are
involved, since ninja will use the destination of the symlink to check
whether it is up to date. But at least with this change, if any
dependency gets regenerated, we'll properly reset the file.
Change-Id: I6d3ac0bd9ced5e21a0ff9dad0eaff012a7bc9c75
Olof Johansson [Mon, 29 Feb 2016 23:27:59 +0000 (23:27 +0000)]
Merge "sandybridge setup: no AES_NI, AVX, MOVBE"
am:
b044f082e6
* commit '
b044f082e62dd8ac3d2a08b209c95842fb30838e':
sandybridge setup: no AES_NI, AVX, MOVBE
Olof Johansson [Mon, 29 Feb 2016 23:27:04 +0000 (23:27 +0000)]
Merge "sandybridge setup: no AES_NI, AVX, MOVBE"
Dan Willemsen [Mon, 29 Feb 2016 23:15:16 +0000 (15:15 -0800)]
Remove special cases in installclean
When switch build types or products, it's no longer necessary to special
case these projects that change their command line based on the build
type or product. Ninja keeps track of the command line last used to
create a file, and will mark it as dirty if the new command line is
different.
Change-Id: I905ff9599eae2952bddc05e7328f77f0849be20a
Dan Willemsen [Mon, 29 Feb 2016 22:17:29 +0000 (22:17 +0000)]
Merge "Remove USE_NINJA=false"
am:
3bfc095f53
* commit '
3bfc095f5373ca1756923f8aacdebdadc8ebd4ea':
Remove USE_NINJA=false
Dan Willemsen [Mon, 29 Feb 2016 22:16:14 +0000 (22:16 +0000)]
Merge "Remove USE_NINJA=false"
Ari Hausman-Cohen [Mon, 29 Feb 2016 21:08:49 +0000 (13:08 -0800)]
Adding a brillo_tests task.
Places whitelisted brillo tests and the whitelist itself
in a zip when run.
BUG:
27385399
Change-Id: I93c2ea8cc521292a6de811bb47bc87a727edd21f
TEST: manual make dist brillo_tests, confirmed desired files were in zip.
Nick Kralevich [Mon, 29 Feb 2016 16:46:08 +0000 (16:46 +0000)]
Merge "delete recovery policy on changing build types"
am:
1888ea5fef
* commit '
1888ea5fef5f41ec3298bfd67f14b06e6dfb6f9c':
delete recovery policy on changing build types
Nick Kralevich [Mon, 29 Feb 2016 16:44:37 +0000 (16:44 +0000)]
Merge "delete recovery policy on changing build types"
Nicolas Geoffray [Mon, 29 Feb 2016 12:29:31 +0000 (12:29 +0000)]
Merge "Check LEGACY_USE_JAVA7 before using 1.8."
am:
239783a7ff
* commit '
239783a7ff9691ec92034f0268eeebbe75e906e3':
Check LEGACY_USE_JAVA7 before using 1.8.
Nicolas Geoffray [Mon, 29 Feb 2016 12:27:58 +0000 (12:27 +0000)]
Merge "Check LEGACY_USE_JAVA7 before using 1.8."
Nicolas Geoffray [Mon, 29 Feb 2016 12:07:00 +0000 (12:07 +0000)]
Check LEGACY_USE_JAVA7 before using 1.8.
Fixes current bots not updated to Java8 yet.
Change-Id: I61f5a3f0de6ca0ee9eca64f0ee08454f93e59704
Shinichiro Hamaji [Mon, 29 Feb 2016 11:05:46 +0000 (11:05 +0000)]
Merge "Link everything in libpthread.a to ckati"
am:
a9b464770b
* commit '
a9b464770bf2a2a2cff279eb6042477786798d24':
Link everything in libpthread.a to ckati
Shinichiro Hamaji [Mon, 29 Feb 2016 11:04:36 +0000 (11:04 +0000)]
Merge "Link everything in libpthread.a to ckati"
Neil Fuller [Mon, 29 Feb 2016 10:59:44 +0000 (10:59 +0000)]
Merge "Change the default for LOCAL_JAVA_LANGUAGE_VERSION from 1.7 to 1.8"
am:
008ebe4f04
* commit '
008ebe4f04e41ef500bdbcab1b58cadcaec54cb5':
Change the default for LOCAL_JAVA_LANGUAGE_VERSION from 1.7 to 1.8
Neil Fuller [Mon, 29 Feb 2016 10:58:09 +0000 (10:58 +0000)]
Merge "Change the default for LOCAL_JAVA_LANGUAGE_VERSION from 1.7 to 1.8"
Nick Kralevich [Sat, 27 Feb 2016 18:41:41 +0000 (10:41 -0800)]
delete recovery policy on changing build types
When the build type changes (for example, from "shamu-userdebug"
to "shamu-user"), the build system doesn't delete all files
and start over. Rather, build artifacts from the old build type
are reused for the new build type.
This is problematic for the recovery SELinux policy, which differs
between build types. Reusing a userdebug policy on a user build
is inappropriate and could lead to security bugs.
Force the deletion of the recovery SELinux policy when changing
build types, so it can be properly regenerated. This is consistent
with how we treat the normal SELinux policy (see commit
a8b3d54101eccb9950651103c199edf0ce2520f7).
Change-Id: I4ebafe3712dc121644828f6538865061aad58cc0
Dan Willemsen [Wed, 6 Jan 2016 22:28:36 +0000 (14:28 -0800)]
Remove USE_NINJA=false
And everything special-cased on that. Add a warning if USE_NINJA is
set to let users know that it no longer changes anything.
Change-Id: Ib8739151fe26ea6bf8f76b7ac2b8f4097dab0b47
Colin Cross [Sat, 27 Feb 2016 05:14:02 +0000 (05:14 +0000)]
Merge "Make multiple rules to generate a file an error"
am:
5e2e53e421
* commit '
5e2e53e4216300aa841d65f95dd607be58983a14':
Make multiple rules to generate a file an error
Dan Willemsen [Sat, 27 Feb 2016 05:12:28 +0000 (05:12 +0000)]
Merge "Make multiple rules to generate a file an error"
Tao Bao [Sat, 27 Feb 2016 00:12:08 +0000 (00:12 +0000)]
Merge "releasetools: Add --oem_no_mount option."
am:
1e0367410d
* commit '
1e0367410d3c79fcd7e64a584029a3c756757c80':
releasetools: Add --oem_no_mount option.
Tao Bao [Sat, 27 Feb 2016 00:08:39 +0000 (00:08 +0000)]
Merge "releasetools: Add --oem_no_mount option."
Tao Bao [Fri, 26 Feb 2016 03:49:55 +0000 (19:49 -0800)]
releasetools: Add --oem_no_mount option.
We may have devices with OEM-specific properties but without an OEM
partition (e.g. the properties might be set by init based on hardware
SKUs). For such devices, we supply --oem_no_mount to skip mounting the
OEM partition in the updater-script. The option is only meaningful when
-o (--oem_settings) is specified.
Bug:
27359929
Change-Id: Ic08396e478a82be4188e980e704b33b4f704a8d7
Neil Fuller [Tue, 16 Feb 2016 13:04:51 +0000 (13:04 +0000)]
Change the default for LOCAL_JAVA_LANGUAGE_VERSION from 1.7 to 1.8
Modify the compiler flags for Jack and javac.
This has the following effects:
1) Generally, some of the type inference rules changed.
2) javac: bytecode is generated with the v52 major version (not v51)
3) jack: Java 8 language features are supported.
The javac / dx toolchain does not support Java 8 language features.
Bug:
26753820
(cherry picked from commit
fda1ace26116a6677cc77c92c24e5259817fb86e)
Change-Id: I07769de473775d95b13feb38c0eb37086eb120f7
Shinichiro Hamaji [Fri, 26 Feb 2016 07:58:13 +0000 (16:58 +0900)]
Link everything in libpthread.a to ckati
With this workaround, we can delete a lot of unnecessary code
in ckati: https://github.com/google/kati/commit/
8380fb8525adfb5
Change-Id: I3de1bf4cd6f2a65ee9322e8504459621871612fc
Tao Bao [Fri, 26 Feb 2016 00:41:29 +0000 (00:41 +0000)]
Merge "releasetools: Support generating downgrade incremental OTAs."
am:
1284954db0
* commit '
1284954db036e5c2fdf5576bd03f415b8a201078':
releasetools: Support generating downgrade incremental OTAs.
Tao Bao [Fri, 26 Feb 2016 00:39:09 +0000 (00:39 +0000)]
Merge "releasetools: Support generating downgrade incremental OTAs."
Dan Albert [Thu, 25 Feb 2016 22:20:40 +0000 (22:20 +0000)]
Merge "Add a global define for non-external code."
am:
036b4fce25
* commit '
036b4fce2516dfa755f6f9e5566b537ca81de5db':
Add a global define for non-external code.
Dan Albert [Thu, 25 Feb 2016 22:17:42 +0000 (22:17 +0000)]
Merge "Add a global define for non-external code."
Dan Albert [Sat, 30 Jan 2016 00:51:51 +0000 (16:51 -0800)]
Add a global define for non-external code.
There are some code policies we want to enforce more strictly, but
it's hard to do so for third party code because we have to either
carry the diff burden or upstream the patch, and in the latter case
the turnaround time for fixes can be problematic, and sometimes
upstream won't accept changes (sometimes people just need to win the
obfuscated C contest).
We define ANDROID_STRICT for any code that we expect to be able to
make these policy fixes as we change policies.
Change-Id: I15faf62cec1932dd859a082f66942b2606d0ff45
Ying Wang [Thu, 25 Feb 2016 18:32:54 +0000 (18:32 +0000)]
Merge "Don\'t ignore LOCAL_INIT_RC if LOCAL_INIT_RC_32/64 is used."
am:
0e0e95e592
* commit '
0e0e95e592d3538dc2e816e6d5291231b0cd47c7':
Don't ignore LOCAL_INIT_RC if LOCAL_INIT_RC_32/64 is used.
Ying Wang [Thu, 25 Feb 2016 18:28:57 +0000 (18:28 +0000)]
Merge "Don't ignore LOCAL_INIT_RC if LOCAL_INIT_RC_32/64 is used."
Chih-hung Hsieh [Thu, 25 Feb 2016 17:22:07 +0000 (17:22 +0000)]
Merge "Use new clang scan-build script."
am:
1b460584d2
* commit '
1b460584d2556132f3c8aacac028414755e68887':
Use new clang scan-build script.
Chih-hung Hsieh [Thu, 25 Feb 2016 17:16:54 +0000 (17:16 +0000)]
Merge "Use new clang scan-build script."
Chih-Hung Hsieh [Thu, 25 Feb 2016 00:42:15 +0000 (16:42 -0800)]
Use new clang scan-build script.
The actual clang compiler called for static analysis is decided
by build/core/binary.mk, not the one given to --use-analyzer.
BUG:
13287788
Change-Id: I58105c20b56ce17ddf329a275c750d14284d1e25
Ying Wang [Thu, 25 Feb 2016 01:34:52 +0000 (17:34 -0800)]
Don't ignore LOCAL_INIT_RC if LOCAL_INIT_RC_32/64 is used.
It's a valid situation for all three of LOCAL_INIT_RC, LOCAL_INIT_RC_32,
and LOCAL_INIT_RC_64 to be used.
Bug:
26773181
Change-Id: If9661f93b1823279075fc3d55195f7a939e01b6f
Alex Light [Wed, 24 Feb 2016 23:30:52 +0000 (23:30 +0000)]
Merge "Mark the cortex-{a7,a53,a53.57} chips as supporting LPAE"
am:
4859b22e7d
* commit '
4859b22e7ddd9ee95e603cf93676eb1dfc392b71':
Mark the cortex-{a7,a53,a53.57} chips as supporting LPAE
Alex Light [Wed, 24 Feb 2016 23:26:02 +0000 (23:26 +0000)]
Merge "Mark the cortex-{a7,a53,a53.57} chips as supporting LPAE"
Alex Light [Wed, 24 Feb 2016 21:08:58 +0000 (13:08 -0800)]
Mark the cortex-{a7,a53,a53.57} chips as supporting LPAE
Bug:
27340895
Bug:
27324856
Change-Id: Id3994c6d334c8bb673fc3849550f591136a8dd6a
Stephen Hines [Wed, 24 Feb 2016 21:40:16 +0000 (21:40 +0000)]
Merge "Update to use the latest clang-
2629532."
am:
78014dbaf6
* commit '
78014dbaf6f7dc4894ab96a18da3635bc83df665':
Update to use the latest clang-
2629532.
Stephen Hines [Wed, 24 Feb 2016 21:11:13 +0000 (21:11 +0000)]
Merge "Update to use the latest clang-
2629532."
Tao Bao [Tue, 23 Feb 2016 19:38:39 +0000 (11:38 -0800)]
releasetools: Support generating downgrade incremental OTAs.
Add --downgrade flag to ota_from_target_files.py script. It allows
generating an incremental OTA that updates from a newer build to an
older one (based on timestamp comparison). "post-timestamp" line in the
metadata file will be replaced by "ota-downgrade=yes". A data wipe will
always be enforced, so "ota-wipe=yes" will also be included in the
metadata file.
Bug:
26883782
Change-Id: Iaa05f662d948b7ab632a9fbb7051cc3f8bf68c21
Stephen Hines [Wed, 24 Feb 2016 05:58:06 +0000 (21:58 -0800)]
Update to use the latest clang-
2629532.
Bug: http://b/
25642296
Change-Id: Ib6c94bc57f7145c1cc9b14338126132fc4648509
Olof Johansson [Wed, 24 Feb 2016 02:21:42 +0000 (18:21 -0800)]
sandybridge setup: no AES_NI, AVX, MOVBE
Sandy Bridge actually doesn't have all of these options. For example AVX is only
available on the higher-end SKUs (not on Celeron G550).
Change-Id: Ib595a9a6b464626d0c88525c6aaa4d69176645cc
Dan Willemsen [Tue, 23 Feb 2016 23:53:58 +0000 (23:53 +0000)]
Merge "Warn more clearly when there are duplicate copied headers"
am:
ca4b755563
* commit '
ca4b755563aa8d6d7544b38067bb82567f5fa255':
Warn more clearly when there are duplicate copied headers
Dan Willemsen [Tue, 23 Feb 2016 23:46:25 +0000 (23:46 +0000)]
Merge "Warn more clearly when there are duplicate copied headers"
Colin Cross [Wed, 23 Sep 2015 20:52:22 +0000 (13:52 -0700)]
Make multiple rules to generate a file an error
Pass -w dupbuild=err to ninja to make defining multiple rules to build a
file an error instead of a warning. Proceeding with the build would
result in undefined behavior, and nobody notices the warning.
Change-Id: Iadac88f8835121a8685bff835acba638100bb654
Dan Willemsen [Tue, 23 Feb 2016 21:40:07 +0000 (13:40 -0800)]
Warn more clearly when there are duplicate copied headers
When more than one makefile tries to copy a header to the same
destination, the warning is not clear, and hard to track down and assign
blame:
build/core/copy_headers.mk:15: warning: ignoring old commands for target `out/target/product/bullhead/obj/include/qcom/display/copybit.h'
With this change, the same behavior is kept, but the warning message is
more descriptive, and contains the offending Android.mk files:
build/core/Makefile:54: Duplicate header copy: out/target/product/bullhead/obj/include/qcom/display/copybit.h
build/core/Makefile:54: Defined in: hardware/qcom/display/msm8994/libcopybit/Android.mk hardware/qcom/display/msm8994/libcopybit/Android.mk
In this case, a $(CLEAR_VARS) is missing, so the same Android.mk file is
copying the same headers twice.
Bug:
27302058
Change-Id: Icf8f580ae71a78741db21c1d8f3213424459e637
Ying Wang [Tue, 23 Feb 2016 18:09:22 +0000 (18:09 +0000)]
Merge "Make sure my_src_jar is set up properly for host prebuilt jar"
am:
de4078449f
* commit '
de4078449fd9764d1a63469d6efb0d90b9265ff9':
Make sure my_src_jar is set up properly for host prebuilt jar
Ying Wang [Tue, 23 Feb 2016 18:06:01 +0000 (18:06 +0000)]
Merge "Make sure my_src_jar is set up properly for host prebuilt jar"
Calin Juravle [Tue, 23 Feb 2016 14:11:56 +0000 (14:11 +0000)]
Merge "Add profman to the build scripts"
am:
487479f301
* commit '
487479f301e49e8955d0930c760b739507f76ddc':
Add profman to the build scripts
Calin Juravle [Tue, 23 Feb 2016 14:07:40 +0000 (14:07 +0000)]
Merge "Add profman to the build scripts"
Calin Juravle [Fri, 19 Feb 2016 16:54:20 +0000 (16:54 +0000)]
Add profman to the build scripts
Bug:
26719109
Bug:
26563023
(cherry picked from commit
aab43390a050a4eeb2914a3186994ca8b6a5c4e6)
Change-Id: Idc49872eebb283436fcdd02fe095e8c8826aff44