Commit graph

9529 commits

Author SHA1 Message Date
Dan Willemsen
93536c29b1 Merge "Remove destination before copying file" am: 469665ded5
am: e401e09a3c

* commit 'e401e09a3cf067f7eb15b5e94274a763a039be9c':
  Remove destination before copying file
2016-03-01 19:46:49 +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
Dan Willemsen
8ac458780c Merge "Remove special cases in installclean" am: fc7c3d33b8
am: de17aac9a0

* commit 'de17aac9a03c922976916e427806a453da83dc53':
  Remove special cases in installclean
2016-03-01 16:38:44 +00:00
Stuart Scott
c0f9deb222 Switch to CTSv2
am: 794308f169

* commit '794308f1690cd4cca632efa9bacc22548d9f89ee':
  Switch to CTSv2
2016-03-01 07:43:37 +00: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
Stuart Scott
794308f169 Switch to CTSv2
bug:21762834
Change-Id: If91fd4de148241760ff29cbe227864e301a9fca7
2016-02-29 20:47:35 -08:00
Olof Johansson
760a463e5b Merge "sandybridge setup: no AES_NI, AVX, MOVBE" am: b044f082e6
am: 5cbf049710

* commit '5cbf049710392924a72ba586e9260cb1e24cb485':
  sandybridge setup: no AES_NI, AVX, MOVBE
2016-02-29 23:29:23 +00: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
9ffa38b193 Merge "Remove USE_NINJA=false" am: 3bfc095f53
am: d73633c082

* commit 'd73633c0824a63f7104bddf9a798bccc952b545c':
  Remove USE_NINJA=false
2016-02-29 22:19:29 +00: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
Nick Kralevich
2f995877ea Merge "delete recovery policy on changing build types" am: 1888ea5fef
am: 7cf7bc0956

* commit '7cf7bc0956b876842191b193df46abdcc21384a8':
  delete recovery policy on changing build types
2016-02-29 16:47:30 +00: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
133e1e1f16 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).

(cherry picked from commit 3cb10bbd3b)

Change-Id: I1d8ad7e06112777c66abed4546dadb85d35e33e1
2016-02-29 08:45:31 -08:00
Nick Kralevich
1888ea5fef Merge "delete recovery policy on changing build types" 2016-02-29 16:44:37 +00:00
Nicolas Geoffray
d7e28fa261 Merge "Check LEGACY_USE_JAVA7 before using 1.8." am: 239783a7ff
am: efe15f7429

* commit 'efe15f7429bf235437587994c6c45fc8c4682fab':
  Check LEGACY_USE_JAVA7 before using 1.8.
2016-02-29 12:30:53 +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
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
312215557e Merge "Link everything in libpthread.a to ckati" am: a9b464770b
am: 8f9b8ddf00

* commit '8f9b8ddf00d4ab32e680933304474518011a092d':
  Link everything in libpthread.a to ckati
2016-02-29 11:07:11 +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
a27a591042 Merge "Make multiple rules to generate a file an error" am: 5e2e53e421
am: 44c7b4b80b

* commit '44c7b4b80bdf69fc1d44a593a78510e85c941689':
  Make multiple rules to generate a file an error
2016-02-27 05:15:34 +00: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
Ying Wang
64ef18e840 Merge "AAPT2: library resource compilation" into nyc-dev
am: 6dece90534

* commit '6dece90534af8b290ccc385fda2e4cf0f3a37454':
  AAPT2: library resource compilation
2016-02-26 23:02:04 +00:00
Ying Wang
6dece90534 Merge "AAPT2: library resource compilation" into nyc-dev 2016-02-26 22:58:12 +00:00
Keun Soo Yim
e575822d53 Merge "build file change for vts to use the existing cts-tradefed infrastructure" into nyc-dev
am: 4773d29ab7

* commit '4773d29ab74b15895550d04bf5ac72899d036385':
  build file change for vts to use the existing cts-tradefed infrastructure
2016-02-26 19:27:37 +00:00
Ying Wang
e295c3df68 AAPT2: library resource compilation
- Switch to static library's package-res.apk as the link artifact.
- For prebuilt AAR file, build package-res.apk using aapt2's "--dir"
  option.
- New LOCAL variables:
  LOCAL_USE_AAPT2: a module can opt-in with "LOCAL_USE_AAPT2 := true".
  LOCAL_STATIC_ANDROID_LIBRARIES: static Java libraries with compiled
                   resources.
  LOCAL_SHARED_ANDROID_LIBRARIES: shared Java libraries with compiled
                   resources.

Bug: 25958912
Change-Id: I4be2d1e8137555986338c2583cb39b0c97391751
2016-02-26 10:44:56 -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
Dan Albert
12ce3e2b79 Merge "Add a global define for non-external code." am: 036b4fce25
am: 2b8c384da3

* commit '2b8c384da3ae091527f465cbff2950129ac17e0b':
  Add a global define for non-external code.
2016-02-25 22:21:16 +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
ea4ac87272 Merge "Don\'t ignore LOCAL_INIT_RC if LOCAL_INIT_RC_32/64 is used." am: 0e0e95e592
am: 7daeda5b80

* commit '7daeda5b80f44bb11f7bd63a70dbd5bb511bf90d':
  Don't ignore LOCAL_INIT_RC if LOCAL_INIT_RC_32/64 is used.
2016-02-25 18:35:20 +00: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
41d66783c4 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
2016-02-24 17:34:52 -08:00
Keun Soo Yim
172b7d421e build file change for vts to use the existing cts-tradefed infrastructure
Mostly done by stuartscott@

Change-Id: I016405757f39df833d532bc01fd2237e5e961a8a
2016-02-24 16:12:49 -08:00
Alex Light
cd1f001bc1 Merge "Mark the cortex-{a7,a53,a53.57} chips as supporting LPAE" am: 4859b22e7d
am: e7e8cfb849

* commit 'e7e8cfb849b59a8464658772e7faf2d3100ba00a':
  Mark the cortex-{a7,a53,a53.57} chips as supporting LPAE
2016-02-24 23:48:36 +00:00
Alex Light
f68339b025 Merge "Mark the cortex-{a7,a53,a53.57} chips as supporting LPAE" into nyc-dev 2016-02-24 23:34:06 +00:00
Alex Light
e7e8cfb849 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
2016-02-24 23:30:52 +00:00