Commit graph

26572 commits

Author SHA1 Message Date
Yohann Roussel
4fd0463191 Merge "Use Jack to check build"
am: 6a9d0f9718

* commit '6a9d0f9718f127475d702ae6831a2bec3be976b6':
  Use Jack to check build
2016-03-02 09:04:20 +00:00
Yohann Roussel
6a9d0f9718 Merge "Use Jack to check build" 2016-03-02 08:46:24 +00:00
Dan Willemsen
cdaf748e3a 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
2016-03-01 23:19:33 +00:00
Dan Willemsen
a65b01fc09 Merge changes I12810c1b,I62287a80,Ied96fdc3
* changes:
  Remove LOCAL_ACP_UNAVAILABLE
  Remove unused dependencies on $(ACP)
  Replace some uses of acp with cp
2016-03-01 23:18:27 +00:00
Ari Hausman-Cohen
1d59db0794 Merge "Adding a brillo_tests task."
am: 3bbaa8a8ff

* commit '3bbaa8a8ffe18a2afc3d9d2ee36dfcf74775aba8':
  Adding a brillo_tests task.
2016-03-01 22:45:24 +00:00
Ari Hausman-Cohen
3bbaa8a8ff Merge "Adding a brillo_tests task." 2016-03-01 22:38:07 +00:00
Dan Willemsen
479311bc7c 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
2016-03-01 13:16:53 -08:00
Dan Willemsen
7f016150a0 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
2016-03-01 13:15:35 -08:00
Dan Willemsen
f1a98af5fc 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
2016-03-01 13:08:50 -08:00
Dan Willemsen
4914c9b28e Merge "Remove unused config variables"
am: 1dde47d0b6

* commit '1dde47d0b6796c3f9c1ec2d41c6c2597f9f13242':
  Remove unused config variables
2016-03-01 18:50:46 +00:00
Dan Willemsen
1dde47d0b6 Merge "Remove unused config variables" 2016-03-01 18:49:37 +00:00
Dan Willemsen
e401e09a3c Merge "Remove destination before copying file"
am: 469665ded5

* commit '469665ded53d758a6cb5b5462e1219efe4135108':
  Remove destination before copying file
2016-03-01 18:21:17 +00:00
Dan Willemsen
469665ded5 Merge "Remove destination before copying file" 2016-03-01 18:20:06 +00:00
Yohann Roussel
ee57268cd7 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 43084d9f49)

Change-Id: I9b84b503b28cfdfa245f91da0061ee3a79386b28
2016-03-01 16:34:08 +01:00
Dan Willemsen
d4390d3007 Remove unused config variables
These either don't exist or are not used.

Change-Id: I219e4691337223357797fae47ce112df8428bdfa
2016-03-01 01:14:03 -08:00
Dan Willemsen
de17aac9a0 Merge "Remove special cases in installclean"
am: fc7c3d33b8

* commit 'fc7c3d33b8b32042f8c12687fd269270b4e8ec90':
  Remove special cases in installclean
2016-03-01 07:06:44 +00:00
Dan Willemsen
fc7c3d33b8 Merge "Remove special cases in installclean" 2016-03-01 07:04:40 +00:00
Dan Willemsen
3545eeb6c1 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
2016-02-29 22:22:29 -08:00
Olof Johansson
5cbf049710 Merge "sandybridge setup: no AES_NI, AVX, MOVBE"
am: b044f082e6

* commit 'b044f082e62dd8ac3d2a08b209c95842fb30838e':
  sandybridge setup: no AES_NI, AVX, MOVBE
2016-02-29 23:27:59 +00:00
Olof Johansson
b044f082e6 Merge "sandybridge setup: no AES_NI, AVX, MOVBE" 2016-02-29 23:27:04 +00:00
Dan Willemsen
7574cb582d 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
2016-02-29 15:15:16 -08:00
Dan Willemsen
d73633c082 Merge "Remove USE_NINJA=false"
am: 3bfc095f53

* commit '3bfc095f5373ca1756923f8aacdebdadc8ebd4ea':
  Remove USE_NINJA=false
2016-02-29 22:17:29 +00:00
Dan Willemsen
3bfc095f53 Merge "Remove USE_NINJA=false" 2016-02-29 22:16:14 +00:00
Ari Hausman-Cohen
746f40236b 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.
2016-02-29 13:48:06 -08:00
Nick Kralevich
7cf7bc0956 Merge "delete recovery policy on changing build types"
am: 1888ea5fef

* commit '1888ea5fef5f41ec3298bfd67f14b06e6dfb6f9c':
  delete recovery policy on changing build types
2016-02-29 16:46:08 +00:00
Nick Kralevich
1888ea5fef Merge "delete recovery policy on changing build types" 2016-02-29 16:44:37 +00:00
Nicolas Geoffray
efe15f7429 Merge "Check LEGACY_USE_JAVA7 before using 1.8."
am: 239783a7ff

* commit '239783a7ff9691ec92034f0268eeebbe75e906e3':
  Check LEGACY_USE_JAVA7 before using 1.8.
2016-02-29 12:29:31 +00:00
Nicolas Geoffray
239783a7ff Merge "Check LEGACY_USE_JAVA7 before using 1.8." 2016-02-29 12:27:58 +00:00
Nicolas Geoffray
8d772e26b4 Check LEGACY_USE_JAVA7 before using 1.8.
Fixes current bots not updated to Java8 yet.

Change-Id: I61f5a3f0de6ca0ee9eca64f0ee08454f93e59704
2016-02-29 12:08:42 +00:00
Shinichiro Hamaji
8f9b8ddf00 Merge "Link everything in libpthread.a to ckati"
am: a9b464770b

* commit 'a9b464770bf2a2a2cff279eb6042477786798d24':
  Link everything in libpthread.a to ckati
2016-02-29 11:05:46 +00:00
Shinichiro Hamaji
a9b464770b Merge "Link everything in libpthread.a to ckati" 2016-02-29 11:04:36 +00:00
Neil Fuller
59a8afcc88 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
2016-02-29 10:59:44 +00:00
Neil Fuller
008ebe4f04 Merge "Change the default for LOCAL_JAVA_LANGUAGE_VERSION from 1.7 to 1.8" 2016-02-29 10:58:09 +00:00
Nick Kralevich
3cb10bbd3b 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
a8b3d54101).

Change-Id: I4ebafe3712dc121644828f6538865061aad58cc0
2016-02-27 10:41:41 -08:00
Dan Willemsen
1c6dc5b942 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
2016-02-26 21:48:31 -08:00
Colin Cross
44c7b4b80b Merge "Make multiple rules to generate a file an error"
am: 5e2e53e421

* commit '5e2e53e4216300aa841d65f95dd607be58983a14':
  Make multiple rules to generate a file an error
2016-02-27 05:14:02 +00:00
Dan Willemsen
5e2e53e421 Merge "Make multiple rules to generate a file an error" 2016-02-27 05:12:28 +00:00
Tao Bao
f457860e46 Merge "releasetools: Add --oem_no_mount option."
am: 1e0367410d

* commit '1e0367410d3c79fcd7e64a584029a3c756757c80':
  releasetools: Add --oem_no_mount option.
2016-02-27 00:12:08 +00:00
Tao Bao
1e0367410d Merge "releasetools: Add --oem_no_mount option." 2016-02-27 00:08:39 +00:00
Tao Bao
8608cde944 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
2016-02-26 16:07:16 -08:00
Neil Fuller
db47d66b5e 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
2016-02-26 14:56:38 +00:00
Shinichiro Hamaji
f4511161d5 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
2016-02-26 17:03:55 +09:00
Tao Bao
5a697261fd Merge "releasetools: Support generating downgrade incremental OTAs."
am: 1284954db0

* commit '1284954db036e5c2fdf5576bd03f415b8a201078':
  releasetools: Support generating downgrade incremental OTAs.
2016-02-26 00:41:29 +00:00
Tao Bao
1284954db0 Merge "releasetools: Support generating downgrade incremental OTAs." 2016-02-26 00:39:09 +00:00
Dan Albert
2b8c384da3 Merge "Add a global define for non-external code."
am: 036b4fce25

* commit '036b4fce2516dfa755f6f9e5566b537ca81de5db':
  Add a global define for non-external code.
2016-02-25 22:20:40 +00:00
Dan Albert
036b4fce25 Merge "Add a global define for non-external code." 2016-02-25 22:17:42 +00:00
Dan Albert
5ae31ddedc 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
2016-02-25 12:25:43 -08:00
Ying Wang
7daeda5b80 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.
2016-02-25 18:32:54 +00:00
Ying Wang
0e0e95e592 Merge "Don't ignore LOCAL_INIT_RC if LOCAL_INIT_RC_32/64 is used." 2016-02-25 18:28:57 +00:00
Chih-hung Hsieh
20aecac087 Merge "Use new clang scan-build script."
am: 1b460584d2

* commit '1b460584d2556132f3c8aacac028414755e68887':
  Use new clang scan-build script.
2016-02-25 17:22:07 +00:00