Commit Graph

26711 Commits

Author SHA1 Message Date
Shinichiro Hamaji b95dc31033 Merge "Use KATI_DEPFILE for .P associated with object files" 2016-03-14 21:59:46 +00:00
Alex Klyubin 4ddc07afa9 Merge "Fix two cosmetic issues in signapk." 2016-03-14 21:39:56 +00:00
Alex Klyubin 82bf99bb4e Fix two cosmetic issues in signapk.
* Zip EoCD record comment length was referred to as 32-bit whereas it
  is a 16-bit field. The implementation was fine, but the comment and
  the naming of a constant were wrong.
* System.out.println was left over from early prototyping days.
  Removed.

Bug: 25794543
Change-Id: I97199310d4b4451271a75bb6c6d0463e0b788be9
2016-03-14 13:33:26 -07:00
Dan Willemsen 0314519bf4 Merge "Handle out being a symlink" 2016-03-14 19:35:43 +00:00
Neil Fuller f98f62140a Merge "Make the language version selection smarter" 2016-03-14 14:34:05 +00:00
Neil Fuller 0e8ec505f6 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
(cherry-picked from commit decb797276)

Change-Id: I0734b6e690bea32def3dc435c9ce0bd90b845e79
2016-03-14 11:40:01 +00:00
Dan Willemsen d53c0c7b45 Handle out being a symlink
Soong needs to be able to reverse the relative path to out. Switch to
absolute paths if .. won't work because of out being a symlink to
somewhere else.

Bug: 27612837
Change-Id: Ib8b9e0f80523148cfd4b69a03d164578916d8fd5
2016-03-11 16:29:23 -08:00
Yohann Roussel 94451580af Inform Jack of the min sdk
Set Jack min sdk according to LOCAL_SDK_VERSION. Gives Jack current
version when LOCAL_SDK_VERSION is not available.

Bug: 27371864
Change-Id: Ieba0219494f29d2737d2ca234317c3af7e5e72c8
2016-03-11 11:55:57 +01:00
Sami Tolvanen 926096eff6 Merge "Revert "build: pass version and patch level to mkbootimg"" 2016-03-11 00:11:25 +00:00
Sami Tolvanen 494a9090f9 Revert "build: pass version and patch level to mkbootimg"
This reverts commit 8fb47f191f.

Bug: 27580174
Change-Id: Id87fd1e8da217438757d5a0fa4bbef7aea6770fc
2016-03-11 00:08:57 +00:00
Stephen Hines bda10679be Merge "Switch to clang-2658975." 2016-03-10 22:46:01 +00:00
Sen Jiang d8c715bf34 Add zlib_fingerprint to target_files.zip
Test: make dist
Bug: 27156099

Change-Id: I4608de70ad4dfe6523b832bbf7002dcccefe932f
2016-03-10 13:46:47 -08:00
Dan Willemsen b8744a26e4 Merge "Use hermetic ckati/makeparallel prebuilts" 2016-03-10 07:22:37 +00:00
Ying Wang a778fa1976 Merge "Turn off excess printing during the build which makes errors harder to find." 2016-03-10 02:09:59 +00:00
Joe Onorato fcec686a25 Turn off excess printing during the build which makes errors harder to find.
Change-Id: I588de5ddc0aa7dcaacc4ea185c13c2fa3748888a
(cherry-pick from commit 401ffaeb75)
2016-03-09 18:09:02 -08:00
Dan Willemsen 1487f31d83 Use hermetic ckati/makeparallel prebuilts
Currently, we're building against the native host version of libc++ and
other headers. Instead, use prebuilts of ckati/makeparallel built with
Soong against the included libc++ and sysroot. Building ckati /
makeparallel doesn't work well in unbundled branches that don't have all
of the libc++ dependencies to do successful host builds.

KATI is default variable defined when running under Kati, don't use it
for other purposes. Use CKATI instead.

Bug: 27533820
Change-Id: I82d66f5e34e3341a3cee4c5c83cd1d9a54d057ff
2016-03-09 17:19:30 -08:00
Todd Kennedy 27c3223a77 Merge "Define TARGET_OUT_VENDOR_APPS_PRIVILEGED" 2016-03-09 20:54:22 +00:00
Dan Willemsen 010c630f63 Merge "OSX: Use the oldest SDK, but always set our target to 10.8" 2016-03-09 20:27:58 +00: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
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
Tao Bao 6be54d774b Merge "Use the update-binary in the source build for downgrade OTAs." 2016-03-09 03:26:20 +00:00
Tao Bao 4996cf03d2 Use the update-binary in the source build for downgrade OTAs.
We used to use the update-binary from the target build when creating
incremental OTAs. But for downgrade OTAs, we should use the one in the
source build instead, which is actually newer.

Bug: 27556903
Change-Id: Ib6415729b979dbffdebdda24902f7f560942801a
2016-03-08 17:57:40 -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 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
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
Tao Bao cc9c8ce966 Merge "releasetools: Fix the bug in AssertSequenceGood."
am: 236e664efa

* commit '236e664efa04bd92ce28ba553afebf8e79ca17fa':
  releasetools: Fix the bug in AssertSequenceGood.
2016-03-07 22:35:40 +00:00
Tao Bao 236e664efa Merge "releasetools: Fix the bug in AssertSequenceGood." 2016-03-07 22:25:03 +00:00
Elliott Hughes e9f81ac2cd Merge "Use ulimit -p rather than prlimit."
am: 74d4d98be1

* commit '74d4d98be1156982a1ab9a26be1dac26ee4e51d1':
  Use ulimit -p rather than prlimit.
2016-03-07 22:17:37 +00:00
Elliott Hughes 74d4d98be1 Merge "Use ulimit -p rather than prlimit." 2016-03-07 22:10:44 +00:00
Elliott Hughes 910a355947 Use ulimit -p rather than prlimit.
Neither is standard, but ulimit is toybox and therefore a bit more
regular and at least has help text.

Change-Id: Id7ba9adc9ca256b821d8060506010abef30dee28
2016-03-07 14:05:22 -08: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
Elliott Hughes ef0c20621d Merge "Move BUILD_NATIVE_BENCHMARK over to libgoogle-benchmark." 2016-03-07 21:17:45 +00:00
Tao Bao c086370440 releasetools: Support OTAs that have OEM properties changes.
We need to handle a special case that an OTA goes from a source build
without OEM properties to a target build with those properties (or vice
versa). Add support in OTA scripts to deal the case properly, by a)
using two oem_props variables to handle source and target builds
respectively; b) adjusting the fingerprint/thumbprint assertions to
allow a mix of both.

Change-Id: Ib517c366730b967a974c89528df9d42887c92ec2
2016-03-07 13:14:49 -08: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 dd70b91060 Merge "Fix dumping variables of absolute paths." 2016-03-07 19:58:14 +00: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
Martin Blumenstingl 764f9339f1 Removed duplicate definition of E2FSCK
Change-Id: I810711ad05e198ee1f9606c37649e80df7b55fa5
2016-03-06 22:38:19 +01: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 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
Tao Bao dca2200c8a releasetools: Fix the bug in AssertSequenceGood.
We use a bitset for blocks in the target image to assert a block hasn't
been touched before reading. Skip checking the blocks that are in the
source image only.

Change-Id: I3a77292da673c813bd20d8dc177ff36419d8ecae
2016-03-04 15:26:26 -08:00