Alex Deymo
db82f72752
Merge "ota_from_target_files: Include the payload properties."
2016-02-05 23:11:18 +00:00
Dan Willemsen
6fca454c41
Merge "Fix unused src tracking for generated .o files" am: 478913f88f
...
am: d02bb7bfc5
* commit 'd02bb7bfc51343ab88eb2e05157155673ddf8130':
Fix unused src tracking for generated .o files
2016-02-05 18:20:34 +00:00
Dan Willemsen
d02bb7bfc5
Merge "Fix unused src tracking for generated .o files"
...
am: 478913f88f
* commit '478913f88fdafc61015e87129486e12ddeb7d184':
Fix unused src tracking for generated .o files
2016-02-05 18:18:20 +00:00
Dan Willemsen
478913f88f
Merge "Fix unused src tracking for generated .o files"
2016-02-05 18:12:20 +00:00
Alex Deymo
19241c11bd
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
2016-02-04 23:29:50 -08:00
Colin Cross
c2f1d01eec
Merge "Don\'t build otatools for PDK" am: 9e8866f4a4
...
am: 3611f2f440
* commit '3611f2f440944dadd74b36a235c41c7957a6963c':
Don't build otatools for PDK
2016-02-05 00:04:43 +00:00
Colin Cross
3611f2f440
Merge "Don\'t build otatools for PDK"
...
am: 9e8866f4a4
* commit '9e8866f4a4ec60778d55366afaf29f7d2e22e9ee':
Don't build otatools for PDK
2016-02-05 00:01:49 +00:00
Colin Cross
9e8866f4a4
Merge "Don't build otatools for PDK"
2016-02-04 23:49:41 +00:00
Chih-Hung Hsieh
b81d0835ac
resolve merge conflicts of dc1afa9c0f
to master.
...
Change-Id: I4236d9f79cbca689d0fcc400d4c10a663209bc2a
2016-02-04 15:43:05 -08:00
Chih-hung Hsieh
dc1afa9c0f
Merge "Remove USE_CLANG_PLATFORM_BUILD in BoardConfig.mk"
...
am: 9ff17cf7bc
* commit '9ff17cf7bcc4b88a6a407f0c573b181a91f30ec8':
Remove USE_CLANG_PLATFORM_BUILD in BoardConfig.mk
2016-02-04 23:29:24 +00:00
Chih-hung Hsieh
9ff17cf7bc
Merge "Remove USE_CLANG_PLATFORM_BUILD in BoardConfig.mk"
2016-02-04 23:22:19 +00:00
Colin Cross
df674b1e9e
Merge "Build .toc when building a module by name" am: 1b21a15049
...
am: af5b95ac90
* commit 'af5b95ac90ae06cf9efc52436e2e24d8c55541ce':
Build .toc when building a module by name
2016-02-04 23:19:16 +00:00
Colin Cross
af5b95ac90
Merge "Build .toc when building a module by name"
...
am: 1b21a15049
* commit '1b21a1504952addbfef585d91afd2fddc5cf29ae':
Build .toc when building a module by name
2016-02-04 23:17:20 +00:00
Colin Cross
1b21a15049
Merge "Build .toc when building a module by name"
2016-02-04 23:13:31 +00:00
Colin Cross
481cc5a005
Don't build otatools for PDK
...
Change-Id: I5e73d103300ac938f80b3ff0af978c123d649fed
2016-02-04 15:09:23 -08:00
Dan Willemsen
444c323bc1
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
2016-02-04 14:22:31 -08:00
Colin Cross
e2b8f68785
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
2016-02-04 13:31:16 -08:00
Stephen Hines
be263e3aef
Merge "Fix LLVM_RTLIB_PATH for new prebuilts." am: 042d589fa2
...
am: 1972757ef8
* commit '1972757ef8e4de53b3400e62a1711c52eecd0a2b':
Fix LLVM_RTLIB_PATH for new prebuilts.
2016-02-04 19:52:45 +00:00
Stephen Hines
1972757ef8
Merge "Fix LLVM_RTLIB_PATH for new prebuilts."
...
am: 042d589fa2
* commit '042d589fa247a7d8fdb94043598cd04cf6857ca0':
Fix LLVM_RTLIB_PATH for new prebuilts.
2016-02-04 19:50:04 +00:00
Stephen Hines
042d589fa2
Merge "Fix LLVM_RTLIB_PATH for new prebuilts."
2016-02-04 19:46:07 +00:00
Stephen Hines
cdb52b5186
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
2016-02-04 11:43:41 -08:00
Chih-Hung Hsieh
6dc7147fb0
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
2016-02-04 10:55:56 -08:00
Stephen Hines
d18e9674e2
Merge "Switch to clang-2577113." am: 1acfd54844
...
am: 9a357b38d3
* commit '9a357b38d30dedbf7905c1531c304f278cde142b':
Switch to clang-2577113.
2016-02-04 07:40:23 +00:00
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