OSDN Git Service
The Android Automerger [Mon, 1 Feb 2016 13:14:40 +0000 (05:14 -0800)]
"NRC32"
The Android Automerger [Mon, 1 Feb 2016 13:12:05 +0000 (05:12 -0800)]
merge in nyc-release history after reset to master
Shinichiro Hamaji [Mon, 1 Feb 2016 08:22:05 +0000 (08:22 +0000)]
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"
Shinichiro Hamaji [Mon, 1 Feb 2016 08:20:17 +0000 (08:20 +0000)]
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"
Shinichiro Hamaji [Mon, 1 Feb 2016 08:16:42 +0000 (08:16 +0000)]
Merge "Revert "Use dependency files generated by llvm-rs-cc for Java""
Shinichiro Hamaji [Mon, 1 Feb 2016 08:08:26 +0000 (08:08 +0000)]
Revert "Use dependency files generated by llvm-rs-cc for Java"
This reverts commit
4c474617d491fe98fa02571349138fb757959232.
Change-Id: I66c46360d0ccf927c807ddd5cfbc56cbd97ed4a2
Shinichiro Hamaji [Mon, 1 Feb 2016 07:57:01 +0000 (07:57 +0000)]
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
Shinichiro Hamaji [Mon, 1 Feb 2016 07:56:47 +0000 (07:56 +0000)]
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
Shinichiro Hamaji [Mon, 1 Feb 2016 07:54:53 +0000 (07:54 +0000)]
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
Shinichiro Hamaji [Mon, 1 Feb 2016 07:54:39 +0000 (07:54 +0000)]
Merge "Use .KATI_DEPFILE for files generated by aidl-java"
am:
465fd483f5
* commit '
465fd483f512df16e788a6497b45e7a763a6dcd7':
Use .KATI_DEPFILE for files generated by aidl-java
Shinichiro Hamaji [Mon, 1 Feb 2016 07:50:32 +0000 (07:50 +0000)]
Merge "Use dependency files generated by llvm-rs-cc for Java"
Shinichiro Hamaji [Mon, 1 Feb 2016 07:50:01 +0000 (07:50 +0000)]
Merge "Use .KATI_DEPFILE for files generated by aidl-java"
Dan Willemsen [Sat, 30 Jan 2016 02:49:22 +0000 (02:49 +0000)]
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.
Dan Willemsen [Sat, 30 Jan 2016 02:49:08 +0000 (02:49 +0000)]
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
Dan Willemsen [Sat, 30 Jan 2016 02:47:35 +0000 (02:47 +0000)]
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.
Dan Willemsen [Sat, 30 Jan 2016 02:47:20 +0000 (02:47 +0000)]
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
Dan Willemsen [Sat, 30 Jan 2016 02:44:27 +0000 (02:44 +0000)]
Merge "Use Jan 1 2009 as timestamp in APKs and OTA update ZIPs."
Dan Willemsen [Sat, 30 Jan 2016 02:44:12 +0000 (02:44 +0000)]
Merge "Order objects based on LOCAL_SRC_FILES and LOCAL_GENERATED_SOURCES"
Alex Klyubin [Sat, 30 Jan 2016 00:04:25 +0000 (00:04 +0000)]
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.
Alex Klyubin [Sat, 30 Jan 2016 00:02:34 +0000 (00:02 +0000)]
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.
Alex Klyubin [Fri, 29 Jan 2016 23:58:27 +0000 (23:58 +0000)]
Merge "Revert "Sign APKs using SHA-256 instead of SHA-1 when possible." This is breaking CTS."
Alex Klyubin [Fri, 29 Jan 2016 23:56:44 +0000 (23:56 +0000)]
Revert "Sign APKs using SHA-256 instead of SHA-1 when possible." This is breaking CTS.
This reverts commit
c2a36afd6772d9286e8071693f80648beef763a3.
Change-Id: I4389bf99aeb213198c1c501ba9462bd4a4540d0a
Lee Campbell [Fri, 29 Jan 2016 23:48:10 +0000 (23:48 +0000)]
Merge "brillo: Remove dependency on java for Brillo" am:
6c8e3e4108
am:
fd5d6f440a
* commit '
fd5d6f440a13643f4e645e960e1f2c417af3355a':
brillo: Remove dependency on java for Brillo
Lee Campbell [Fri, 29 Jan 2016 23:46:16 +0000 (23:46 +0000)]
Merge "brillo: Remove dependency on java for Brillo"
am:
6c8e3e4108
* commit '
6c8e3e41085d75184ae321c12e26cf26002552d3':
brillo: Remove dependency on java for Brillo
Lee Campbell [Fri, 29 Jan 2016 23:42:19 +0000 (23:42 +0000)]
Merge "brillo: Remove dependency on java for Brillo"
Lee Campbell [Fri, 29 Jan 2016 00:12:01 +0000 (16:12 -0800)]
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
Alex Klyubin [Fri, 29 Jan 2016 21:06:50 +0000 (13:06 -0800)]
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
Dan Willemsen [Fri, 29 Jan 2016 20:54:44 +0000 (20:54 +0000)]
Merge "Fix classes.jack extraction from platform.zip"
The Android Automerger [Fri, 29 Jan 2016 20:47:40 +0000 (12:47 -0800)]
"NRC28E"
Alex Klyubin [Fri, 29 Jan 2016 20:25:10 +0000 (20:25 +0000)]
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.
Alex Klyubin [Fri, 29 Jan 2016 20:22:29 +0000 (20:22 +0000)]
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.
Alex Klyubin [Fri, 29 Jan 2016 20:17:49 +0000 (20:17 +0000)]
Merge "Sign APKs using SHA-256 instead of SHA-1 when possible."
Yohann Roussel [Fri, 29 Jan 2016 12:06:11 +0000 (13:06 +0100)]
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
Alex Klyubin [Wed, 13 Jan 2016 18:32:47 +0000 (10:32 -0800)]
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
c2c49ed0c13846f7f96249c7419971dfcddc9215).
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
de5bc04717505ad0e5b55605bccf43974f4c5c7a)
Change-Id: I4b100750e47788ab6ed897a0a5abfd33542e8676
Neil Fuller [Fri, 29 Jan 2016 14:21:45 +0000 (14:21 +0000)]
Merge "Revert "Allow java targets to support 1.8 source / target""
Neil Fuller [Fri, 29 Jan 2016 13:29:39 +0000 (13:29 +0000)]
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
cdfbe4a8522b9a13ffe6ac1f826a1d6760f87d60.
Change-Id: Ibb655daa05de55c3c947141ddf96a32ca1d87de4
Neil Fuller [Fri, 29 Jan 2016 11:00:31 +0000 (11:00 +0000)]
Merge "Allow java targets to support 1.8 source / target"
The Android Automerger [Fri, 29 Jan 2016 02:28:08 +0000 (18:28 -0800)]
"NRC28D"
The Android Automerger [Thu, 28 Jan 2016 22:31:19 +0000 (14:31 -0800)]
"NRC28C"
Marco Nelissen [Thu, 28 Jan 2016 21:41:43 +0000 (21:41 +0000)]
Revert "Add mediacodec binary for codec process"
This reverts commit
3402a418797070748fb84609137b5cb69f13c86e.
Change-Id: Id97fe54862a6450ff9313dabab542a00f8578fdd
Keun-young Park [Thu, 28 Jan 2016 22:04:56 +0000 (22:04 +0000)]
Merge "PDK: add files necessary to for Java build to platform.zip"
Marco Nelissen [Thu, 28 Jan 2016 21:55:42 +0000 (21:55 +0000)]
Merge "Revert "Add mediacodec binary for codec process""
Marco Nelissen [Thu, 28 Jan 2016 21:41:43 +0000 (21:41 +0000)]
Revert "Add mediacodec binary for codec process"
This reverts commit
3402a418797070748fb84609137b5cb69f13c86e.
Change-Id: Id97fe54862a6450ff9313dabab542a00f8578fdd
Keun-young Park [Wed, 27 Jan 2016 03:22:37 +0000 (19:22 -0800)]
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
The Android Automerger [Thu, 28 Jan 2016 16:23:12 +0000 (08:23 -0800)]
"NRC28B"
Neil Fuller [Sat, 16 Jan 2016 03:41:26 +0000 (19:41 -0800)]
Allow java targets to support 1.8 source / target
This change enables build rules to specify:
LOCAL_JAVA_LANGUAGE_VERSION := 1.8
to enable -source 1.8 -target 1.8 for javac and
equivalent flags for Jack.
Bug:
26753820
Change-Id: I7991fafe4978485354663f091f4d78a0cc73ba26
The Android Automerger [Thu, 28 Jan 2016 08:04:14 +0000 (00:04 -0800)]
"NRC28"
Shinichiro Hamaji [Thu, 28 Jan 2016 08:00:33 +0000 (17:00 +0900)]
Use dependency files generated by llvm-rs-cc for Java
This is similar to
2e45fd036ad308cfa6094b181a67f97002ebf10f
but this CL is for generated java code.
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: I5c7705c67f3c65c4c14f74558e603f8ec9f35879
The Android Automerger [Thu, 28 Jan 2016 08:00:32 +0000 (00:00 -0800)]
merge in nyc-release history after reset to master
Shinichiro Hamaji [Thu, 28 Jan 2016 07:10:00 +0000 (16:10 +0900)]
Use .KATI_DEPFILE for files generated by aidl-java
Bug:
26839129
Change-Id: Ief611969b28aea3bb12097ba91d40f3e5010d647
Chien-Yu Chen [Thu, 28 Jan 2016 02:04:35 +0000 (02:04 +0000)]
Merge "Add cameraserver process"
Dan Willemsen [Wed, 20 Jan 2016 04:07:08 +0000 (20:07 -0800)]
Order objects based on LOCAL_SRC_FILES and LOCAL_GENERATED_SOURCES
We have been reordering objects to the linker based on how they were
generated. In soong, they're ordered based on the order listed in the
src_files.
Keep track of which source files created which object files so that we
can create the ordered list. Optionally change the order, based on
BINARY_OBJECTS_ORDER. That way we can compare make and soong builds.
Since we're keeping track of the used source files, warn when an entry
in LOCAL_SRC_FILES is not used. (whether it is an unused file like a
header, or a typo)
LOCAL_GENERATED_SOURCES is not verified, since it is valid to add
headers and other files in that list (to set up dependencies).
Change-Id: I1dfbbb3aa570c11c1db3b7133e46ed0b8c3b8989
The Android Automerger [Wed, 27 Jan 2016 22:59:48 +0000 (14:59 -0800)]
"NRC27C"
Jesse Hall [Wed, 27 Jan 2016 21:43:44 +0000 (21:43 +0000)]
Merge "Add libvulkan to base PRODUCT_PACKAGES"
The Android Automerger [Wed, 27 Jan 2016 18:23:31 +0000 (10:23 -0800)]
"NRC27B"
Alex Klyubin [Wed, 27 Jan 2016 17:56:21 +0000 (17:56 +0000)]
Merge "Revert "Sign APKs using SHA-256 instead of SHA-1 when possible."" am:
4a97cde443
am:
e40660247d
* commit '
e40660247dfb4260fff31ba38b2869f644e1329b':
Revert "Sign APKs using SHA-256 instead of SHA-1 when possible."
Alex Klyubin [Wed, 27 Jan 2016 17:52:55 +0000 (17:52 +0000)]
Merge "Revert "Sign APKs using SHA-256 instead of SHA-1 when possible.""
am:
4a97cde443
* commit '
4a97cde443829f1a3bf40fe6e820ba5b01e3bf87':
Revert "Sign APKs using SHA-256 instead of SHA-1 when possible."
Alex Klyubin [Wed, 27 Jan 2016 17:49:40 +0000 (17:49 +0000)]
Merge "Revert "Sign APKs using SHA-256 instead of SHA-1 when possible.""
Marco Nelissen [Wed, 27 Jan 2016 17:46:47 +0000 (17:46 +0000)]
Merge "Add mediacodec binary for codec process"
Alex Klyubin [Wed, 27 Jan 2016 17:45:42 +0000 (17:45 +0000)]
Revert "Sign APKs using SHA-256 instead of SHA-1 when possible."
This reverts commit
74df828cb574a6f30be9b9dcf286773ca1835f72. This commit is breaking a build, again...
Change-Id: I2df561d68302ba4c83e90a64a7bf203645033a3b
Alex Klyubin [Wed, 27 Jan 2016 17:04:09 +0000 (17:04 +0000)]
Merge "Sign APKs using SHA-256 instead of SHA-1 when possible." am:
72d152f478
am:
5132fe2ef9
* commit '
5132fe2ef9f29bd748a8d34898bd183ef257e937':
Sign APKs using SHA-256 instead of SHA-1 when possible.
Alex Klyubin [Wed, 27 Jan 2016 17:01:54 +0000 (17:01 +0000)]
Merge "Sign APKs using SHA-256 instead of SHA-1 when possible."
am:
72d152f478
* commit '
72d152f478a6a48c5e06053e440801f61d256a50':
Sign APKs using SHA-256 instead of SHA-1 when possible.
Alex Klyubin [Wed, 27 Jan 2016 16:55:16 +0000 (16:55 +0000)]
Merge "Sign APKs using SHA-256 instead of SHA-1 when possible."
Neil Fuller [Wed, 27 Jan 2016 13:36:01 +0000 (13:36 +0000)]
Merge "Doclava template changes associated with default methods" am:
26990b0f64
am:
e71759c8ff
* commit '
e71759c8ff7cbedd1fe629cdbe86e141c4f1f470':
Doclava template changes associated with default methods
Neil Fuller [Wed, 27 Jan 2016 13:32:37 +0000 (13:32 +0000)]
Merge "Doclava template changes associated with default methods"
am:
26990b0f64
* commit '
26990b0f64e47c3f5366a03573f4d1e3408301d9':
Doclava template changes associated with default methods
Neil Fuller [Wed, 27 Jan 2016 13:25:43 +0000 (13:25 +0000)]
Merge "Doclava template changes associated with default methods"
Neil Fuller [Thu, 14 Jan 2016 22:44:11 +0000 (22:44 +0000)]
Doclava template changes associated with default methods
The ordering of method declaration modifiers changed slightly
to reflect the ordering given in:
http://docs.oracle.com/javase/specs/jls/se8/html/jls-8.html#jls-8.4.3
http://docs.oracle.com/javase/specs/jls/se8/html/jls-9.html#jls-9.4
Bug:
26241119
(cherry-picked from commit
ca59875e12e47162fc765bc43d6651b555c04d81)
Change-Id: I8489ad5010fc811b22167af50ba29221aac8b6cb
Shinichiro Hamaji [Wed, 27 Jan 2016 08:41:56 +0000 (08:41 +0000)]
Merge "Write clean_steps.mk with multiple commands" am:
3e2f5d83a4
am:
a4e26de266
* commit '
a4e26de26644f00b90232356fb8eae8ba761400d':
Write clean_steps.mk with multiple commands
Shinichiro Hamaji [Wed, 27 Jan 2016 08:39:38 +0000 (08:39 +0000)]
Merge "Write clean_steps.mk with multiple commands"
am:
3e2f5d83a4
* commit '
3e2f5d83a47d3f9b3f1a2f57c894dff64ae6c603':
Write clean_steps.mk with multiple commands
Shinichiro Hamaji [Wed, 27 Jan 2016 08:36:04 +0000 (08:36 +0000)]
Merge "Write clean_steps.mk with multiple commands"
Jesse Hall [Wed, 27 Jan 2016 08:20:35 +0000 (00:20 -0800)]
Add libvulkan to base PRODUCT_PACKAGES
Change-Id: Ie0d583a349a6ef5542da91e5c1f1f348f02fe435
The Android Automerger [Wed, 27 Jan 2016 08:03:18 +0000 (00:03 -0800)]
"NRC27"
The Android Automerger [Wed, 27 Jan 2016 08:00:20 +0000 (00:00 -0800)]
merge in nyc-release history after reset to master
Shinichiro Hamaji [Wed, 27 Jan 2016 05:59:56 +0000 (14:59 +0900)]
Write clean_steps.mk with multiple commands
$(INTERNAL_CLEAN_STEPS) could be too big to be fit in a single
command line.
Bug:
26707439
Change-Id: Ieed6c772980d06c2418a9246b025bca7a6f568aa
Alex Deymo [Wed, 27 Jan 2016 03:35:09 +0000 (03:35 +0000)]
Merge "Place the META/ dir first in the target_files.zip." am:
2857b7a3d7
am:
95b0f7d3cc
* commit '
95b0f7d3ccfc10659a0c6ac1eaed18284b4e9b55':
Place the META/ dir first in the target_files.zip.
Alex Deymo [Wed, 27 Jan 2016 03:33:20 +0000 (03:33 +0000)]
Merge "Place the META/ dir first in the target_files.zip."
am:
2857b7a3d7
* commit '
2857b7a3d7e2057cf60db36a528358a58a8711bc':
Place the META/ dir first in the target_files.zip.
Alex Deymo [Wed, 27 Jan 2016 03:28:53 +0000 (03:28 +0000)]
Merge "Place the META/ dir first in the target_files.zip."
Alex Deymo [Wed, 27 Jan 2016 02:47:44 +0000 (18:47 -0800)]
Place the META/ dir first in the target_files.zip.
To help early verification of a target_files.zip being uploaded to our
servers, we place the META/ directory first in the .zip file, so checks
against the product_id.txt and product_version.txt don't need to wait
for the whole file to upload.
Note that META/*filesystem_config.txt files are generated and added to
the .zip file at a later point, so they are not included at the
beginning.
Bug:
26806325
TEST=`make dist` and `unzip -l out/dist/edison-target_files-eng.$USER.zip` shows most META/ files first.
Change-Id: I1955645412688f5c7823063ed56606b251daccfd
Yin-Chia Yeh [Wed, 27 Jan 2016 00:14:43 +0000 (00:14 +0000)]
Merge "Revert "Revert "Camera: add NDK camera library"""
Yin-Chia Yeh [Wed, 27 Jan 2016 00:13:51 +0000 (00:13 +0000)]
Revert "Revert "Camera: add NDK camera library""
This reverts commit
e4329eb24f48b8f48d5525fe7551e8908af734c0.
Change-Id: I414845a9e12148499db46a2c1b083d65175dea09
Kevin Cernekee [Tue, 26 Jan 2016 23:53:34 +0000 (23:53 +0000)]
Merge "README: Update docs" am:
30177c45b4
am:
753536092c
* commit '
753536092c2cde7e959bdcaef9c45207351e9a18':
README: Update docs
Kevin Cernekee [Tue, 26 Jan 2016 23:51:39 +0000 (23:51 +0000)]
Merge "README: Update docs"
am:
30177c45b4
* commit '
30177c45b4e61ae11749bf9106c64d1b1e2ae517':
README: Update docs
Kevin Cernekee [Tue, 26 Jan 2016 23:45:37 +0000 (23:45 +0000)]
Merge "README: Update docs"
Yin-Chia Yeh [Tue, 26 Jan 2016 23:44:15 +0000 (23:44 +0000)]
Merge "Revert "Camera: add NDK camera library""
Yin-Chia Yeh [Tue, 26 Jan 2016 23:42:43 +0000 (23:42 +0000)]
Revert "Camera: add NDK camera library"
This reverts commit
153005787de03c67cfc8c4cb6e7c43e0b6673d02.
Breaking seed/andromeda build now. Investigating.
Change-Id: Id0884cc8b126694c9142d7771dc2187b10fdd415
Yin-Chia Yeh [Tue, 26 Jan 2016 22:30:08 +0000 (22:30 +0000)]
Merge "Camera: add NDK camera library"
Adam Lesinski [Tue, 26 Jan 2016 20:17:32 +0000 (12:17 -0800)]
Use --pseudo-localize only with compile phase in AAPT2
AAPT2 does pseudo-localization in compile phase. Passing --pseudo-localize
to the link phase causes an error.
Bug:
25958912
Change-Id: I6ced0979884cb0d718018f995f9b2f6476d401cb
Adam Lesinski [Tue, 26 Jan 2016 19:25:03 +0000 (19:25 +0000)]
Merge "Support to build with AAPT2"
The Android Automerger [Tue, 26 Jan 2016 19:22:34 +0000 (11:22 -0800)]
"NRC26C"
Alex Klyubin [Wed, 13 Jan 2016 18:32:47 +0000 (10:32 -0800)]
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
c2c49ed0c13846f7f96249c7419971dfcddc9215).
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
Change-Id: I058393e0971d0d6559dbd69ea902754c6c7cab14
(cherry picked from commit
de5bc04717505ad0e5b55605bccf43974f4c5c7a)
The Android Automerger [Tue, 26 Jan 2016 15:33:08 +0000 (07:33 -0800)]
"NRC26B"
Neil Fuller [Tue, 26 Jan 2016 10:39:58 +0000 (10:39 +0000)]
Merge "Revert "Revert "Make OpenJDK 8 the default""" am:
385ac86745
am:
97ffb1ab83
* commit '
97ffb1ab83e40ddb1218fd911f26f466d4c8675b':
Revert "Revert "Make OpenJDK 8 the default""
Neil Fuller [Tue, 26 Jan 2016 10:37:15 +0000 (10:37 +0000)]
Merge "Revert "Revert "Make OpenJDK 8 the default"""
am:
385ac86745
* commit '
385ac86745e2294e3ac8da7540659a2150ac7923':
Revert "Revert "Make OpenJDK 8 the default""
Neil Fuller [Tue, 26 Jan 2016 10:33:54 +0000 (10:33 +0000)]
Merge "Revert "Revert "Make OpenJDK 8 the default"""
The Android Automerger [Tue, 26 Jan 2016 08:03:03 +0000 (00:03 -0800)]
"NRC26"
The Android Automerger [Tue, 26 Jan 2016 08:00:19 +0000 (00:00 -0800)]
merge in nyc-release history after reset to master
Shinichiro Hamaji [Tue, 26 Jan 2016 06:41:53 +0000 (06:41 +0000)]
Merge "Use dependency files generated by llvm-rs-cc" am:
19f99a742d
am:
d39a629d3a
* commit '
d39a629d3ae3b072f419972356bcfa3fc340b1bd':
Use dependency files generated by llvm-rs-cc
Ying Wang [Fri, 4 Dec 2015 21:59:18 +0000 (13:59 -0800)]
Support to build with AAPT2
To build with AAPT2, set "USE_AAPT2=true".
TODO: Support split apks and generated resources from other than renderscript.
Bug:
25958912
Change-Id: I19b1a038824ce5b2a3d3ffadbce3173c845193fc
Shinichiro Hamaji [Tue, 26 Jan 2016 06:40:11 +0000 (06:40 +0000)]
Merge "Use dependency files generated by llvm-rs-cc"
am:
19f99a742d
* commit '
19f99a742d393ffe41737d7c2e86c7b6ebe83ff0':
Use dependency files generated by llvm-rs-cc
Shinichiro Hamaji [Tue, 26 Jan 2016 06:36:02 +0000 (06:36 +0000)]
Merge "Use dependency files generated by llvm-rs-cc"