Commit graph

27732 commits

Author SHA1 Message Date
Stephen Hines
9a357b38d3 Merge "Switch to clang-2577113."
am: 1acfd54844

* commit '1acfd54844354d137dd90d5f4485cab771e51da0':
  Switch to clang-2577113.
2016-02-04 07:38:36 +00:00
Stephen Hines
1acfd54844 Merge "Switch to clang-2577113." 2016-02-04 07:34:05 +00:00
Mathieu Chartier
bdc048ecb5 Merge "Add default app image format property" 2016-02-03 22:14:14 +00:00
Dan Willemsen
ced2a7d6a1 Merge changes I2e00bb66,I00890229 am: 6c597e6bdd
am: 11b5b1c992

* commit '11b5b1c9925acf80dd42a184e92870d6bfa54736':
  Do not diff .odex files
  Diff libpac.so now that it is deterministic
2016-02-03 19:05:09 +00:00
Dan Willemsen
11b5b1c992 Merge changes I2e00bb66,I00890229
am: 6c597e6bdd

* commit '6c597e6bdd6f3ba9d0ab0fbad43cd7746e34ed86':
  Do not diff .odex files
  Diff libpac.so now that it is deterministic
2016-02-03 19:02:54 +00:00
Dan Willemsen
6c597e6bdd Merge changes I2e00bb66,I00890229
* changes:
  Do not diff .odex files
  Diff libpac.so now that it is deterministic
2016-02-03 18:57:07 +00:00
Dan Willemsen
c4438d3d29 Do not diff .odex files
They still are not deterministic -- only the boot images were made
deterministic (.oat/.art).

Bug: 26956807
Change-Id: I2e00bb6662b4c8d184c48ef9aa34b39142c94893
2016-02-03 10:46:39 -08:00
Dan Willemsen
8c915ee2ef Diff libpac.so now that it is deterministic
Bug: 25348136
Change-Id: I008902299281b5ddd55a9b8c405d53eea2d56c8b
2016-02-03 10:45:25 -08:00
Neil Fuller
b29fc11d5a Merge "Add new package: java.util.function" 2016-02-03 15:37:26 +00:00
Colin Cross
4b7cd7f43e Merge "Move PDK selection into config.mk" am: 655dd3ea76
am: 3f238d8cda

* commit '3f238d8cda78990a90509206ccd60db7a2f0945a':
  Move PDK selection into config.mk
2016-02-02 20:40:49 +00:00
Colin Cross
3f238d8cda Merge "Move PDK selection into config.mk"
am: 655dd3ea76

* commit '655dd3ea769c8482821cdda7b0eec80c5a500b17':
  Move PDK selection into config.mk
2016-02-02 20:38:22 +00:00
Colin Cross
655dd3ea76 Merge "Move PDK selection into config.mk" 2016-02-02 20:34:30 +00:00
Dan Willemsen
2685fbd5de Merge "Fix typo" am: 342037c0cf
am: 5f5ad2d2ea

* commit '5f5ad2d2ea41bdc68ed21b3713e60a5613664b9b':
  Fix typo
2016-02-02 18:04:40 +00:00
Dan Willemsen
5f5ad2d2ea Merge "Fix typo"
am: 342037c0cf

* commit '342037c0cfaaf68bf3ab29d561105868b8a0f742':
  Fix typo
2016-02-02 18:01:46 +00:00
Dan Willemsen
342037c0cf Merge "Fix typo" 2016-02-02 17:56:57 +00:00
Maria Garcia Puyol
cda68f4ecb Merge "Add EmergencyInfo to devices with telephony" 2016-02-02 17:10:34 +00:00
Sebastien Hertz
8192d3b821 Merge "Support code coverage with Jack" am: 4dad88980f
am: 7b02e64148

* commit '7b02e64148e6a1c0355d715b2a8034061f0d2837':
  Support code coverage with Jack
2016-02-02 09:13:57 +00:00
Dan Willemsen
f244691a14 Merge "Track ObjC object mapping" am: fedafc879d
am: d3212f55c3

* commit 'd3212f55c3ee2b762144089a932e8995519b0a57':
  Track ObjC object mapping
2016-02-02 09:13:48 +00:00
Stephen Hines
6ef329eb4d Switch to clang-2577113.
Bug: http://b/25282907

This is actually based on clang/LLVM upstream revision r256229.

Change-Id: I335be68f196e5b55ac2816fa854e97b841b54240
2016-02-01 23:37:14 -08:00
Sebastien Hertz
7b02e64148 Merge "Support code coverage with Jack"
am: 4dad88980f

* commit '4dad88980f49f40fb13ab57659c1016e12ca0cb9':
  Support code coverage with Jack
2016-02-02 07:34:59 +00:00
Sebastien Hertz
4dad88980f Merge "Support code coverage with Jack" 2016-02-02 07:31:37 +00:00
Dan Willemsen
5709bd55f3 Fix typo
This was producing a number of unused source warnings for prebuilt files
using LOCAL_SRC_FILES_<arch>.

Change-Id: I48d1face7baf642f3ef17f957448ccb73788765f
2016-02-01 21:48:41 -08:00
Dan Willemsen
d3212f55c3 Merge "Track ObjC object mapping"
am: fedafc879d

* commit 'fedafc879d2229210ec8e58e465ec965d3544774':
  Track ObjC object mapping
2016-02-02 05:21:38 +00:00
Dan Willemsen
fedafc879d Merge "Track ObjC object mapping" 2016-02-02 05:18:05 +00:00
Dan Willemsen
62f2e56c72 Track ObjC object mapping
Objective-C .m/.mm files were not being tracked, so they were showing
up as unused source files (on Darwin). They were also triggering an
internal build system warning because the new object list did not
match the current list.

Change-Id: I01fff8c5587fe168106c60782080d60744311f6f
2016-02-01 18:55:23 -08:00
Colin Cross
6b66fcf378 Move PDK selection into config.mk
config.mk needs to know TARGET_BUILD_PDK in order to select prebuilt
tools.  Move the selection of TARGET_BUILD_PDK into config.mk.

Change-Id: I1f73c92917887f27259b2db64b3779a2fe0df162
2016-02-01 18:05:07 -08:00
Shinichiro Hamaji
87bc53a281 Merge "Use dependency files generated by llvm-rs-cc for Java" am: e786d21854
am: 2f4b8a042c

* commit '2f4b8a042cacf2667d9704ef2e59373b6a2591cc':
  Use dependency files generated by llvm-rs-cc for Java
2016-02-01 23:10:33 +00:00
Shinichiro Hamaji
2f4b8a042c Merge "Use dependency files generated by llvm-rs-cc for Java"
am: e786d21854

* commit 'e786d21854b96e6bc04ec4e6d3c478c37230b21a':
  Use dependency files generated by llvm-rs-cc for Java
2016-02-01 23:08:38 +00:00
Shinichiro Hamaji
e786d21854 Merge "Use dependency files generated by llvm-rs-cc for Java" 2016-02-01 23:04:44 +00:00
Dan Willemsen
f056513b69 Merge "Diff .art/.oat/.odex files now that they are deterministic" am: 78861d7e6e
am: 822f20f933

* commit '822f20f933d8b6d8fb16699744f5865bafbce7da':
  Diff .art/.oat/.odex files now that they are deterministic
2016-02-01 22:44:44 +00:00
Dan Willemsen
822f20f933 Merge "Diff .art/.oat/.odex files now that they are deterministic"
am: 78861d7e6e

* commit '78861d7e6e56a770eb6c50370aa405992a3fab4c':
  Diff .art/.oat/.odex files now that they are deterministic
2016-02-01 22:42:50 +00:00
Dan Willemsen
78861d7e6e Merge "Diff .art/.oat/.odex files now that they are deterministic" 2016-02-01 22:38:53 +00:00
Dan Willemsen
734d78cdf6 Diff .art/.oat/.odex files now that they are deterministic
This also whitelists the ro.build.user property, which may change based
on host username.

Bug: 26687569
Change-Id: I8f3244c2325dd80a7961c474655f0c50670d1b46
2016-02-01 13:41:30 -08:00
Colin Cross
715172fa26 Merge "Don\'t force color diagnostics outside of ninja" am: 41fed8c082
am: 01394871fd

* commit '01394871fdbc25316a87edca4a09b1075707e572':
  Don't force color diagnostics outside of ninja
2016-02-01 19:40:11 +00:00
Colin Cross
01394871fd Merge "Don\'t force color diagnostics outside of ninja"
am: 41fed8c082

* commit '41fed8c08262bd8ff52bbebd8429dbd2042c4450':
  Don't force color diagnostics outside of ninja
2016-02-01 19:02:07 +00:00
Colin Cross
41fed8c082 Merge "Don't force color diagnostics outside of ninja" 2016-02-01 18:57:50 +00:00
Neil Fuller
e17ccfdb4b Merge "Revert "Revert "Allow java targets to support 1.8 source / target""" 2016-02-01 10:24:38 +00:00
Shinichiro Hamaji
52a1d6c666 Use dependency files generated by llvm-rs-cc for Java
This is a reland of 4c474617d4
This time, we use awk instead of sed, and the script works
on Mac.

For C++ code llvm-rs-cc defines two targets but it defines
three targets for Java. The sed script was updated to handle
both cases appropriately.

Bug: 26839129
Change-Id: I1bca7d253764554d552950e03deedabaa9b7f17e
2016-02-01 17:59:01 +09:00
Shinichiro Hamaji
bee8fb862b Merge "Revert "Use dependency files generated by llvm-rs-cc for Java"" am: d6184e1da9
am: b1e250b44a

* commit 'b1e250b44aef5cf32493024584188d5055e0f54f':
  Revert "Use dependency files generated by llvm-rs-cc for Java"
2016-02-01 08:22:05 +00:00
Shinichiro Hamaji
b1e250b44a Merge "Revert "Use dependency files generated by llvm-rs-cc for Java""
am: d6184e1da9

* commit 'd6184e1da9e56b0b66cba48756ce210564d34523':
  Revert "Use dependency files generated by llvm-rs-cc for Java"
2016-02-01 08:20:17 +00:00
Shinichiro Hamaji
d6184e1da9 Merge "Revert "Use dependency files generated by llvm-rs-cc for Java"" 2016-02-01 08:16:42 +00:00
Shinichiro Hamaji
5f50ea3bc9 Revert "Use dependency files generated by llvm-rs-cc for Java"
This reverts commit 4c474617d4.

Change-Id: I66c46360d0ccf927c807ddd5cfbc56cbd97ed4a2
2016-02-01 08:08:26 +00:00
Shinichiro Hamaji
283e648a24 Merge "Use dependency files generated by llvm-rs-cc for Java" am: 3fdb9ad716
am: a73d744e36

* commit 'a73d744e36bd5e5c237607fb57253b757e9facf5':
  Use dependency files generated by llvm-rs-cc for Java
2016-02-01 07:57:01 +00:00
Shinichiro Hamaji
94185e10bb Merge "Use .KATI_DEPFILE for files generated by aidl-java" am: 465fd483f5
am: 45e6d88785

* commit '45e6d88785787b3af24695b71f7ffb55d9ae1787':
  Use .KATI_DEPFILE for files generated by aidl-java
2016-02-01 07:56:47 +00:00
Shinichiro Hamaji
a73d744e36 Merge "Use dependency files generated by llvm-rs-cc for Java"
am: 3fdb9ad716

* commit '3fdb9ad716bad829b0df06afdf2a45552830b23d':
  Use dependency files generated by llvm-rs-cc for Java
2016-02-01 07:54:53 +00:00
Shinichiro Hamaji
45e6d88785 Merge "Use .KATI_DEPFILE for files generated by aidl-java"
am: 465fd483f5

* commit '465fd483f512df16e788a6497b45e7a763a6dcd7':
  Use .KATI_DEPFILE for files generated by aidl-java
2016-02-01 07:54:39 +00:00
Shinichiro Hamaji
3fdb9ad716 Merge "Use dependency files generated by llvm-rs-cc for Java" 2016-02-01 07:50:32 +00:00
Shinichiro Hamaji
465fd483f5 Merge "Use .KATI_DEPFILE for files generated by aidl-java" 2016-02-01 07:50:01 +00:00
Dan Willemsen
412057d206 Merge "Use Jan 1 2009 as timestamp in APKs and OTA update ZIPs." am: 0d85dab09a
am: 10b4db6f0e

* commit '10b4db6f0efaac70995bf18670d6e3bd7da3c753':
  Use Jan 1 2009 as timestamp in APKs and OTA update ZIPs.
2016-01-30 02:49:22 +00:00
Dan Willemsen
917de453ee Merge "Order objects based on LOCAL_SRC_FILES and LOCAL_GENERATED_SOURCES" am: 224466b1af
am: 991c840313

* commit '991c8403131dc5781d3d4a1d10d292dc99fee202':
  Order objects based on LOCAL_SRC_FILES and LOCAL_GENERATED_SOURCES
2016-01-30 02:49:08 +00:00