Colin Cross
9e8866f4a4
Merge "Don't build otatools for PDK"
2016-02-04 23:49:41 +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
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
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
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
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
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
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
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
Dan Willemsen
991c840313
Merge "Order objects based on LOCAL_SRC_FILES and LOCAL_GENERATED_SOURCES"
...
am: 224466b1af
* commit '224466b1aff87a73d1b875902f97981dd4b96585':
Order objects based on LOCAL_SRC_FILES and LOCAL_GENERATED_SOURCES
2016-01-30 02:47:20 +00:00
Dan Willemsen
224466b1af
Merge "Order objects based on LOCAL_SRC_FILES and LOCAL_GENERATED_SOURCES"
2016-01-30 02:44:12 +00:00