Commit graph

26823 commits

Author SHA1 Message Date
Tao Bao
61cebe79f4 Merge "releasetools: Support OTAs that have OEM properties changes." 2016-03-15 18:33:20 +00:00
Sami Tolvanen
b1e99acb00 Merge "Revert "Revert "build: pass version and patch level to mkbootimg""" 2016-03-15 17:37:27 +00:00
Sami Tolvanen
3303d909a1 Revert "Revert "build: pass version and patch level to mkbootimg""
This reverts commit 494a9090f9.

Bug: 27498078
Bug: 22914603
Change-Id: Iee6a784271ec32c6bfcc0a6ad3f0395d82016df3
2016-03-15 16:49:30 +00:00
Yohann Roussel
a023f41f13 Merge "Revert "Inform Jack of the min sdk"" 2016-03-15 15:04:54 +00:00
Yohann Roussel
962282bde2 Revert "Inform Jack of the min sdk"
This reverts commit 94451580af.

Bug: 27371864
Change-Id: I60a8c89b2ab8a6cbde4dd3b0aed24b71700815ab
2016-03-15 15:02:11 +00:00
Yohann Roussel
5bfe8e0265 Merge "Revert "Remove one debug line"" 2016-03-15 15:01:31 +00:00
Yohann Roussel
b5ea85a903 Revert "Remove one debug line"
This reverts commit d2fafe5734.

Change-Id: I8915604faafb21cf15c0f11ee8a770be2cfc9614
2016-03-15 14:51:28 +00:00
Yohann Roussel
087ea0eca1 Merge "Remove one debug line" 2016-03-15 13:52:46 +00:00
Yohann Roussel
d2fafe5734 Remove one debug line
Change-Id: I6de104dd2ca42404d45f3f4b91ccadd03d391f1c
2016-03-15 11:06:51 +01:00
Yohann Roussel
10baeeebc4 Merge "Inform Jack of the min sdk" 2016-03-15 09:42:11 +00:00
Dan Willemsen
2d12ce1d88 Always run Soong
Without switching on USE_SOONG, this lets us verify that all builds have
blueprint/soong/go, and can generate a build.ninja file without
producing errors.

Change-Id: I79451ce24c8b5b6745e41d951153265441c33e8a
2016-03-15 00:36:07 +00:00
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
William Roberts
c950a353c6 fs_config: introduce TARGET_FS_CONFIG_GEN
Introduce TARGET_FS_CONFIG_GEN, an option for generating
android_filesystem_config.h files from multiple intermediate
file formats. See the README for more details.

Change-Id: Ibdb2f65702657802e34b0cec18fb43709d7452bb
Signed-off-by: William Roberts <william.c.roberts@intel.com>
2016-03-08 13:54:33 -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