Commit graph

26505 commits

Author SHA1 Message Date
Alex Deymo
07085a5113 Merge "ota_from_target_files: Include the payload properties."
am: db82f72752

* commit 'db82f72752532bf2b98103171b3d7cd8405b88e4':
  ota_from_target_files: Include the payload properties.
2016-02-05 23:16:47 +00:00
Alex Deymo
db82f72752 Merge "ota_from_target_files: Include the payload properties." 2016-02-05 23:11:18 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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