Neil Fuller
4495f6afb8
Make OpenJDK 8 the default
...
To return to OpenJDK 7:
export LEGACY_USE_JAVA7=true
And run envsetup.sh/lunch again.
Bug: 25786468
Change-Id: I8e00591a24d13e3b8b6baaafe0fdff6536c58770
2016-01-25 10:19:25 +00:00
Stephen Hines
64fe4cb61a
Merge "Add an RS_CLANG variable as well for RenderScript." am: adad19674c
...
am: d809c6ed48
* commit 'd809c6ed48835a02c32c2be3a8867f7bee04328b':
Add an RS_CLANG variable as well for RenderScript.
2016-01-23 01:04:12 +00:00
Stephen Hines
d809c6ed48
Merge "Add an RS_CLANG variable as well for RenderScript."
...
am: adad19674c
* commit 'adad19674cfd7c38b16f2c2bd0c5bdf956157c6c':
Add an RS_CLANG variable as well for RenderScript.
2016-01-22 23:28:16 +00:00
Stephen Hines
adad19674c
Merge "Add an RS_CLANG variable as well for RenderScript."
2016-01-22 23:22:44 +00:00
Stephen Hines
49b695375c
Add an RS_CLANG variable as well for RenderScript.
...
Change-Id: I33a73c4c2b19aa17bc18a64c92a86565111de3d0
2016-01-22 15:11:58 -08:00
Marco Nelissen
3402a41879
Add mediacodec binary for codec process
...
Bug: 22775369
Change-Id: Ia0632d8329cf16c6435df87bf208e2750bb31542
2016-01-22 14:43:13 -08:00
Stephen Hines
b7a9e8ed90
Merge "Add clang rules for RS_LLVM_* tools." am: 4ac28d5258
...
am: 48f0b9fb5a
* commit '48f0b9fb5a7083b41bb4804059fac194f8b8c1e1':
Add clang rules for RS_LLVM_* tools.
2016-01-22 21:50:31 +00:00
Stephen Hines
48f0b9fb5a
Merge "Add clang rules for RS_LLVM_* tools."
...
am: 4ac28d5258
* commit '4ac28d5258651c214a8480ad082254fd9c94ed55':
Add clang rules for RS_LLVM_* tools.
2016-01-22 21:24:40 +00:00
Stephen Hines
4ac28d5258
Merge "Add clang rules for RS_LLVM_* tools."
2016-01-22 21:20:19 +00:00
Josh Gao
f3e7204bef
Error out if MALLOC_IMPL is defined.
...
Bug: http://b/26390299
Change-Id: Icd3ce6853c8207b1a9ce1f9d546a61d5b113f15a
2016-01-22 11:25:24 -08:00
Alex Klyubin
36e2384228
Merge "resolve merge conflicts of bb3d77ba95
to master."
2016-01-22 19:14:52 +00:00
Alex Klyubin
24b1c64c5b
resolve merge conflicts of bb3d77ba95
to master.
...
Change-Id: Ib69e2a457c416b4da94fb76c231120632d47a07a
2016-01-22 11:05:03 -08:00
Neil Fuller
6b12575440
Merge "Doclava template changes associated with default methods"
2016-01-22 19:04:46 +00:00
Tao Bao
f2ca92d9c4
Merge "Generate OTA packages for A/B update." am: bc6a66826a
...
am: 4f3015f4a2
* commit '4f3015f4a286d711e0d2c6178e60462d146570b3':
Generate OTA packages for A/B update.
2016-01-22 18:53:29 +00:00
Alex Klyubin
c8caf263be
Merge "Make signapk sign using APK Signature Scheme v2." am: b86b5344a6
...
am: eafce4eefd
* commit 'eafce4eefdbf83b1cc6fd134e4916650c5768c9b':
Make signapk sign using APK Signature Scheme v2.
2016-01-22 18:53:23 +00:00
Tao Bao
6c5f0acbe8
Merge "CleanSpec: Clean up /recovery/root/sdcard." am: b69d3b28a5
...
am: 8994f9ca38
* commit '8994f9ca383fa887e570f54ea78bfeb9fdd39b2e':
CleanSpec: Clean up $(PRODUCT_OUT)/recovery/root/sdcard.
2016-01-22 18:53:15 +00:00
Neil Fuller
ca59875e12
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
Change-Id: I1dfc014b3c6218cc1f7716a760d73c9b915f2d97
2016-01-22 10:37:17 -08:00
James Hawkins
bb3d77ba95
Merge "bootstat: Add bootstat to the embedded target to support logging boot time across devices."
...
am: cb9da42c87
* commit 'cb9da42c878f5afb32513b441eaf72868163b655':
bootstat: Add bootstat to the embedded target to support logging boot time across devices.
2016-01-22 18:28:19 +00:00
James Hawkins
cb9da42c87
Merge "bootstat: Add bootstat to the embedded target to support logging boot time across devices."
2016-01-22 18:09:05 +00:00
Tao Bao
4f3015f4a2
Merge "Generate OTA packages for A/B update."
...
am: bc6a66826a
* commit 'bc6a66826a56607c2e6a02f70b21e9faa0793719':
Generate OTA packages for A/B update.
2016-01-22 17:27:52 +00:00
Tao Bao
bc6a66826a
Merge "Generate OTA packages for A/B update."
2016-01-22 17:23:28 +00:00
Stephen Hines
96d2a8c5e4
Add clang rules for RS_LLVM_* tools.
...
This change adds new variables for RS_LLVM_* tools, which correspond
to the version of LLVM checked in currently to external/, instead of
mapping to the latest host prebuilts. This will help prevent version
differences for newer IR generated by the updated host prebuilts, which
then might not be readable with the on-device LLVM bits we build from
external/.
Change-Id: I6c7b0fa9082e9c8244cc508cb23960569a057740
2016-01-21 23:50:53 -08:00
Alex Klyubin
eafce4eefd
Merge "Make signapk sign using APK Signature Scheme v2."
...
am: b86b5344a6
* commit 'b86b5344a6b7703bfa36a203f34ca3a117051587':
Make signapk sign using APK Signature Scheme v2.
2016-01-22 04:12:30 +00:00
Alex Klyubin
b86b5344a6
Merge "Make signapk sign using APK Signature Scheme v2."
2016-01-22 04:07:45 +00:00
Tao Bao
8994f9ca38
Merge "CleanSpec: Clean up /recovery/root/sdcard."
...
am: b69d3b28a5
* commit 'b69d3b28a5a00050d946921a7e14b5eae203ebac':
CleanSpec: Clean up $(PRODUCT_OUT)/recovery/root/sdcard.
2016-01-22 01:33:03 +00:00
Tao Bao
b69d3b28a5
Merge "CleanSpec: Clean up $(PRODUCT_OUT)/recovery/root/sdcard."
2016-01-22 01:28:30 +00:00
Tao Bao
6b10089bd6
CleanSpec: Clean up $(PRODUCT_OUT)/recovery/root/sdcard.
...
Incremental build going across CL in [1] needs to remove the old
symlink to avoid hitting mkdir error.
[1]: commit 3f56a33041
Change-Id: Iff62ed55eb2782ba3e1e9b6de39a691de2427384
2016-01-21 17:18:47 -08:00
Colin Cross
1398f9d30d
Merge "Set flag when using sdk tools in place" am: 41ee5fc07a
...
am: 11a87113ef
* commit '11a87113ef232c4f615a4c8df74dc28da17bec1e':
Set flag when using sdk tools in place
2016-01-22 00:16:17 +00:00
Colin Cross
11a87113ef
Merge "Set flag when using sdk tools in place"
...
am: 41ee5fc07a
* commit '41ee5fc07adf81348a807c2de8d4460598a38fa4':
Set flag when using sdk tools in place
2016-01-22 00:04:05 +00:00
James Hawkins
bc5dc64232
bootstat: Add bootstat to the embedded target to support logging boot
...
time across devices.
Bug: 21724738
Change-Id: I165e8597103ea235a0826e321a1658823c4b4664
2016-01-21 15:39:45 -08:00
Colin Cross
41ee5fc07a
Merge "Set flag when using sdk tools in place"
2016-01-21 23:36:26 +00:00
Tao Bao
b6459cc143
Merge "Makefile: Fix the location for payload signing key." am: 27a1201989
...
am: 3ea04365dc
* commit '3ea04365dc39c14d458d69eb3954cbf099654681':
Makefile: Fix the location for payload signing key.
2016-01-21 23:25:48 +00:00
Dan Willemsen
37693fc24b
Merge "Pass the arm/thumb cflags to assembly files" am: 60c9200c1e
...
am: 537e093fe8
* commit '537e093fe893e21ecab7aba2a32c99f18f5350b6':
Pass the arm/thumb cflags to assembly files
2016-01-21 23:25:34 +00:00
Tao Bao
c2a8b0b6b1
Merge "Makefile: Add the payload public key into system image." am: b49d05e72e
...
am: cf7eb025f8
* commit 'cf7eb025f88349797032b649fd47e8b4de80235e':
Makefile: Add the payload public key into system image.
2016-01-21 23:25:19 +00:00
Tao Bao
3ea04365dc
Merge "Makefile: Fix the location for payload signing key."
...
am: 27a1201989
* commit '27a1201989d782af30a30186a05448dbbe3304b8':
Makefile: Fix the location for payload signing key.
2016-01-21 23:19:16 +00:00
Dan Willemsen
537e093fe8
Merge "Pass the arm/thumb cflags to assembly files"
...
am: 60c9200c1e
* commit '60c9200c1ee3f5d983c5f9d9cc1724f6010daca2':
Pass the arm/thumb cflags to assembly files
2016-01-21 23:19:02 +00:00
Tao Bao
cf7eb025f8
Merge "Makefile: Add the payload public key into system image."
...
am: b49d05e72e
* commit 'b49d05e72e03c4d51c81ec8fcedd463ea5b0e28f':
Makefile: Add the payload public key into system image.
2016-01-21 23:18:50 +00:00
Tao Bao
27a1201989
Merge "Makefile: Fix the location for payload signing key."
2016-01-21 22:37:46 +00:00
Tao Bao
23c3db9372
Makefile: Fix the location for payload signing key.
...
CL in [1] put it in a wrong path.
[1] commit 38812d684b
Bug: 25715402
Change-Id: I01a105888844011eee083d5f4d694223599fa067
2016-01-21 14:33:22 -08:00
Dan Willemsen
60c9200c1e
Merge "Pass the arm/thumb cflags to assembly files"
2016-01-21 22:31:11 +00:00
Tao Bao
b49d05e72e
Merge "Makefile: Add the payload public key into system image."
2016-01-21 22:21:31 +00:00
Christopher Wiley
e46193a608
Merge "Separate aidl dependencies from compiler dependencies" am: 8edda3afdf
...
am: cfd817d058
* commit 'cfd817d058994ebda3b98db4e8113752753d422e':
Separate aidl dependencies from compiler dependencies
2016-01-21 18:29:25 +00:00
Christopher Wiley
d1eea90a72
Merge "Keep aidl generated C++ inside the generated folder" am: 11feb8b075
...
am: 7c52b2d878
* commit '7c52b2d878e6234cb6e36942c87c438fa1e80240':
Keep aidl generated C++ inside the generated folder
2016-01-21 18:29:15 +00:00
Christopher Wiley
cfd817d058
Merge "Separate aidl dependencies from compiler dependencies"
...
am: 8edda3afdf
* commit '8edda3afdf1bf3327706d89a5b4b5ce53feedbe5':
Separate aidl dependencies from compiler dependencies
2016-01-21 18:27:02 +00:00
Christopher Wiley
7c52b2d878
Merge "Keep aidl generated C++ inside the generated folder"
...
am: 11feb8b075
* commit '11feb8b075ce48fc4b6386049a666a5e888247f8':
Keep aidl generated C++ inside the generated folder
2016-01-21 18:26:54 +00:00
Alex Klyubin
de5bc04717
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
Change-Id: I048393e0971d0d6559dbd69ea902754c6c7cab14
2016-01-21 10:25:12 -08:00
Christopher Wiley
8edda3afdf
Merge "Separate aidl dependencies from compiler dependencies"
2016-01-21 18:19:05 +00:00
Christopher Wiley
11feb8b075
Merge "Keep aidl generated C++ inside the generated folder"
2016-01-21 18:17:29 +00:00
Narayan Kamath
9a39d29241
Merge "Make a confusing error message clearer."
2016-01-21 10:15:40 +00:00
Tao Bao
38812d684b
Makefile: Add the payload public key into system image.
...
For non-Brillo devices using AB update, add the payload signing public
key to the system image
(system/etc/update_engine/update-payload-key.pub.pem).
We first need to sign the payload with some private key, and pack it
into an Android OTA package. Then the whole zip package will be signed
again with the device key. This is to comply with the two existing OTA
flows (Android and CrOS).
We use the same device key to do the two signings, but update_engine
expects the key in RSA public key format. This CL extracts the public
key from x509 certificate and adds it to the system image.
Bug: 25715402
Change-Id: I6f6c1148534250ddb6d9e554175c7a35bceda99e
2016-01-20 21:29:00 -08:00