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
2016-02-02 09:13:57 +00:00
Dan Willemsen
f244691a14
Merge "Track ObjC object mapping" am: fedafc879d
...
am: d3212f55c3
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
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
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
2016-02-01 23:10:33 +00:00
Shinichiro Hamaji
2f4b8a042c
Merge "Use dependency files generated by llvm-rs-cc for Java"
...
am: e786d21854
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
2016-02-01 19:40:11 +00:00
Colin Cross
01394871fd
Merge "Don\'t force color diagnostics outside of ninja"
...
am: 41fed8c082
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
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
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
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
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
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
2016-02-01 07:56:47 +00:00
Shinichiro Hamaji
a73d744e36
Merge "Use dependency files generated by llvm-rs-cc for Java"
...
am: 3fdb9ad716
2016-02-01 07:54:53 +00:00
Shinichiro Hamaji
45e6d88785
Merge "Use .KATI_DEPFILE for files generated by aidl-java"
...
am: 465fd483f5
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
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
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
Alex Klyubin
357902b9de
Merge "Revert "Sign APKs using SHA-256 instead of SHA-1 when possible." This is breaking CTS." am: 01ac26d942
...
am: 1cafe66be2
2016-01-30 00:04:25 +00:00
Alex Klyubin
1cafe66be2
Merge "Revert "Sign APKs using SHA-256 instead of SHA-1 when possible." This is breaking CTS."
...
am: 01ac26d942
2016-01-30 00:02:34 +00:00
Alex Klyubin
01ac26d942
Merge "Revert "Sign APKs using SHA-256 instead of SHA-1 when possible." This is breaking CTS."
2016-01-29 23:58:27 +00:00
Alex Klyubin
061289c432
Revert "Sign APKs using SHA-256 instead of SHA-1 when possible." This is breaking CTS.
...
This reverts commit c2a36afd67
2016-01-29 23:56:44 +00:00
Lee Campbell
d6620a3e10
Merge "brillo: Remove dependency on java for Brillo" am: 6c8e3e4108
...
am: fd5d6f440a
2016-01-29 23:48:10 +00:00
Lee Campbell
fd5d6f440a
Merge "brillo: Remove dependency on java for Brillo"
...
am: 6c8e3e4108
2016-01-29 23:46:16 +00:00
Lee Campbell
6c8e3e4108
Merge "brillo: Remove dependency on java for Brillo"
2016-01-29 23:42:19 +00:00
Lee Campbell
3d8bf2994c
brillo: Remove dependency on java for Brillo
...
Brillo does not require Java. Add a JAVA_NOT_REQUIRED
flag to the build system to make the jdk requirment optional
Also don't build signapk for Brillo
BUG: 25281898
Change-Id: I31e68cc7d076bf6c234699c77c0ea1ea428be4f5
2016-01-29 15:38:53 -08:00
Dan Willemsen
e2462f2d5e
Merge "Fix classes.jack extraction from platform.zip"
2016-01-29 20:54:44 +00:00
Alex Klyubin
d0aefe7947
Merge "Sign APKs using SHA-256 instead of SHA-1 when possible." am: 50f872c696
...
am: 7a86884a9a
2016-01-29 20:25:10 +00:00
Alex Klyubin
7a86884a9a
Merge "Sign APKs using SHA-256 instead of SHA-1 when possible."
...
am: 50f872c696
2016-01-29 20:22:29 +00:00
Yohann Roussel
00221d45e7
Fix classes.jack extraction from platform.zip
...
The copy is handled by the common rule, so JAVA_dependency_template
really only needs to add the extra dependencies. Otherwise we were
getting duplicate rule warnings.
This may extract more files than necessary, but that's better than not
enough.
Bug: 26510884
Change-Id: I022f3cc6ddd1982af3f948740917ac03e795f4c5
2016-01-29 11:16:27 -08:00
Alex Klyubin
c2a36afd67
Sign APKs using SHA-256 instead of SHA-1 when possible.
...
This changes the build system to provide the signapk tool with the
minSdkVersion of the APK being signed. signapk in turn will then use
SHA-256 instead of SHA-1 if minSdkVersion is 18 (JB MR2) or higher
(see c2c49ed0c1de5bc04717
2016-01-29 10:17:02 -08:00
Neil Fuller
ad02251a96
Revert "Revert "Allow java targets to support 1.8 source / target""
...
Reapply build changes for Java 8. Must be submitted with
changes in development/build.
This reverts commit 8db0d9724f
2016-01-29 14:22:29 +00:00
Neil Fuller
98d5ae0167
Merge "Revert "Allow java targets to support 1.8 source / target""
2016-01-29 14:21:45 +00:00
Neil Fuller
8db0d9724f
Revert "Allow java targets to support 1.8 source / target"
...
Broke the sdk build. Requires changes in development that aren't available for submission yet.
This reverts commit cdfbe4a852
2016-01-29 13:29:39 +00:00
Neil Fuller
6c2a17e407
Merge "Allow java targets to support 1.8 source / target"
2016-01-29 11:00:31 +00:00
Keun-young Park
e13b3b1dfc
Merge "PDK: add files necessary to for Java build to platform.zip"
2016-01-28 22:04:56 +00:00
Keun-young Park
c8d7349f86
PDK: add files necessary to for Java build to platform.zip
...
- add second dex to platform.zip
- pull files from .toc files for jack
bug: 26808715, 26510884
Change-Id: I146bd8cd48a19eea88f147331906bd52f34ea790
2016-01-28 13:02:32 -08:00
