OSDN Git Service
The Android Automerger [Tue, 9 Feb 2016 08:03:41 +0000 (00:03 -0800)]
"NRC40"
The Android Automerger [Tue, 9 Feb 2016 08:00:30 +0000 (00:00 -0800)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Mon, 8 Feb 2016 22:15:32 +0000 (14:15 -0800)]
"NRC39B"
The Android Automerger [Mon, 8 Feb 2016 08:01:22 +0000 (00:01 -0800)]
"NRC39"
The Android Automerger [Mon, 8 Feb 2016 08:00:16 +0000 (00:00 -0800)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Sun, 7 Feb 2016 08:05:02 +0000 (00:05 -0800)]
"NRC38"
The Android Automerger [Sun, 7 Feb 2016 08:00:45 +0000 (00:00 -0800)]
merge in nyc-release history after reset to master
Alex Deymo [Fri, 5 Feb 2016 23:43:38 +0000 (23:43 +0000)]
Merge "ota_from_target_files: Include the payload properties." am:
db82f72752
am:
07085a5113
* commit '
07085a511385a9dfa71414735641f96119ec342c':
ota_from_target_files: Include the payload properties.
Alex Deymo [Fri, 5 Feb 2016 23:16:47 +0000 (23:16 +0000)]
Merge "ota_from_target_files: Include the payload properties."
am:
db82f72752
* commit '
db82f72752532bf2b98103171b3d7cd8405b88e4':
ota_from_target_files: Include the payload properties.
Alex Deymo [Fri, 5 Feb 2016 23:11:18 +0000 (23:11 +0000)]
Merge "ota_from_target_files: Include the payload properties."
Dan Willemsen [Fri, 5 Feb 2016 18:20:34 +0000 (18:20 +0000)]
Merge "Fix unused src tracking for generated .o files" am:
478913f88f
am:
d02bb7bfc5
* commit '
d02bb7bfc51343ab88eb2e05157155673ddf8130':
Fix unused src tracking for generated .o files
Dan Willemsen [Fri, 5 Feb 2016 18:18:20 +0000 (18:18 +0000)]
Merge "Fix unused src tracking for generated .o files"
am:
478913f88f
* commit '
478913f88fdafc61015e87129486e12ddeb7d184':
Fix unused src tracking for generated .o files
Dan Willemsen [Fri, 5 Feb 2016 18:12:20 +0000 (18:12 +0000)]
Merge "Fix unused src tracking for generated .o files"
Alex Deymo [Fri, 5 Feb 2016 06:29:29 +0000 (22:29 -0800)]
ota_from_target_files: Include the payload properties.
When building an A/B OTA package, include the payload.bin properties as
a key-value pairs text file, so it can easily be passed to
update_engine during payload application.
Bug:
26991255
TEST=`ota_from_target_files out/dist/${BOARD}-target_files.zip full-ota.zip` includes the properties.
Change-Id: I445c8a8e412a8e16b48b6ee626db8e27d48a38a9
Colin Cross [Thu, 4 Feb 2016 23:49:41 +0000 (23:49 +0000)]
Merge "Don't build otatools for PDK"
The Android Automerger [Fri, 5 Feb 2016 00:21:28 +0000 (16:21 -0800)]
"NRC35C"
Colin Cross [Fri, 5 Feb 2016 00:04:43 +0000 (00:04 +0000)]
Merge "Don\'t build otatools for PDK" am:
9e8866f4a4
am:
3611f2f440
* commit '
3611f2f440944dadd74b36a235c41c7957a6963c':
Don't build otatools for PDK
Colin Cross [Fri, 5 Feb 2016 00:01:49 +0000 (00:01 +0000)]
Merge "Don\'t build otatools for PDK"
am:
9e8866f4a4
* commit '
9e8866f4a4ec60778d55366afaf29f7d2e22e9ee':
Don't build otatools for PDK
Colin Cross [Thu, 4 Feb 2016 23:49:41 +0000 (23:49 +0000)]
Merge "Don't build otatools for PDK"
Chih-Hung Hsieh [Thu, 4 Feb 2016 23:43:05 +0000 (15:43 -0800)]
resolve merge conflicts of
dc1afa9c0f to master.
Change-Id: I4236d9f79cbca689d0fcc400d4c10a663209bc2a
Chih-hung Hsieh [Thu, 4 Feb 2016 23:29:24 +0000 (23:29 +0000)]
Merge "Remove USE_CLANG_PLATFORM_BUILD in BoardConfig.mk"
am:
9ff17cf7bc
* commit '
9ff17cf7bcc4b88a6a407f0c573b181a91f30ec8':
Remove USE_CLANG_PLATFORM_BUILD in BoardConfig.mk
Chih-hung Hsieh [Thu, 4 Feb 2016 23:22:19 +0000 (23:22 +0000)]
Merge "Remove USE_CLANG_PLATFORM_BUILD in BoardConfig.mk"
Colin Cross [Thu, 4 Feb 2016 23:19:16 +0000 (23:19 +0000)]
Merge "Build .toc when building a module by name" am:
1b21a15049
am:
af5b95ac90
* commit '
af5b95ac90ae06cf9efc52436e2e24d8c55541ce':
Build .toc when building a module by name
Colin Cross [Thu, 4 Feb 2016 23:17:20 +0000 (23:17 +0000)]
Merge "Build .toc when building a module by name"
am:
1b21a15049
* commit '
1b21a1504952addbfef585d91afd2fddc5cf29ae':
Build .toc when building a module by name
Colin Cross [Thu, 4 Feb 2016 23:13:31 +0000 (23:13 +0000)]
Merge "Build .toc when building a module by name"
Colin Cross [Thu, 4 Feb 2016 23:09:23 +0000 (15:09 -0800)]
Don't build otatools for PDK
Change-Id: I5e73d103300ac938f80b3ff0af978c123d649fed
The Android Automerger [Thu, 4 Feb 2016 22:36:59 +0000 (14:36 -0800)]
"NRC35B"
Dan Willemsen [Thu, 4 Feb 2016 22:18:48 +0000 (14:18 -0800)]
Fix unused src tracking for generated .o files
*.o files that are passed in via LOCAL_GENERATED_SOURCES are added
directly to all_objects, they are not mixed with the normal_objects that
we track. So omit them from they my_gen_src_files list so that we don't
warn that they're unused.
Change-Id: I94b85504032e70fbcc00207d6200557700dd0a89
Colin Cross [Thu, 4 Feb 2016 21:28:04 +0000 (13:28 -0800)]
Build .toc when building a module by name
Building a module by name with make <module name>, or with mm or mma
through all_modules, should also build the .toc file so that future uses
of mm on modules that depend on this one can find the .toc file.
Bug:
26936761
Change-Id: Id0c592f0860a10b732b2b5b13c7e967c9bcb1c6b
Stephen Hines [Thu, 4 Feb 2016 19:52:45 +0000 (19:52 +0000)]
Merge "Fix LLVM_RTLIB_PATH for new prebuilts." am:
042d589fa2
am:
1972757ef8
* commit '
1972757ef8e4de53b3400e62a1711c52eecd0a2b':
Fix LLVM_RTLIB_PATH for new prebuilts.
Stephen Hines [Thu, 4 Feb 2016 19:50:04 +0000 (19:50 +0000)]
Merge "Fix LLVM_RTLIB_PATH for new prebuilts."
am:
042d589fa2
* commit '
042d589fa247a7d8fdb94043598cd04cf6857ca0':
Fix LLVM_RTLIB_PATH for new prebuilts.
Stephen Hines [Thu, 4 Feb 2016 19:46:07 +0000 (19:46 +0000)]
Merge "Fix LLVM_RTLIB_PATH for new prebuilts."
Stephen Hines [Thu, 4 Feb 2016 19:43:41 +0000 (11:43 -0800)]
Fix LLVM_RTLIB_PATH for new prebuilts.
This moved from lib/ to lib64/, but wasn't noticed because no one builds
with the profiler on by default.
Change-Id: I0155263b4a50437ea0864338fb34baefc3df59d2
Chih-Hung Hsieh [Thu, 4 Feb 2016 18:55:56 +0000 (10:55 -0800)]
Remove USE_CLANG_PLATFORM_BUILD in BoardConfig.mk
Use global default USE_CLANG_PLATFORM_BUILD set in core/envsetup.mk,
or user provided environment variable USE_CLANG_PLATFORM_BUILD.
BUG:
26102335
Change-Id: I7e12219a60f36bb44797bb028b4a5873a67c9210
The Android Automerger [Thu, 4 Feb 2016 08:03:12 +0000 (00:03 -0800)]
"NRC35"
The Android Automerger [Thu, 4 Feb 2016 08:00:33 +0000 (00:00 -0800)]
merge in nyc-release history after reset to master
Stephen Hines [Thu, 4 Feb 2016 07:40:23 +0000 (07:40 +0000)]
Stephen Hines [Thu, 4 Feb 2016 07:38:36 +0000 (07:38 +0000)]
Stephen Hines [Thu, 4 Feb 2016 07:34:05 +0000 (07:34 +0000)]
Merge "Switch to clang-
2577113."
Mathieu Chartier [Wed, 3 Feb 2016 22:14:14 +0000 (22:14 +0000)]
Merge "Add default app image format property"
The Android Automerger [Wed, 3 Feb 2016 21:02:47 +0000 (13:02 -0800)]
"NRC34B"
Dan Willemsen [Wed, 3 Feb 2016 19:05:09 +0000 (19:05 +0000)]
Merge changes I2e00bb66,I00890229 am:
6c597e6bdd
am:
11b5b1c992
* commit '
11b5b1c9925acf80dd42a184e92870d6bfa54736':
Do not diff .odex files
Diff libpac.so now that it is deterministic
Dan Willemsen [Wed, 3 Feb 2016 19:02:54 +0000 (19:02 +0000)]
Merge changes I2e00bb66,I00890229
am:
6c597e6bdd
* commit '
6c597e6bdd6f3ba9d0ab0fbad43cd7746e34ed86':
Do not diff .odex files
Diff libpac.so now that it is deterministic
Dan Willemsen [Wed, 3 Feb 2016 18:57:07 +0000 (18:57 +0000)]
Merge changes I2e00bb66,I00890229
* changes:
Do not diff .odex files
Diff libpac.so now that it is deterministic
Dan Willemsen [Wed, 3 Feb 2016 18:46:39 +0000 (10:46 -0800)]
Do not diff .odex files
They still are not deterministic -- only the boot images were made
deterministic (.oat/.art).
Bug:
26956807
Change-Id: I2e00bb6662b4c8d184c48ef9aa34b39142c94893
Dan Willemsen [Wed, 3 Feb 2016 18:45:25 +0000 (10:45 -0800)]
Diff libpac.so now that it is deterministic
Bug:
25348136
Change-Id: I008902299281b5ddd55a9b8c405d53eea2d56c8b
Neil Fuller [Wed, 3 Feb 2016 15:37:26 +0000 (15:37 +0000)]
Merge "Add new package: java.util.function"
The Android Automerger [Wed, 3 Feb 2016 08:03:42 +0000 (00:03 -0800)]
"NRC34"
The Android Automerger [Wed, 3 Feb 2016 08:00:21 +0000 (00:00 -0800)]
merge in nyc-release history after reset to master
The Android Automerger [Tue, 2 Feb 2016 23:06:40 +0000 (15:06 -0800)]
"NRC33B"
Colin Cross [Tue, 2 Feb 2016 20:40:49 +0000 (20:40 +0000)]
Merge "Move PDK selection into config.mk" am:
655dd3ea76
am:
3f238d8cda
* commit '
3f238d8cda78990a90509206ccd60db7a2f0945a':
Move PDK selection into config.mk
Colin Cross [Tue, 2 Feb 2016 20:38:22 +0000 (20:38 +0000)]
Merge "Move PDK selection into config.mk"
am:
655dd3ea76
* commit '
655dd3ea769c8482821cdda7b0eec80c5a500b17':
Move PDK selection into config.mk
Colin Cross [Tue, 2 Feb 2016 20:34:30 +0000 (20:34 +0000)]
Merge "Move PDK selection into config.mk"
Dan Willemsen [Tue, 2 Feb 2016 18:04:40 +0000 (18:04 +0000)]
Dan Willemsen [Tue, 2 Feb 2016 18:01:46 +0000 (18:01 +0000)]
Dan Willemsen [Tue, 2 Feb 2016 17:56:57 +0000 (17:56 +0000)]
Merge "Fix typo"
Maria Garcia Puyol [Tue, 2 Feb 2016 17:10:34 +0000 (17:10 +0000)]
Merge "Add EmergencyInfo to devices with telephony"
The Android Automerger [Tue, 2 Feb 2016 16:40:01 +0000 (08:40 -0800)]
merge in nyc-release history after reset to master
The Android Automerger [Tue, 2 Feb 2016 15:41:58 +0000 (07:41 -0800)]
"NRC28F"
The Android Automerger [Tue, 2 Feb 2016 15:27:41 +0000 (07:27 -0800)]
merge in nyc-release history after reset to master
Sebastien Hertz [Tue, 2 Feb 2016 09:13:57 +0000 (09:13 +0000)]
Merge "Support code coverage with Jack" am:
4dad88980f
am:
7b02e64148
* commit '
7b02e64148e6a1c0355d715b2a8034061f0d2837':
Support code coverage with Jack
Dan Willemsen [Tue, 2 Feb 2016 09:13:48 +0000 (09:13 +0000)]
Merge "Track ObjC object mapping" am:
fedafc879d
am:
d3212f55c3
* commit '
d3212f55c3ee2b762144089a932e8995519b0a57':
Track ObjC object mapping
The Android Automerger [Tue, 2 Feb 2016 08:02:33 +0000 (00:02 -0800)]
"NRC33"
The Android Automerger [Tue, 2 Feb 2016 08:00:19 +0000 (00:00 -0800)]
merge in nyc-release history after reset to master
Stephen Hines [Fri, 22 Jan 2016 23:12:49 +0000 (15:12 -0800)]
Switch to clang-
2577113.
Bug: http://b/
25282907
This is actually based on clang/LLVM upstream revision r256229.
Change-Id: I335be68f196e5b55ac2816fa854e97b841b54240
Sebastien Hertz [Tue, 2 Feb 2016 07:34:59 +0000 (07:34 +0000)]
Merge "Support code coverage with Jack"
am:
4dad88980f
* commit '
4dad88980f49f40fb13ab57659c1016e12ca0cb9':
Support code coverage with Jack
Sebastien Hertz [Tue, 2 Feb 2016 07:31:37 +0000 (07:31 +0000)]
Merge "Support code coverage with Jack"
Dan Willemsen [Tue, 2 Feb 2016 05:40:17 +0000 (21:40 -0800)]
Fix typo
This was producing a number of unused source warnings for prebuilt files
using LOCAL_SRC_FILES_<arch>.
Change-Id: I48d1face7baf642f3ef17f957448ccb73788765f
Dan Willemsen [Tue, 2 Feb 2016 05:21:38 +0000 (05:21 +0000)]
Merge "Track ObjC object mapping"
am:
fedafc879d
* commit '
fedafc879d2229210ec8e58e465ec965d3544774':
Track ObjC object mapping
Dan Willemsen [Tue, 2 Feb 2016 05:18:05 +0000 (05:18 +0000)]
Merge "Track ObjC object mapping"
Dan Willemsen [Tue, 2 Feb 2016 02:55:23 +0000 (18:55 -0800)]
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
Colin Cross [Tue, 26 Jan 2016 23:59:50 +0000 (15:59 -0800)]
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
The Android Automerger [Tue, 2 Feb 2016 00:20:08 +0000 (16:20 -0800)]
"NRC32C"
Shinichiro Hamaji [Mon, 1 Feb 2016 23:10:33 +0000 (23:10 +0000)]
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
Shinichiro Hamaji [Mon, 1 Feb 2016 23:08:38 +0000 (23:08 +0000)]
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
Shinichiro Hamaji [Mon, 1 Feb 2016 23:04:44 +0000 (23:04 +0000)]
Merge "Use dependency files generated by llvm-rs-cc for Java"
Dan Willemsen [Mon, 1 Feb 2016 22:44:44 +0000 (22:44 +0000)]
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
Dan Willemsen [Mon, 1 Feb 2016 22:42:50 +0000 (22:42 +0000)]
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
Dan Willemsen [Mon, 1 Feb 2016 22:38:53 +0000 (22:38 +0000)]
Merge "Diff .art/.oat/.odex files now that they are deterministic"
Dan Willemsen [Mon, 1 Feb 2016 21:38:25 +0000 (13:38 -0800)]
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
Colin Cross [Mon, 1 Feb 2016 19:40:11 +0000 (19:40 +0000)]
Merge "Don\'t force color diagnostics outside of ninja" am:
41fed8c082
am:
01394871fd
* commit '
01394871fdbc25316a87edca4a09b1075707e572':
Don't force color diagnostics outside of ninja
Colin Cross [Mon, 1 Feb 2016 19:02:07 +0000 (19:02 +0000)]
Merge "Don\'t force color diagnostics outside of ninja"
am:
41fed8c082
* commit '
41fed8c08262bd8ff52bbebd8429dbd2042c4450':
Don't force color diagnostics outside of ninja
Colin Cross [Mon, 1 Feb 2016 18:57:50 +0000 (18:57 +0000)]
Merge "Don't force color diagnostics outside of ninja"
The Android Automerger [Mon, 1 Feb 2016 18:40:23 +0000 (10:40 -0800)]
"NRC32B"
The Android Automerger [Mon, 1 Feb 2016 13:14:40 +0000 (05:14 -0800)]
"NRC32"
The Android Automerger [Mon, 1 Feb 2016 13:12:05 +0000 (05:12 -0800)]
merge in nyc-release history after reset to master
Neil Fuller [Mon, 1 Feb 2016 10:24:38 +0000 (10:24 +0000)]
Merge "Revert "Revert "Allow java targets to support 1.8 source / target"""
Shinichiro Hamaji [Mon, 1 Feb 2016 08:59:01 +0000 (17:59 +0900)]
Use dependency files generated by llvm-rs-cc for Java
This is a reland of
4c474617d491fe98fa02571349138fb757959232
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
Shinichiro Hamaji [Mon, 1 Feb 2016 08:22:05 +0000 (08:22 +0000)]
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"
Shinichiro Hamaji [Mon, 1 Feb 2016 08:20:17 +0000 (08:20 +0000)]
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"
Shinichiro Hamaji [Mon, 1 Feb 2016 08:16:42 +0000 (08:16 +0000)]
Merge "Revert "Use dependency files generated by llvm-rs-cc for Java""
Shinichiro Hamaji [Mon, 1 Feb 2016 08:08:26 +0000 (08:08 +0000)]
Revert "Use dependency files generated by llvm-rs-cc for Java"
This reverts commit
4c474617d491fe98fa02571349138fb757959232.
Change-Id: I66c46360d0ccf927c807ddd5cfbc56cbd97ed4a2
Shinichiro Hamaji [Mon, 1 Feb 2016 07:57:01 +0000 (07:57 +0000)]
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
Shinichiro Hamaji [Mon, 1 Feb 2016 07:56:47 +0000 (07:56 +0000)]
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
Shinichiro Hamaji [Mon, 1 Feb 2016 07:54:53 +0000 (07:54 +0000)]
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
Shinichiro Hamaji [Mon, 1 Feb 2016 07:54:39 +0000 (07:54 +0000)]
Merge "Use .KATI_DEPFILE for files generated by aidl-java"
am:
465fd483f5
* commit '
465fd483f512df16e788a6497b45e7a763a6dcd7':
Use .KATI_DEPFILE for files generated by aidl-java
Shinichiro Hamaji [Mon, 1 Feb 2016 07:50:32 +0000 (07:50 +0000)]
Merge "Use dependency files generated by llvm-rs-cc for Java"
Shinichiro Hamaji [Mon, 1 Feb 2016 07:50:01 +0000 (07:50 +0000)]
Merge "Use .KATI_DEPFILE for files generated by aidl-java"
Dan Willemsen [Sat, 30 Jan 2016 02:49:22 +0000 (02:49 +0000)]
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.
Dan Willemsen [Sat, 30 Jan 2016 02:49:08 +0000 (02:49 +0000)]
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