OSDN Git Service
Yohann Roussel [Wed, 16 Mar 2016 16:03:01 +0000 (16:03 +0000)]
Merge "Inform Jack of the min sdk"
am:
ab64f89 -s ours
* commit '
ab64f89bd63c2d0dc48cc428284fbdeedd107833':
Inform Jack of the min sdk
Yohann Roussel [Wed, 16 Mar 2016 14:19:04 +0000 (14:19 +0000)]
Merge "Inform Jack of the min sdk"
Yohann Roussel [Wed, 9 Mar 2016 16:19:58 +0000 (17:19 +0100)]
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: I5db233fe09aed0fae37fe9a92658bc8f24b86cdf
Sen Jiang [Wed, 16 Mar 2016 04:12:44 +0000 (04:12 +0000)]
Merge "Revert "Add zlib_fingerprint to target_files.zip""
am:
d2ca52d
* commit '
d2ca52df8c7ac08c3191118fa8606816d20ac119':
Revert "Add zlib_fingerprint to target_files.zip"
Sen Jiang [Wed, 16 Mar 2016 04:04:41 +0000 (04:04 +0000)]
Merge "Revert "Add zlib_fingerprint to target_files.zip""
Sen Jiang [Wed, 16 Mar 2016 03:38:29 +0000 (03:38 +0000)]
Revert "Add zlib_fingerprint to target_files.zip"
This reverts commit
d8c715bf34ca6f637d6b15c8cd50d666137d05a3.
Change-Id: Ie0c3c5b2db89fe076d678b67f013c20e836d825f
Sen Jiang [Wed, 16 Mar 2016 03:06:32 +0000 (03:06 +0000)]
Merge "Add zlib_fingerprint to target_files.zip"
am:
65aa976
* commit '
65aa9761539736e4ab5622d0cff5d8160cc620f8':
Add zlib_fingerprint to target_files.zip
Sen Jiang [Wed, 16 Mar 2016 02:59:36 +0000 (02:59 +0000)]
Merge "Add zlib_fingerprint to target_files.zip"
Ying Wang [Tue, 15 Mar 2016 23:58:51 +0000 (16:58 -0700)]
Fix error introduced in merge commit
c9a19779a219.
Change-Id: I0f49519f4c9dd16052e85a7b820e1ed8f4300380
Shinichiro Hamaji [Tue, 15 Mar 2016 23:06:31 +0000 (23:06 +0000)]
Merge "Replace last -includes by .KATI_DEPFILE"
am:
c26ec724b8
* commit '
c26ec724b8b4d356573901f96e1a8ce728bdd1b1':
Replace last -includes by .KATI_DEPFILE
Shinichiro Hamaji [Tue, 15 Mar 2016 23:00:11 +0000 (23:00 +0000)]
Merge "Replace last -includes by .KATI_DEPFILE"
Ying Wang [Tue, 15 Mar 2016 21:40:33 +0000 (14:40 -0700)]
resolve merge conflicts of
fc16dca602 to nyc-dev-plus-aosp
Now we can remove all uses of $(ACP) in prebuilt_internal.mk.
Change-Id: I07a449f3acca9b56c6a387ff8ca1535d19c872d1
Shinichiro Hamaji [Tue, 15 Mar 2016 21:40:04 +0000 (06:40 +0900)]
Replace last -includes by .KATI_DEPFILE
There was a typo in binary.mk. compile-dotdot-XXX-file in
definitions.mk was also using -include.
Bug:
26839129
Change-Id: I4a0145fb70413998cc65d30d2efcd68af07b4800
Ying Wang [Tue, 15 Mar 2016 21:23:49 +0000 (21:23 +0000)]
Merge "Rebuild odex files in PDK fusion build." into nyc-dev
Ying Wang [Tue, 15 Mar 2016 21:13:48 +0000 (21:13 +0000)]
Merge "Fix warning of "overriding commands for target ...boot.oat"." into nyc-dev
am:
234985a127
* commit '
234985a1273060f00d11241e4d9e107ba900fdb3':
Fix warning of "overriding commands for target ...boot.oat".
Ying Wang [Tue, 15 Mar 2016 20:59:25 +0000 (20:59 +0000)]
Merge "Fix warning of "overriding commands for target ...boot.oat"." into nyc-dev
Sami Tolvanen [Tue, 15 Mar 2016 19:31:27 +0000 (19:31 +0000)]
Revert "Revert "build: pass version and patch level to mkbootimg""
am:
a8c37be285
* commit '
a8c37be28598c6bdd920af4c306a29db013b68e7':
Revert "Revert "build: pass version and patch level to mkbootimg""
Ying Wang [Tue, 15 Mar 2016 19:13:56 +0000 (12:13 -0700)]
Fix warning of "overriding commands for target ...boot.oat".
There seems to be bug in Kati that when we write it as:
LIBART_TARGET_BOOT_ART_EXTRA_FILES += boot.oat $(patsubst
%.art,%.oat,$(LIBART_TARGET_BOOT_ART_EXTRA_FILES))
boot.oat ends up in the value twice.
This works around the bug, filed as bug/
27676615.
Bug:
27546601
Change-Id: Ifc330280496083a4c817e53bc5c77c86e48a2426
Tao Bao [Tue, 15 Mar 2016 19:24:21 +0000 (19:24 +0000)]
Merge "Revert "releasetools: Support OTAs that have OEM properties changes.""
am:
3c37889299
* commit '
3c37889299b7ab8df676fed7b8157484a7e5315a':
Revert "releasetools: Support OTAs that have OEM properties changes."
Tao Bao [Tue, 15 Mar 2016 19:16:32 +0000 (19:16 +0000)]
Merge "Revert "releasetools: Support OTAs that have OEM properties changes.""
Tao Bao [Tue, 15 Mar 2016 19:16:18 +0000 (19:16 +0000)]
Revert "releasetools: Support OTAs that have OEM properties changes."
Broke some builds.
This reverts commit
c086370440bb32501da427718a7313f12ec2c841.
Change-Id: If07006db412fea6c04f8698776a2ab418125a469
Tao Bao [Tue, 15 Mar 2016 18:43:03 +0000 (18:43 +0000)]
Merge "releasetools: Support OTAs that have OEM properties changes."
am:
61cebe79f4
* commit '
61cebe79f4949217181431fb347b7577d74ecc75':
releasetools: Support OTAs that have OEM properties changes.
Tao Bao [Tue, 15 Mar 2016 18:33:20 +0000 (18:33 +0000)]
Merge "releasetools: Support OTAs that have OEM properties changes."
Sami Tolvanen [Tue, 15 Mar 2016 16:49:30 +0000 (16:49 +0000)]
Revert "Revert "build: pass version and patch level to mkbootimg""
This reverts commit
494a9090f96a7fc4e77f8f4fbb26d876a5fc8438.
Bug:
27498078
Bug:
22914603
Change-Id: Iee6a784271ec32c6bfcc0a6ad3f0395d82016df3
(cherry picked from commit
3303d909a1c43dec0d99d2c852311cf2171c7c18)
Sami Tolvanen [Tue, 15 Mar 2016 17:47:08 +0000 (17:47 +0000)]
Merge "Revert "Revert "build: pass version and patch level to mkbootimg"""
am:
b1e99acb00
* commit '
b1e99acb00818c0dc244a4203106177eb28ca66b':
Revert "Revert "build: pass version and patch level to mkbootimg""
Sami Tolvanen [Tue, 15 Mar 2016 17:37:27 +0000 (17:37 +0000)]
Merge "Revert "Revert "build: pass version and patch level to mkbootimg"""
Sami Tolvanen [Tue, 15 Mar 2016 16:49:30 +0000 (16:49 +0000)]
Revert "Revert "build: pass version and patch level to mkbootimg""
This reverts commit
494a9090f96a7fc4e77f8f4fbb26d876a5fc8438.
Bug:
27498078
Bug:
22914603
Change-Id: Iee6a784271ec32c6bfcc0a6ad3f0395d82016df3
Yohann Roussel [Tue, 15 Mar 2016 15:45:41 +0000 (15:45 +0000)]
Merge "Revert "Inform Jack of the min sdk""
am:
a023f41f13 -s ours
* commit '
a023f41f13e0c23200b150699ed378f1400c6132':
Revert "Inform Jack of the min sdk"
Yohann Roussel [Tue, 15 Mar 2016 15:43:24 +0000 (15:43 +0000)]
Merge "Revert "Remove one debug line""
am:
5bfe8e0265 -s ours
* commit '
5bfe8e026534b365e4591b1020e89216b6c35149':
Revert "Remove one debug line"
Yohann Roussel [Tue, 15 Mar 2016 15:04:54 +0000 (15:04 +0000)]
Merge "Revert "Inform Jack of the min sdk""
Yohann Roussel [Tue, 15 Mar 2016 15:02:11 +0000 (15:02 +0000)]
Revert "Inform Jack of the min sdk"
This reverts commit
94451580af9c08e78ed347fb21b811049f8c96cb.
Bug:
27371864
Change-Id: I60a8c89b2ab8a6cbde4dd3b0aed24b71700815ab
Yohann Roussel [Tue, 15 Mar 2016 15:01:31 +0000 (15:01 +0000)]
Merge "Revert "Remove one debug line""
Yohann Roussel [Tue, 15 Mar 2016 14:51:28 +0000 (14:51 +0000)]
Revert "Remove one debug line"
This reverts commit
d2fafe57340fc2a8c4f13d579bf78d7f2667da32.
Change-Id: I8915604faafb21cf15c0f11ee8a770be2cfc9614
Yohann Roussel [Tue, 15 Mar 2016 14:20:40 +0000 (14:20 +0000)]
Merge "Remove one debug line"
am:
087ea0eca1 -s ours
* commit '
087ea0eca1411fb4ae1ae7d86a5988a8936749cb':
Remove one debug line
Yohann Roussel [Tue, 15 Mar 2016 13:52:46 +0000 (13:52 +0000)]
Merge "Remove one debug line"
Yohann Roussel [Tue, 15 Mar 2016 10:06:51 +0000 (11:06 +0100)]
Remove one debug line
Change-Id: I6de104dd2ca42404d45f3f4b91ccadd03d391f1c
Yohann Roussel [Tue, 15 Mar 2016 09:54:38 +0000 (09:54 +0000)]
Merge "Inform Jack of the min sdk"
am:
10baeeebc4 -s ours
* commit '
10baeeebc449d7db7ecae7f153955e796604c798':
Inform Jack of the min sdk
Yohann Roussel [Tue, 15 Mar 2016 09:42:11 +0000 (09:42 +0000)]
Merge "Inform Jack of the min sdk"
Ying Wang [Fri, 11 Mar 2016 18:32:01 +0000 (10:32 -0800)]
Rebuild odex files in PDK fusion build.
To rebuild odex files of Java libraries and apps,
we store the jars/apks without stripping the classes.dex inside the
platform.zip. We also save the build variables that may affect how we
rebuild an odex in pdk_dexpreopt_config.mk in the platform.zip.
We store the files and configuration only for libraries/apps that get
installed to the system.img (or vendor.img).
In PDK fusion build, we auto-generate prebuilt module definitions for
the javalib.jar and package.dex.apk carried in the platform.zip, using
configuration stored in pdk_dexpreopt_config.mk.
With the prebult modules, we override the implicit rule that directly
copies the odex from the platform.zip.
To rebuild odex of javalib.jar, we added support for prebuilt shared Java
library to prebiult_internal.mk. An installable prebuilt Java library is
treated as shared Java library, i.e. with classes.dex in the jar instead
of a set of .class files.
For apks in the platform.zip, we install the stripped version from
platform files inside platform.zip, instead of the package.dex.apk,
using a new variable LOCAL_REPLACE_PREBUILT_APK_INSTALLED. We can't
strip package.dex.apk because we can't re-sign the stripped apk at this
point.
We generate prebuilt module only if it's not already defined in the
source tree.
Bug:
27543283
Change-Id: I9e146f8b713d6f57c397fd28d88c9ab700757ca1
Alex Klyubin [Mon, 14 Mar 2016 23:47:23 +0000 (23:47 +0000)]
Fix two cosmetic issues in signapk.
am:
914b37f4e3
* commit '
914b37f4e3430606ec9850f05c51fb112279484b':
Fix two cosmetic issues in signapk.
Alex Klyubin [Mon, 14 Mar 2016 20:33:26 +0000 (13:33 -0700)]
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
(cherry picked from commit
82bf99bb4e4cd4779a08daa21bd4bc2007042f41)
Change-Id: I9845b5fa096859d67b306f4b9b6c205cad622c0c
Shinichiro Hamaji [Mon, 14 Mar 2016 22:07:10 +0000 (22:07 +0000)]
Merge "Use KATI_DEPFILE for .P associated with object files"
am:
b95dc31033
* commit '
b95dc310330bd59fa860ab98822529bb0d2256c6':
Use KATI_DEPFILE for .P associated with object files
Shinichiro Hamaji [Mon, 14 Mar 2016 21:59:46 +0000 (21:59 +0000)]
Merge "Use KATI_DEPFILE for .P associated with object files"
Alex Klyubin [Mon, 14 Mar 2016 21:52:41 +0000 (21:52 +0000)]
Merge "Fix two cosmetic issues in signapk."
am:
4ddc07afa9
* commit '
4ddc07afa90ab2be2c62c16829de4f3a68776d8e':
Fix two cosmetic issues in signapk.
Alex Klyubin [Mon, 14 Mar 2016 21:39:56 +0000 (21:39 +0000)]
Merge "Fix two cosmetic issues in signapk."
Alex Klyubin [Mon, 14 Mar 2016 20:33:26 +0000 (13:33 -0700)]
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
Prathmesh Prabhu [Mon, 14 Mar 2016 19:39:38 +0000 (19:39 +0000)]
Emulator: Bump arm(64) system image partition size to 1.75 GB
am:
316654fc23
* commit '
316654fc23c811fc68b2ac609af57d186db80503':
Emulator: Bump arm(64) system image partition size to 1.75 GB
Dan Willemsen [Mon, 14 Mar 2016 19:39:26 +0000 (19:39 +0000)]
Merge "Handle out being a symlink"
am:
0314519bf4
* commit '
0314519bf4e09d57bfe12f106a7a0fb8d63664d2':
Handle out being a symlink
Dan Willemsen [Mon, 14 Mar 2016 19:35:43 +0000 (19:35 +0000)]
Merge "Handle out being a symlink"
Prathmesh Prabhu [Mon, 14 Mar 2016 18:05:47 +0000 (11:05 -0700)]
Emulator: Bump arm(64) system image partition size to 1.75 GB
Change-Id: If9ce0346ed4ca7ceab3fda217e5c9de6d89b6c94
Sami Tolvanen [Mon, 14 Mar 2016 15:55:10 +0000 (15:55 +0000)]
Merge "Revert "build: pass version and patch level to mkbootimg"" into nyc-dev
am:
b3038bedcd
* commit '
b3038bedcde191b0bde8ce9489b193fed97f6c4d':
Revert "build: pass version and patch level to mkbootimg"
Sami Tolvanen [Mon, 14 Mar 2016 15:49:15 +0000 (15:49 +0000)]
Merge "Revert "build: pass version and patch level to mkbootimg"" into nyc-dev
Sami Tolvanen [Mon, 14 Mar 2016 15:47:11 +0000 (15:47 +0000)]
Revert "build: pass version and patch level to mkbootimg"
This reverts commit
e555f779626faeeddd8d23339241fa6a9240fa28.
Bug:
27580174
Change-Id: I0fd1ddb64d2fd4f91b0ecbc1ab8953a1324a10eb
Neil Fuller [Mon, 14 Mar 2016 14:42:38 +0000 (14:42 +0000)]
Merge "Make the language version selection smarter"
am:
f98f62140a
* commit '
f98f62140aafcd5b083b5a38f0366c1b5af825e4':
Make the language version selection smarter
Neil Fuller [Mon, 14 Mar 2016 14:34:05 +0000 (14:34 +0000)]
Merge "Make the language version selection smarter"
Neil Fuller [Fri, 4 Mar 2016 18:00:00 +0000 (18:00 +0000)]
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
decb797276462feb4311b04e493da18f942b882f)
Change-Id: I0734b6e690bea32def3dc435c9ce0bd90b845e79
Ian Pedowitz [Sat, 12 Mar 2016 18:23:36 +0000 (18:23 +0000)]
PLATFORM_PREVIEW_SDK_VERSION = 2 for DP2
am:
e5df61318e
* commit '
e5df61318e43302c0dade438aa8ede285e5039cc':
PLATFORM_PREVIEW_SDK_VERSION = 2 for DP2
Ian Pedowitz [Sat, 12 Mar 2016 06:13:36 +0000 (22:13 -0800)]
PLATFORM_PREVIEW_SDK_VERSION = 2 for DP2
Bug:
27150977
Change-Id: I8b86b5565dbdf81dffb4bc9ba0eef8a3c3f91d20
Stephen Hines [Sat, 12 Mar 2016 00:58:21 +0000 (00:58 +0000)]
Dan Willemsen [Sat, 12 Mar 2016 00:11:25 +0000 (16:11 -0800)]
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
Stephen Hines [Fri, 4 Mar 2016 22:40:56 +0000 (14:40 -0800)]
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.
(cherry picked from commit
c503d8ef5826bd1c79dc223ceba614532527a8c9)
Change-Id: I4a0efb78f37fee73bf61841f0347328b8f61c192
Andreas Gampe [Fri, 11 Mar 2016 16:24:48 +0000 (16:24 +0000)]
Merge changes I4a2692f3,Ifd8d3a2c into nyc-dev
am:
6f0a902081
* commit '
6f0a9020815bb3da5bf43fcd74bddb7ffe1e239f':
Build: Only preopt boot images in eng builds
Revert "Don't preopt on eng builds."
Andreas Gampe [Fri, 11 Mar 2016 16:20:50 +0000 (16:20 +0000)]
Merge changes I4a2692f3,Ifd8d3a2c into nyc-dev
* changes:
Build: Only preopt boot images in eng builds
Revert "Don't preopt on eng builds."
Yohann Roussel [Wed, 9 Mar 2016 16:19:58 +0000 (17:19 +0100)]
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
Sami Tolvanen [Fri, 11 Mar 2016 00:24:23 +0000 (00:24 +0000)]
Merge "Revert "build: pass version and patch level to mkbootimg""
am:
926096eff6
* commit '
926096eff685265912f3050bb43715cfa36df0aa':
Revert "build: pass version and patch level to mkbootimg"
Sami Tolvanen [Fri, 11 Mar 2016 00:11:25 +0000 (00:11 +0000)]
Merge "Revert "build: pass version and patch level to mkbootimg""
Sami Tolvanen [Fri, 11 Mar 2016 00:08:57 +0000 (00:08 +0000)]
Revert "build: pass version and patch level to mkbootimg"
This reverts commit
8fb47f191f804d21e252ef7bb66886ea087c2d56.
Bug:
27580174
Change-Id: Id87fd1e8da217438757d5a0fa4bbef7aea6770fc
Andreas Gampe [Thu, 10 Mar 2016 23:34:46 +0000 (15:34 -0800)]
Build: Only preopt boot images in eng builds
As a middle way between full preopt/high performance/long builds,
and no preopt/low performance/fast turnaround, preopt only the
boot image in eng builds.
Bug:
26794212
Change-Id: I4a2692f3ce84823cd40c6b7d672fd73257739ef8
smain@google.com [Thu, 10 Mar 2016 23:19:49 +0000 (23:19 +0000)]
Merge "change printed version in offline docs to check whether in preview or not, and change the title accordingly, using new preview codename or version number." into nyc-dev
am:
e6e3c70b67
* commit '
e6e3c70b6741d0ddd1de67e2f244f18a7117f8c5':
change printed version in offline docs to check whether in preview or not, and change the title accordingly, using new preview codename or version number.
smain@google.com [Thu, 10 Mar 2016 23:14:08 +0000 (23:14 +0000)]
make image resource URLs relative so they work in offline docs
am:
0d7e38042d
* commit '
0d7e38042df5b3bcc91532f937b15d7aafabae2f':
make image resource URLs relative so they work in offline docs
Scott Main [Thu, 10 Mar 2016 23:12:43 +0000 (23:12 +0000)]
Merge "change printed version in offline docs to check whether in preview or not, and change the title accordingly, using new preview codename or version number." into nyc-dev
smain@google.com [Wed, 9 Mar 2016 19:57:39 +0000 (11:57 -0800)]
make image resource URLs relative so they work in offline docs
Change-Id: I4329689d8a3db3ce67f1aa7084a3a4634721e3cb
(cherry picked from commit
7d959be058a2c7fd6e18636dcdf5efd4a0555cb9)
Andreas Gampe [Thu, 10 Mar 2016 23:07:27 +0000 (15:07 -0800)]
Revert "Don't preopt on eng builds."
This reverts commit
7effde0048bcce6084e00bf29ff3bea4f34d1599.
Bug:
25801231
Bug:
26794212
smain@google.com [Thu, 10 Mar 2016 22:16:25 +0000 (14:16 -0800)]
change printed version in offline docs to check whether in preview or not,
and change the title accordingly, using new preview codename or version number.
Change-Id: I2833dcd05447add10495fea2149b5a9678831235
Stephen Hines [Thu, 10 Mar 2016 22:53:28 +0000 (22:53 +0000)]
Stephen Hines [Thu, 10 Mar 2016 22:46:01 +0000 (22:46 +0000)]
Merge "Switch to clang-
2658975."
Ying Wang [Thu, 10 Mar 2016 22:18:25 +0000 (22:18 +0000)]
Add dependency on boot_singer and vboot_singer if necessary.
am:
bd07ad01b5
* commit '
bd07ad01b554694f1d3b290fb066033866ededc4':
Add dependency on boot_singer and vboot_singer if necessary.
Sen Jiang [Tue, 8 Mar 2016 00:51:01 +0000 (16:51 -0800)]
Add zlib_fingerprint to target_files.zip
Test: make dist
Bug:
27156099
Change-Id: I4608de70ad4dfe6523b832bbf7002dcccefe932f
Ying Wang [Thu, 10 Mar 2016 20:57:33 +0000 (12:57 -0800)]
Add dependency on boot_singer and vboot_singer if necessary.
Change-Id: Ic10c2ae6a0debf51100a30eb11217e77060a6066
smain@google.com [Thu, 10 Mar 2016 18:09:18 +0000 (18:09 +0000)]
change name of offline doc tab to "API reference" and put the version number in the secondary nav bar (it was there anyway).
am:
5e37eef425
* commit '
5e37eef4255bb1b3709d0d99e004003728eaf3c7':
change name of offline doc tab to "API reference" and put the version number in the secondary nav bar (it was there anyway).
smain@google.com [Wed, 9 Mar 2016 23:36:12 +0000 (15:36 -0800)]
change name of offline doc tab to "API reference"
and put the version number in the secondary nav bar (it was there anyway).
Change-Id: I4b49581eca6afa445a434cd6ae31572d01f276ef
(cherry picked from commit
06bdd78284057b399da728c1cfa1e2238ba84c37)
Neil Fuller [Thu, 10 Mar 2016 10:00:14 +0000 (10:00 +0000)]
resolve merge conflicts of
e82f56c4f7 to nyc-dev-plus-aosp
Change-Id: I7b673e680240d0a597af971b6d903327875c4734
Neil Fuller [Thu, 10 Mar 2016 09:45:55 +0000 (09:45 +0000)]
Merge "Make the language version selection smarter" into nyc-dev
Dan Willemsen [Thu, 10 Mar 2016 07:28:56 +0000 (07:28 +0000)]
Merge "Use hermetic ckati/makeparallel prebuilts"
am:
b8744a26e4
* commit '
b8744a26e45d269c8fdad98d56c5df45984a6d5d':
Use hermetic ckati/makeparallel prebuilts
Dan Willemsen [Thu, 10 Mar 2016 07:22:37 +0000 (07:22 +0000)]
Merge "Use hermetic ckati/makeparallel prebuilts"
Joe Onorato [Thu, 10 Mar 2016 02:16:14 +0000 (02:16 +0000)]
Merge "Turn off excess printing during the build which makes errors harder to find."
am:
a778fa1976
* commit '
a778fa197634aa888548ec1171c57d2553508980':
Turn off excess printing during the build which makes errors harder to find.
Ying Wang [Thu, 10 Mar 2016 02:09:59 +0000 (02:09 +0000)]
Merge "Turn off excess printing during the build which makes errors harder to find."
Joe Onorato [Wed, 9 Mar 2016 22:48:46 +0000 (14:48 -0800)]
Turn off excess printing during the build which makes errors harder to find.
Change-Id: I588de5ddc0aa7dcaacc4ea185c13c2fa3748888a
(cherry-pick from commit
401ffaeb7560fa088d540ed1c150c3f196ebf993)
Joe Onorato [Thu, 10 Mar 2016 02:06:11 +0000 (02:06 +0000)]
Turn off excess printing during the build which makes errors harder to find.
am:
401ffaeb75
* commit '
401ffaeb7560fa088d540ed1c150c3f196ebf993':
Turn off excess printing during the build which makes errors harder to find.
Dan Willemsen [Tue, 8 Mar 2016 19:12:40 +0000 (11:12 -0800)]
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
Joe Onorato [Wed, 9 Mar 2016 22:48:46 +0000 (14:48 -0800)]
Turn off excess printing during the build which makes errors harder to find.
Change-Id: I588de5ddc0aa7dcaacc4ea185c13c2fa3748888a
Benjamin Pujol [Wed, 9 Mar 2016 21:08:10 +0000 (21:08 +0000)]
Merge "Define TARGET_OUT_VENDOR_APPS_PRIVILEGED"
am:
27c3223a77
* commit '
27c3223a7705dc8141002c87893fd507cb91732e':
Define TARGET_OUT_VENDOR_APPS_PRIVILEGED
Mohamad Ayyash [Wed, 9 Mar 2016 21:07:30 +0000 (21:07 +0000)]
Merge "Hook incremental ext4 image generation into build" into nyc-dev
am:
6a3185f23d
* commit '
6a3185f23d820f31cc928d5467eda94f3a93e31c':
Hook incremental ext4 image generation into build
Mohamad Ayyash [Wed, 9 Mar 2016 20:56:18 +0000 (20:56 +0000)]
Merge "Hook incremental ext4 image generation into build" into nyc-dev
Todd Kennedy [Wed, 9 Mar 2016 20:54:22 +0000 (20:54 +0000)]
Merge "Define TARGET_OUT_VENDOR_APPS_PRIVILEGED"
Dan Willemsen [Wed, 9 Mar 2016 20:33:51 +0000 (20:33 +0000)]
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
Dan Willemsen [Wed, 9 Mar 2016 20:27:57 +0000 (20:27 +0000)]
Merge "OSX: Use the oldest SDK, but always set our target to 10.8"
Dan Willemsen [Wed, 9 Mar 2016 19:28:51 +0000 (11:28 -0800)]
resolve merge conflicts of
e607224349 to nyc-dev-plus-aosp
Change-Id: I659925e8169cb90eb9e6066eadd09b6789092a8d
Dan Willemsen [Tue, 8 Mar 2016 23:20:30 +0000 (15:20 -0800)]
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
Dan Willemsen [Wed, 9 Mar 2016 18:31:17 +0000 (18:31 +0000)]
Merge changes I1fccee8d,Ib343df6d,I2f1984c2
* changes:
Fix C++ on Darwin
Remove support for /Developer
Remove support for Darwin 10.6 SDK