openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity
27,656 Commits 2 Branches 1 Tag 73 MiB
Commit Graph

27656 Commits

Author SHA1 Message Date
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
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
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
Dan Willemsen f056513b69 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
 2016-02-01 22:44: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 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 412057d206 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.
 2016-01-30 02:49:22 +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 10b4db6f0e Merge "Use Jan 1 2009 as timestamp in APKs and OTA update ZIPs." 
am: 0d85dab09a

* commit '0d85dab09a09de48535e4139b858e5e4bef8565f':
  Use Jan 1 2009 as timestamp in APKs and OTA update ZIPs.
 2016-01-30 02:47:35 +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 0d85dab09a Merge "Use Jan 1 2009 as timestamp in APKs and OTA update ZIPs." 2016-01-30 02:44:27 +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

* commit '1cafe66be274a5a8bbbc3a0dcab9d4e8f6e5ae61':
  Revert "Sign APKs using SHA-256 instead of SHA-1 when possible." This is breaking CTS.
 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

* commit '01ac26d9422d8d54d3992ba9dd4506896c8556dd':
  Revert "Sign APKs using SHA-256 instead of SHA-1 when possible." This is breaking CTS.
 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.

Change-Id: I4389bf99aeb213198c1c501ba9462bd4a4540d0a
 2016-01-29 23:56:44 +00:00
Lee Campbell d6620a3e10 Merge "brillo: Remove dependency on java for Brillo" am: 6c8e3e4108 
am: fd5d6f440a

* commit 'fd5d6f440a13643f4e645e960e1f2c417af3355a':
  brillo: Remove dependency on java for Brillo
 2016-01-29 23:48:10 +00:00
Lee Campbell fd5d6f440a Merge "brillo: Remove dependency on java for Brillo" 
am: 6c8e3e4108

* commit '6c8e3e41085d75184ae321c12e26cf26002552d3':
  brillo: Remove dependency on java for Brillo
 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
Alex Klyubin 6c41036bcf Use Jan 1 2009 as timestamp in APKs and OTA update ZIPs. 
Previously, the timestamp was one hour ahead of NotBefore of the
signer's certificate, adjusted for the current timezone. With this
change the MS-DOS timestamp in output APK/ZIP files is
Jan 1 2009 00:00:00.

Bug: 26864066
Change-Id: Id6263c38ac7042489ab695454f8e0fb2d85a3958
 2016-01-29 13:10:03 -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

* commit '7a86884a9a3474a926d30f7afdf0b7a3d307dd81':
  Sign APKs using SHA-256 instead of SHA-1 when possible.
 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

* commit '50f872c6967428cea172746af24506342745dcaa':
  Sign APKs using SHA-256 instead of SHA-1 when possible.
 2016-01-29 20:22:29 +00:00
Alex Klyubin 50f872c696 Merge "Sign APKs using SHA-256 instead of SHA-1 when possible." 2016-01-29 20:17:49 +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 c2c49ed0c1).

To avoid increasing incremental OTA update package sizes for already
released platforms, release build scripts disable the above logic when
signing target files ZIPs for pre-N platforms.

Bug: 25643280

(cherry picked from commit de5bc04717)

Change-Id: I4b100750e47788ab6ed897a0a5abfd33542e8676
 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.

Change-Id: Id2bef692997876c34f6c58b7b0512f4478da1985
 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.

Change-Id: Ibb655daa05de55c3c947141ddf96a32ca1d87de4
 2016-01-29 13:29:39 +00:00