Commit Graph

10777 Commits

Author SHA1 Message Date
Joe Onorato
401ffaeb75 Turn off excess printing during the build which makes errors harder to find.
Change-Id: I588de5ddc0aa7dcaacc4ea185c13c2fa3748888a
2016-03-09 15:25:07 -08:00
Benjamin Pujol
44dd5dbf79 Merge "Define TARGET_OUT_VENDOR_APPS_PRIVILEGED"
am: 27c3223a77

* commit '27c3223a7705dc8141002c87893fd507cb91732e':
  Define TARGET_OUT_VENDOR_APPS_PRIVILEGED
2016-03-09 21:08:10 +00:00
Mohamad Ayyash
2b4ddff0eb Merge "Hook incremental ext4 image generation into build" into nyc-dev
am: 6a3185f23d

* commit '6a3185f23d820f31cc928d5467eda94f3a93e31c':
  Hook incremental ext4 image generation into build
2016-03-09 21:07:30 +00:00
Mohamad Ayyash
6a3185f23d Merge "Hook incremental ext4 image generation into build" into nyc-dev 2016-03-09 20:56:19 +00:00
Todd Kennedy
27c3223a77 Merge "Define TARGET_OUT_VENDOR_APPS_PRIVILEGED" 2016-03-09 20:54:22 +00:00
Dan Willemsen
747e856ab9 Merge "OSX: Use the oldest SDK, but always set our target to 10.8"
am: 010c630f63

* commit '010c630f63dc948c4ef328a7735e0d18d5dda67e':
  OSX: Use the oldest SDK, but always set our target to 10.8
2016-03-09 20:33:51 +00:00
Dan Willemsen
ee49f03fe5 resolve merge conflicts of e607224349 to nyc-dev-plus-aosp
Change-Id: I659925e8169cb90eb9e6066eadd09b6789092a8d
2016-03-09 11:28:51 -08:00
Dan Willemsen
ee4a6fa59e OSX: Use the oldest SDK, but always set our target to 10.8
Build binaries usable on older machines even if older SDKs are not
installed. Older SDKs can no longer be installed on newer Xcode
versions.

Change-Id: I0c9f2534466a127a19107820879c2856bfac0076
2016-03-09 10:52:59 -08:00
Dan Willemsen
e607224349 Merge changes I1fccee8d,Ib343df6d,I2f1984c2
* changes:
  Fix C++ on Darwin
  Remove support for /Developer
  Remove support for Darwin 10.6 SDK
2016-03-09 18:31:17 +00:00
Elliott Hughes
b59457f852 Merge "Move BUILD_NATIVE_BENCHMARK over to libgoogle-benchmark." into nyc-dev 2016-03-09 15:56:50 +00:00
Colin Cross
7ef2f51319 Merge "Install boot.art extra files individually" into nyc-dev
am: 8e47cb7d82

* commit '8e47cb7d821d52fd85191f6bdb8c7998fbdb29f5':
  Install boot.art extra files individually
2016-03-09 04:49:49 +00:00
Dan Willemsen
441d646c6f Fix C++ on Darwin
We've been including the system libc++ headers even if we're building
against our version of libc++. Stop doing that, and only add the headers
to our path if we're using the system libraries.

If nothing is specified, on recent OSX versions, libc++ is the default
c++ library instead of libstdc++. We've been explicitly including the
libc++ headers on all versions, but that breaks old versions. Force us
over to libc++, since the system libstdc++ does not support C++11, and
libc++ is still supported on our oldest version (10.8).

Change-Id: I1fccee8da0f425e10ccc9d3247ed40664eb6ada0
2016-03-08 20:15:21 -08:00
Colin Cross
52dcb2f816 Install boot.art extra files individually
The rule that builds boot.art also produces boot.oat, boot-*.art, and
boot-*.oat as a side effect, and the install rule for boot.art was
installing them using *.art and *.oat.  This meant that PDK builds had
no rule to install the extra files, so it used the ones from the
platform.zip file instead of the locally built ones.

Generate a list of the files that should be produced by the boot.art
build, and manually create install rules for them that depend on the
built boot.art and are depended on by the installed boot.art.

Bug: 27546601
Change-Id: I9734491c3179bca2d4b2ae13b0c6a03e4c26b0b2
2016-03-08 18:00:05 -08:00
Elliott Hughes
9919d3be55 Move BUILD_NATIVE_BENCHMARK over to libgoogle-benchmark.
Bug: http://b/24803663

(cherry picked from commit 577f8407e9)

Change-Id: If1af37c419abe284677253c33de45dcb5ef6ea8d
2016-03-08 14:56:27 -08:00
Dan Willemsen
2a24bad8cc Remove support for /Developer
/Developer was removed in Xcode 4.3. Our minimum SDK version is 10.8,
which implies at least Xcode 4.4, and our documentation requires
Xcode 4.5.2.

Change-Id: Ib343df6ded6e98222d8ee2e542e1f3fadd2b1397
2016-03-08 13:53:15 -08:00
Dan Willemsen
fcefd5f6d8 Remove support for Darwin 10.6 SDK
Our minimum version is 10.8

Change-Id: I2f1984c2227861a3c784f2a5070853c2d1b250d6
2016-03-08 13:22:36 -08:00
Sami Tolvanen
e555f77962 build: pass version and patch level to mkbootimg
Add --os_version and --os_patch_level arguments to mkbootimg.

Needs matching changes from
  I57682611e0c27fec5ed284da7d9a788383ff98b1

Bug: 27498078
Bug: 22914603
Change-Id: I04e20b0de40d864aac92ac7bcf466a6cbde3d0e4
(cherry pick from commit 8fb47f191f)
2016-03-08 08:21:52 -08:00
Sami Tolvanen
01347fce66 Merge "build: pass version and patch level to mkbootimg" am: b32d845090
am: 450f15111c

* commit '450f15111ccd9fa54382e159a145954273f45b15':
  build: pass version and patch level to mkbootimg
2016-03-08 16:10:23 +00:00
Sami Tolvanen
450f15111c Merge "build: pass version and patch level to mkbootimg"
am: b32d845090

* commit 'b32d845090d19d2dfbbf32d4628ef81478325927':
  build: pass version and patch level to mkbootimg
2016-03-08 16:08:14 +00:00
Sami Tolvanen
b32d845090 Merge "build: pass version and patch level to mkbootimg" 2016-03-08 16:02:24 +00:00
Neil Fuller
decb797276 Make the language version selection smarter
Any artifacts that are targeting SDK versions < 24
and not explicitly setting the LOCAL_JAVA_LANGUAGE_VERSION
are now defaulted to 1.7.

Bug: 27495650
Bug: 26753820
Bug: 27377071
Change-Id: Ia903cd5bf14c1947c485384d095a93c0aa23d272
2016-03-08 13:56:49 +00:00
Dan Willemsen
b36a413519 Merge "Reexport include dirs for whole static libs" am: e2379484ab
am: 90074f7f1f

* commit '90074f7f1f128cbd528d6d709bb3aa2d22783884':
  Reexport include dirs for whole static libs
2016-03-08 07:46:03 +00:00
Martin Blumenstingl
639cd5b486 Merge "Removed duplicate definition of E2FSCK" am: d7a4e56a87
am: 7b578cbf10

* commit '7b578cbf10aab7460a0cc4e5735870a714ddac1b':
  Removed duplicate definition of E2FSCK
2016-03-08 07:45:51 +00:00
Elliott Hughes
63a651f438 Merge "Move BUILD_NATIVE_BENCHMARK over to libgoogle-benchmark." am: ef0c20621d
am: 9c34174b76

* commit '9c34174b7620142ae7f8116d097996a4a0f15d30':
  Move BUILD_NATIVE_BENCHMARK over to libgoogle-benchmark.
2016-03-08 07:45:11 +00:00
Dan Willemsen
90074f7f1f Merge "Reexport include dirs for whole static libs"
am: e2379484ab

* commit 'e2379484ab96e7e5f9a60061557e492068ef1789':
  Reexport include dirs for whole static libs
2016-03-08 00:16:45 +00:00
Dan Willemsen
e2379484ab Merge "Reexport include dirs for whole static libs" 2016-03-08 00:14:02 +00:00
Martin Blumenstingl
7b578cbf10 Merge "Removed duplicate definition of E2FSCK"
am: d7a4e56a87

* commit 'd7a4e56a87c324378e60f5989a14a5d5addfd456':
  Removed duplicate definition of E2FSCK
2016-03-08 00:05:12 +00:00
Colin Cross
d7a4e56a87 Merge "Removed duplicate definition of E2FSCK" 2016-03-07 23:54:40 +00:00
Elliott Hughes
9c34174b76 Merge "Move BUILD_NATIVE_BENCHMARK over to libgoogle-benchmark."
am: ef0c20621d

* commit 'ef0c20621d7b82f25f8fa669a0b2d8031588169d':
  Move BUILD_NATIVE_BENCHMARK over to libgoogle-benchmark.
2016-03-07 21:22:53 +00:00
Yabin Cui
9963b699f3 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
(cherry picked from commit 273e9109c1)
2016-03-07 13:22:06 -08:00
Elliott Hughes
ef0c20621d Merge "Move BUILD_NATIVE_BENCHMARK over to libgoogle-benchmark." 2016-03-07 21:17:45 +00:00
Ying Wang
c666fdf9c6 Merge "Fix dumping variables of absolute paths." am: dd70b91060
am: ad68d904a1

* commit 'ad68d904a1bdcb1a64f4a5b1e35cd38e085021e2':
  Fix dumping variables of absolute paths.
2016-03-07 20:06:03 +00:00
Ying Wang
ad68d904a1 Merge "Fix dumping variables of absolute paths."
am: dd70b91060

* commit 'dd70b9106079f39738c129c6f874576748f92d3e':
  Fix dumping variables of absolute paths.
2016-03-07 20:04:13 +00:00
Ying Wang
f56ffa5851 Fix dumping variables of absolute paths.
Calling $(abspath) is better than checking and prepending $(PWD) if
necessary.

Bug: 27429759
Change-Id: Ia156f8a5d6b88b6090f4d23c7f9166bd62d3ab70
(cherry-pick from commit 80ceadc945)
2016-03-07 12:00:41 -08:00
Sami Tolvanen
8fb47f191f build: pass version and patch level to mkbootimg
Add --os_version and --os_patch_level arguments to mkbootimg.

Needs matching changes from
  I57682611e0c27fec5ed284da7d9a788383ff98b1

Bug: 27498078
Bug: 22914603
Change-Id: I04e20b0de40d864aac92ac7bcf466a6cbde3d0e4
2016-03-07 11:55:22 -08:00
Ying Wang
80ceadc945 Fix dumping variables of absolute paths.
Calling $(abspath) is better than checking and prepending $(PWD) if
necessary.

Bug: 27429759
Change-Id: Ia156f8a5d6b88b6090f4d23c7f9166bd62d3ab70
2016-03-07 11:30:35 -08:00
Julien Desprez
6cd6ed3627 Support build old version of cts
am: ffc9c52243

* commit 'ffc9c52243499d5d65edfd7f795ae44370f64a29':
  Support build old version of cts
2016-03-07 19:19:25 +00:00
Julien Desprez
ffc9c52243 Support build old version of cts
Bug: 27508747
Change-Id: I3d474f6f6534e172ecf1d0a6c833a9dfa6164344
2016-03-07 17:11:14 +00:00
Martin Blumenstingl
764f9339f1 Removed duplicate definition of E2FSCK
Change-Id: I810711ad05e198ee1f9606c37649e80df7b55fa5
2016-03-06 22:38:19 +01:00
Ying Wang
5c0ac5e05b Merge "Delete relics left behind by commit 86e6b7ed51 ." am: 880c9ffe7a
am: 87545466a8

* commit '87545466a81490794dc086b84f489c5327dfa7c4':
  Delete relics left behind by commit 86e6b7ed51 .
2016-03-05 00:34:29 +00:00
Ying Wang
87545466a8 Merge "Delete relics left behind by commit 86e6b7ed51 ."
am: 880c9ffe7a

* commit '880c9ffe7a47c163f986f7bc02963bbde1c83c0f':
  Delete relics left behind by commit 86e6b7ed51 .
2016-03-05 00:32:27 +00:00
Ying Wang
880c9ffe7a Merge "Delete relics left behind by commit 86e6b7ed51 ." 2016-03-05 00:29:00 +00:00
Ying Wang
2fdafd2596 Delete relics left behind by commit 86e6b7ed51 .
Change-Id: I81febc28f471727fc37335b11e47749753a57997
(cherry-pick from commit 0f59fdf30d)
2016-03-04 16:28:01 -08:00
Dan Willemsen
c3f414f90f Merge "Tell soong about MALLOC_SVELTE" am: fd2691c35f
am: 14950e0db7

* commit '14950e0db7f77c43f4bac695b3d0268d3ebaf929':
  Tell soong about MALLOC_SVELTE
2016-03-04 23:57:42 +00:00
Dan Willemsen
14950e0db7 Merge "Tell soong about MALLOC_SVELTE"
am: fd2691c35f

* commit 'fd2691c35f6e0c7b5339befa8afefaebdfb72283':
  Tell soong about MALLOC_SVELTE
2016-03-04 23:55:48 +00:00
Dan Willemsen
fd2691c35f Merge "Tell soong about MALLOC_SVELTE" 2016-03-04 23:53:36 +00:00
Stephen Hines
c503d8ef58 Switch to clang-2658975.
Bug: http://b/27482631

This fixes an issue where krait compiles were not passing the proper
flags to the assembler when -no-integrated-as is used. This was
preventing ART from switching to clang in some cases.

Change-Id: I24966bf1ff84305df3586ab01d1aae7d5922aa11
2016-03-04 14:40:56 -08:00
Dan Albert
4ac7d7b774 Merge "Get gtest includes from the exported headers." am: f8b170dc52
am: 1bbd4dac85

* commit '1bbd4dac858316b924ba231ca123c6ac5ac14157':
  Get gtest includes from the exported headers.
2016-03-04 22:36:56 +00:00
Dan Albert
1bbd4dac85 Merge "Get gtest includes from the exported headers."
am: f8b170dc52

* commit 'f8b170dc52575f16a63bfd6b6710efb46580c8b2':
  Get gtest includes from the exported headers.
2016-03-04 22:34:39 +00:00
Dan Albert
f8b170dc52 Merge "Get gtest includes from the exported headers." 2016-03-04 22:30:58 +00:00