OSDN Git Service
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
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"
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"
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"""
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"
Shinichiro Hamaji [Mon, 25 Jan 2016 09:59:43 +0000 (18:59 +0900)]
Use dependency files generated by llvm-rs-cc
This was a regression since kati has been introduced. This CL
introduces include-depfile function to make it easier to write
Makefiles which work with both make and kati.
As ninja can handle only a single dependency file per a build
rule, now we merge multiple .d files generated by llvm-rs-cc
into a .d file.
Change-Id: Iaf64a8f0523ab98115837e6e06abd50f06620363
Yin-Chia Yeh [Mon, 25 Jan 2016 21:24:29 +0000 (13:24 -0800)]
Camera: add NDK camera library
Bug:
23012001
Change-Id: I19b9d4c7a83f3baaf5e6102c5f0b7876546fe95d
Christopher Ferris [Mon, 25 Jan 2016 21:33:46 +0000 (21:33 +0000)]
Merge "Add libc_malloc_debug to the always build list." am:
4d15f2f8c9
am:
093ca195bd
* commit '
093ca195bd6a3e21c11ad04553b3fe5c6447ea97':
Add libc_malloc_debug to the always build list.
Christopher Ferris [Mon, 25 Jan 2016 21:31:54 +0000 (21:31 +0000)]
Merge "Add libc_malloc_debug to the always build list."
am:
4d15f2f8c9
* commit '
4d15f2f8c9adc463c6e904667b9793a3f3544ef4':
Add libc_malloc_debug to the always build list.
Christopher Ferris [Mon, 25 Jan 2016 21:27:57 +0000 (21:27 +0000)]
Merge "Add libc_malloc_debug to the always build list."
Josh Gao [Mon, 25 Jan 2016 18:33:01 +0000 (18:33 +0000)]
Merge "Error out if MALLOC_IMPL is defined." am:
1ae548d81d
am:
1559d44d1b
* commit '
1559d44d1bd0e120d63e06ffe6eae479b35fc4b2':
Error out if MALLOC_IMPL is defined.
Josh Gao [Mon, 25 Jan 2016 18:31:13 +0000 (18:31 +0000)]
Merge "Error out if MALLOC_IMPL is defined."
am:
1ae548d81d
* commit '
1ae548d81daf1938be67d902512fa0c4d8f6d502':
Error out if MALLOC_IMPL is defined.
Josh Gao [Mon, 25 Jan 2016 18:23:35 +0000 (18:23 +0000)]
Merge "Error out if MALLOC_IMPL is defined."
Neil Fuller [Mon, 25 Jan 2016 17:35:57 +0000 (17:35 +0000)]
Revert "Revert "Make OpenJDK 8 the default""
Reapply the JDK 8 switch in internal builds.
This reverts commit
85bddfdedffb425d85657314591a57191113806b.
Alex Klyubin [Mon, 25 Jan 2016 17:26:54 +0000 (17:26 +0000)]
Merge "Revert "Sign APKs using SHA-256 instead of SHA-1 when possible."" am:
7382bdf8c1
am:
2cf2509542
* commit '
2cf2509542d234e4d958195c834b74da2253b2cb':
Revert "Sign APKs using SHA-256 instead of SHA-1 when possible."
Alex Klyubin [Mon, 25 Jan 2016 17:24:27 +0000 (17:24 +0000)]
Merge "Revert "Sign APKs using SHA-256 instead of SHA-1 when possible.""
am:
7382bdf8c1
* commit '
7382bdf8c1a755fe20c5979453bfeec0be73da27':
Revert "Sign APKs using SHA-256 instead of SHA-1 when possible."
Alex Klyubin [Mon, 25 Jan 2016 17:19:02 +0000 (17:19 +0000)]
Merge "Revert "Sign APKs using SHA-256 instead of SHA-1 when possible.""
Alex Klyubin [Mon, 25 Jan 2016 17:17:09 +0000 (17:17 +0000)]
Revert "Sign APKs using SHA-256 instead of SHA-1 when possible."
This reverts commit
de5bc04717505ad0e5b55605bccf43974f4c5c7a because it's breaking some builds. Turns out some APKs have multiple sdkVersion attributes returned by aapt.
Change-Id: I013d6ef5eac473dd3900e0b9edf4c32cdc838bab
Neil Fuller [Mon, 25 Jan 2016 17:17:04 +0000 (17:17 +0000)]
Merge "Revert "Make OpenJDK 8 the default"" am:
c0acea2571
am:
a5e4ea2e44
* commit '
a5e4ea2e44e324101b412bac9f2fbb97bdc91670':
Revert "Make OpenJDK 8 the default"
Neil Fuller [Mon, 25 Jan 2016 17:14:16 +0000 (17:14 +0000)]
Merge "Revert "Make OpenJDK 8 the default""
am:
c0acea2571
* commit '
c0acea25717fb26a13572d459b02811d8c8f9db6':
Revert "Make OpenJDK 8 the default"
Neil Fuller [Mon, 25 Jan 2016 17:12:41 +0000 (17:12 +0000)]
Revert "Revert "Make OpenJDK 8 the default""
Reapply the switch to JDK 8 on aosp/master.
This reverts commit
85bddfdedffb425d85657314591a57191113806b.
Change-Id: If2e8733ba78b007d37914c0512cd6be1bd4c1e69
Neil Fuller [Mon, 25 Jan 2016 17:11:12 +0000 (17:11 +0000)]
Merge "Revert "Make OpenJDK 8 the default""
Neil Fuller [Mon, 25 Jan 2016 17:04:14 +0000 (17:04 +0000)]
Revert "Make OpenJDK 8 the default"
Temporary revert to help out Brillo folks.
It will be resubmitted tomorrow.
This reverts commit
4495f6afb8c23950c24dc9ee114050582da08f05.
Change-Id: Id378c7d3a6e72e9be50f9404b19d5763568987a5
Alex Klyubin [Mon, 25 Jan 2016 16:48:46 +0000 (16:48 +0000)]
Merge "Sign APKs using SHA-256 instead of SHA-1 when possible." am:
b763b29267
am:
2a37afd32c
* commit '
2a37afd32c4bb571ced26ec738a9d9a89b5fba7e':
Sign APKs using SHA-256 instead of SHA-1 when possible.
Alex Klyubin [Mon, 25 Jan 2016 16:46:43 +0000 (16:46 +0000)]
Merge "Sign APKs using SHA-256 instead of SHA-1 when possible."
am:
b763b29267
* commit '
b763b292671b9b18dcc9a5961c173667c674a3d5':
Sign APKs using SHA-256 instead of SHA-1 when possible.
Alex Klyubin [Mon, 25 Jan 2016 16:42:27 +0000 (16:42 +0000)]
Merge "Sign APKs using SHA-256 instead of SHA-1 when possible."
Neil Fuller [Mon, 25 Jan 2016 10:54:51 +0000 (10:54 +0000)]
Merge "Make OpenJDK 8 the default" am:
797d3deb52
am:
eaf7dbc90a
* commit '
eaf7dbc90a8ff7db7440fe021c4e7d5597efd40f':
Make OpenJDK 8 the default
Neil Fuller [Mon, 25 Jan 2016 10:53:01 +0000 (10:53 +0000)]
Merge "Make OpenJDK 8 the default"
am:
797d3deb52
* commit '
797d3deb52980a2bd8759e68a78ea99a56bb51e2':
Make OpenJDK 8 the default
Neil Fuller [Mon, 25 Jan 2016 10:45:34 +0000 (10:45 +0000)]
Merge "Make OpenJDK 8 the default"
Neil Fuller [Wed, 16 Dec 2015 18:59:08 +0000 (18:59 +0000)]
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
Stephen Hines [Sat, 23 Jan 2016 01:04:12 +0000 (01:04 +0000)]
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.
Stephen Hines [Fri, 22 Jan 2016 23:28:16 +0000 (23:28 +0000)]
Merge "Add an RS_CLANG variable as well for RenderScript."
am:
adad19674c
* commit '
adad19674cfd7c38b16f2c2bd0c5bdf956157c6c':
Add an RS_CLANG variable as well for RenderScript.
Stephen Hines [Fri, 22 Jan 2016 23:22:44 +0000 (23:22 +0000)]
Merge "Add an RS_CLANG variable as well for RenderScript."
Stephen Hines [Fri, 22 Jan 2016 23:11:34 +0000 (15:11 -0800)]
Add an RS_CLANG variable as well for RenderScript.
Change-Id: I33a73c4c2b19aa17bc18a64c92a86565111de3d0
Stephen Hines [Fri, 22 Jan 2016 21:50:31 +0000 (21:50 +0000)]
Merge "Add clang rules for RS_LLVM_* tools." am:
4ac28d5258
am:
48f0b9fb5a
* commit '
48f0b9fb5a7083b41bb4804059fac194f8b8c1e1':
Add clang rules for RS_LLVM_* tools.
Stephen Hines [Fri, 22 Jan 2016 21:24:40 +0000 (21:24 +0000)]
Merge "Add clang rules for RS_LLVM_* tools."
am:
4ac28d5258
* commit '
4ac28d5258651c214a8480ad082254fd9c94ed55':
Add clang rules for RS_LLVM_* tools.
Stephen Hines [Fri, 22 Jan 2016 21:20:19 +0000 (21:20 +0000)]
Merge "Add clang rules for RS_LLVM_* tools."
Josh Gao [Fri, 22 Jan 2016 19:24:59 +0000 (11:24 -0800)]
Error out if MALLOC_IMPL is defined.
Bug: http://b/
26390299
Change-Id: Icd3ce6853c8207b1a9ce1f9d546a61d5b113f15a
Alex Klyubin [Fri, 22 Jan 2016 19:14:52 +0000 (19:14 +0000)]
Merge "resolve merge conflicts of
bb3d77ba95 to "
Alex Klyubin [Fri, 22 Jan 2016 19:05:03 +0000 (11:05 -0800)]
resolve merge conflicts of
bb3d77ba95 to master.
Change-Id: Ib69e2a457c416b4da94fb76c231120632d47a07a
Neil Fuller [Fri, 22 Jan 2016 19:04:46 +0000 (19:04 +0000)]
Merge "Doclava template changes associated with default methods"
Tao Bao [Fri, 22 Jan 2016 18:53:29 +0000 (18:53 +0000)]
Merge "Generate OTA packages for A/B update." am:
bc6a66826a
am:
4f3015f4a2
* commit '
4f3015f4a286d711e0d2c6178e60462d146570b3':
Generate OTA packages for A/B update.
Alex Klyubin [Fri, 22 Jan 2016 18:53:23 +0000 (18:53 +0000)]
Merge "Make signapk sign using APK Signature Scheme v2." am:
b86b5344a6
am:
eafce4eefd
* commit '
eafce4eefdbf83b1cc6fd134e4916650c5768c9b':
Make signapk sign using APK Signature Scheme v2.
Tao Bao [Fri, 22 Jan 2016 18:53:15 +0000 (18:53 +0000)]
Merge "CleanSpec: Clean up /recovery/root/sdcard." am:
b69d3b28a5
am:
8994f9ca38
* commit '
8994f9ca383fa887e570f54ea78bfeb9fdd39b2e':
CleanSpec: Clean up $(PRODUCT_OUT)/recovery/root/sdcard.
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
Change-Id: I1dfc014b3c6218cc1f7716a760d73c9b915f2d97
James Hawkins [Fri, 22 Jan 2016 18:28:19 +0000 (18:28 +0000)]
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.
James Hawkins [Fri, 22 Jan 2016 18:09:05 +0000 (18:09 +0000)]
Merge "bootstat: Add bootstat to the embedded target to support logging boot time across devices."
Tao Bao [Fri, 22 Jan 2016 17:27:52 +0000 (17:27 +0000)]
Merge "Generate OTA packages for A/B update."
am:
bc6a66826a
* commit '
bc6a66826a56607c2e6a02f70b21e9faa0793719':
Generate OTA packages for A/B update.
Tao Bao [Fri, 22 Jan 2016 17:23:28 +0000 (17:23 +0000)]
Merge "Generate OTA packages for A/B update."
Stephen Hines [Fri, 22 Jan 2016 07:50:53 +0000 (23:50 -0800)]
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
Alex Klyubin [Fri, 22 Jan 2016 04:12:30 +0000 (04:12 +0000)]
Merge "Make signapk sign using APK Signature Scheme v2."
am:
b86b5344a6
* commit '
b86b5344a6b7703bfa36a203f34ca3a117051587':
Make signapk sign using APK Signature Scheme v2.
Alex Klyubin [Fri, 22 Jan 2016 04:07:45 +0000 (04:07 +0000)]
Merge "Make signapk sign using APK Signature Scheme v2."
Tao Bao [Fri, 22 Jan 2016 01:33:03 +0000 (01:33 +0000)]
Merge "CleanSpec: Clean up /recovery/root/sdcard."
am:
b69d3b28a5
* commit '
b69d3b28a5a00050d946921a7e14b5eae203ebac':
CleanSpec: Clean up $(PRODUCT_OUT)/recovery/root/sdcard.
Tao Bao [Fri, 22 Jan 2016 01:28:30 +0000 (01:28 +0000)]
Merge "CleanSpec: Clean up $(PRODUCT_OUT)/recovery/root/sdcard."
Tao Bao [Fri, 22 Jan 2016 01:12:59 +0000 (17:12 -0800)]
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
3f56a330412b56212acc5a9ed19b747c8943b7f2
Change-Id: Iff62ed55eb2782ba3e1e9b6de39a691de2427384
Colin Cross [Fri, 22 Jan 2016 00:16:17 +0000 (00:16 +0000)]
Merge "Set flag when using sdk tools in place" am:
41ee5fc07a
am:
11a87113ef
* commit '
11a87113ef232c4f615a4c8df74dc28da17bec1e':
Set flag when using sdk tools in place
Colin Cross [Fri, 22 Jan 2016 00:04:05 +0000 (00:04 +0000)]
Merge "Set flag when using sdk tools in place"
am:
41ee5fc07a
* commit '
41ee5fc07adf81348a807c2de8d4460598a38fa4':
Set flag when using sdk tools in place
James Hawkins [Thu, 21 Jan 2016 23:39:45 +0000 (15:39 -0800)]
bootstat: Add bootstat to the embedded target to support logging boot
time across devices.
Bug:
21724738
Change-Id: I165e8597103ea235a0826e321a1658823c4b4664
Colin Cross [Thu, 21 Jan 2016 23:36:26 +0000 (23:36 +0000)]
Merge "Set flag when using sdk tools in place"
Tao Bao [Thu, 21 Jan 2016 23:25:48 +0000 (23:25 +0000)]
Merge "Makefile: Fix the location for payload signing key." am:
27a1201989
am:
3ea04365dc
* commit '
3ea04365dc39c14d458d69eb3954cbf099654681':
Makefile: Fix the location for payload signing key.
Dan Willemsen [Thu, 21 Jan 2016 23:25:34 +0000 (23:25 +0000)]
Merge "Pass the arm/thumb cflags to assembly files" am:
60c9200c1e
am:
537e093fe8
* commit '
537e093fe893e21ecab7aba2a32c99f18f5350b6':
Pass the arm/thumb cflags to assembly files
Tao Bao [Thu, 21 Jan 2016 23:25:19 +0000 (23:25 +0000)]
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.
Tao Bao [Thu, 21 Jan 2016 23:19:16 +0000 (23:19 +0000)]
Merge "Makefile: Fix the location for payload signing key."
am:
27a1201989
* commit '
27a1201989d782af30a30186a05448dbbe3304b8':
Makefile: Fix the location for payload signing key.
Dan Willemsen [Thu, 21 Jan 2016 23:19:02 +0000 (23:19 +0000)]
Merge "Pass the arm/thumb cflags to assembly files"
am:
60c9200c1e
* commit '
60c9200c1ee3f5d983c5f9d9cc1724f6010daca2':
Pass the arm/thumb cflags to assembly files
Tao Bao [Thu, 21 Jan 2016 23:18:50 +0000 (23:18 +0000)]
Merge "Makefile: Add the payload public key into system image."
am:
b49d05e72e
* commit '
b49d05e72e03c4d51c81ec8fcedd463ea5b0e28f':
Makefile: Add the payload public key into system image.
Tao Bao [Thu, 21 Jan 2016 22:37:46 +0000 (22:37 +0000)]
Merge "Makefile: Fix the location for payload signing key."
Tao Bao [Thu, 21 Jan 2016 22:28:50 +0000 (14:28 -0800)]
Makefile: Fix the location for payload signing key.
CL in [1] put it in a wrong path.
[1] commit
38812d684b73b4e2bbd2a4277fd9b0d8b3c7a810
Bug:
25715402
Change-Id: I01a105888844011eee083d5f4d694223599fa067
Dan Willemsen [Thu, 21 Jan 2016 22:31:11 +0000 (22:31 +0000)]
Merge "Pass the arm/thumb cflags to assembly files"
Tao Bao [Thu, 21 Jan 2016 22:21:31 +0000 (22:21 +0000)]
Merge "Makefile: Add the payload public key into system image."
Christopher Wiley [Thu, 21 Jan 2016 18:29:25 +0000 (18:29 +0000)]
Merge "Separate aidl dependencies from compiler dependencies" am:
8edda3afdf
am:
cfd817d058
* commit '
cfd817d058994ebda3b98db4e8113752753d422e':
Separate aidl dependencies from compiler dependencies
Christopher Wiley [Thu, 21 Jan 2016 18:29:15 +0000 (18:29 +0000)]
Merge "Keep aidl generated C++ inside the generated folder" am:
11feb8b075
am:
7c52b2d878
* commit '
7c52b2d878e6234cb6e36942c87c438fa1e80240':
Keep aidl generated C++ inside the generated folder
Christopher Wiley [Thu, 21 Jan 2016 18:27:02 +0000 (18:27 +0000)]
Merge "Separate aidl dependencies from compiler dependencies"
am:
8edda3afdf
* commit '
8edda3afdf1bf3327706d89a5b4b5ce53feedbe5':
Separate aidl dependencies from compiler dependencies
Christopher Wiley [Thu, 21 Jan 2016 18:26:54 +0000 (18:26 +0000)]
Merge "Keep aidl generated C++ inside the generated folder"
am:
11feb8b075
* commit '
11feb8b075ce48fc4b6386049a666a5e888247f8':
Keep aidl generated C++ inside the generated folder
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: I048393e0971d0d6559dbd69ea902754c6c7cab14
Christopher Wiley [Thu, 21 Jan 2016 18:19:05 +0000 (18:19 +0000)]
Merge "Separate aidl dependencies from compiler dependencies"
Christopher Wiley [Thu, 21 Jan 2016 18:17:29 +0000 (18:17 +0000)]
Merge "Keep aidl generated C++ inside the generated folder"
Narayan Kamath [Thu, 21 Jan 2016 10:15:40 +0000 (10:15 +0000)]
Merge "Make a confusing error message clearer."
Tao Bao [Thu, 21 Jan 2016 04:58:20 +0000 (20:58 -0800)]
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
Alex Klyubin [Thu, 21 Jan 2016 01:42:35 +0000 (01:42 +0000)]
Merge "Command-line flag to disable signing with APK Signature Scheme v2." am:
3cc3605010
am:
aafc1e9665
* commit '
aafc1e9665a3392891d54a22da8a5b7b292cfddb':
Command-line flag to disable signing with APK Signature Scheme v2.