OSDN Git Service
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."
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
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.""
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: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: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: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: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
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"
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)
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: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
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: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."
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: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: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: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 [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: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
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: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: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: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"
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:28:23 +0000 (01:28 +0000)]
Merge "Command-line flag to disable signing with APK Signature Scheme v2."
am:
3cc3605010
* commit '
3cc36050109fa1f310f11fca980ac415cb58bee7':
Command-line flag to disable signing with APK Signature Scheme v2.
Colin Cross [Thu, 21 Jan 2016 00:08:49 +0000 (16:08 -0800)]
Set flag when using sdk tools in place
New version of build/ execute the tools from prebuilts/sdk/tools in
place, old versions copy them to $(HOST_OUT_EXECUTABLES). build/ and
prebuilts/sdk often use mixed versions, set a flag that
prebuilts/sdk/tools/Android.mk can use to determine when it is using an
old build/ directory.
Change-Id: Iad2f96c35203fd3b0976946d229bfa8ab4acb150
Alex Klyubin [Wed, 2 Dec 2015 02:12:09 +0000 (18:12 -0800)]
Make signapk sign using APK Signature Scheme v2.
APKs are now signed with the usual JAR signature scheme and then
with the APK Signature Scheme v2.
APK Signature Scheme v2 is a whole-file signature scheme which aims
to protect every single bit of the APK as opposed to the JAR signature
scheme which protects only the names and uncompressed contents of ZIP
entries.
The two main goals of APK Signature Scheme v2 are:
1. Detect any unauthorized modifications to the APK. This is achieved
by making the signature cover every byte of the APK being signed.
2. Enable much faster signature and integrity verification. This is
achieved by requiring only a minimal amount of APK parsing before
the signature is verified, thus completely bypassing ZIP entry
decompression and by making integrity verification parallelizable
by employing a hash tree.
Bug:
25794543
Change-Id: I275d2a6d0a98504891985309b9dfff2e0e44b878
Alex Klyubin [Wed, 20 Jan 2016 21:02:29 +0000 (21:02 +0000)]
Merge "Command-line flag to disable signing with APK Signature Scheme v2."
Alex Klyubin [Wed, 20 Jan 2016 20:51:28 +0000 (12:51 -0800)]
Command-line flag to disable signing with APK Signature Scheme v2.
This change makes signapk not reject the --disable-v2 command-line
flag which may be used by build scripts in some branches. The flag
is currently ignored.
This change is landed separately from the actual support for APK
Signature Scheme v2 because of unbundled branches which use prebuilt
versions of signapk.
Bug:
25794543
Change-Id: I900966244b8b6296b1f443bf98830cc7f7cc81a8
Christopher Wiley [Tue, 19 Jan 2016 17:26:10 +0000 (09:26 -0800)]
Separate aidl dependencies from compiler dependencies
Both aidl and clang/gcc were putting their dependencies in the same
place. Move aidl's dependencies to a file ending with .aidl.P rather
than the compiler's .P.
While here, inform kati that we have these special dep files.
Bug:
26409006
Test: Rebuild, note both files being generated
Change-Id: I29d2eea822235d60713c2059f3a314e475eb5aa3
Christopher Wiley [Tue, 19 Jan 2016 16:58:35 +0000 (08:58 -0800)]
Keep aidl generated C++ inside the generated folder
Transform ../ to dotdot/ for C++ generateds from .aidl source files.
This forces us to use one layer of indirection to calculate the build
rules for .aidl files, since we can no longer use a pattern rule.
This was tested by modifying system/tools/aidl's Android.mk to refer to
its .aidl files by going up two directories and then repeating the
directories again. When I print the build rules with $(info) I see that
dotdot/ appears in appropriate places (C++ paths, but not .aidl paths).
Bug:
26407018
Test: Described above.
Change-Id: I397c9d10408c0c66d8b5a247a1f34eb4bf4f74ce
Chih-hung Hsieh [Tue, 19 Jan 2016 23:57:53 +0000 (23:57 +0000)]
Merge "Set USE_CLANG_PLATFORM_BUILD to default true."
am:
c36a9760e1
* commit '
c36a9760e17bc0ce1cc815572886e640bb0ded18':
Set USE_CLANG_PLATFORM_BUILD to default true.
Tao Bao [Thu, 7 Jan 2016 21:03:56 +0000 (13:03 -0800)]
Generate OTA packages for A/B update.
It calls brillo_update_payload to generate the payload for A/B update.
And packages the payload according to Android OTA package format.
Note that it only supports generating full/incremental OTAs with this
CL. Signing for release may not work properly at the moment.
Bug:
25715402
Change-Id: I4ac8505bacad28a572a9320dc8b52dd0f1ce47f5
Chih-hung Hsieh [Tue, 19 Jan 2016 23:40:56 +0000 (23:40 +0000)]
Merge "Set USE_CLANG_PLATFORM_BUILD to default true."
Tao Bao [Tue, 19 Jan 2016 23:04:12 +0000 (23:04 +0000)]
Merge "Makefile: Pack brillo_update_payload and shflags into otatools."
am:
4dc400e753
* commit '
4dc400e75336d0e09f509c9fd100c49cfb42ed5c':
Makefile: Pack brillo_update_payload and shflags into otatools.
Tao Bao [Tue, 19 Jan 2016 22:57:25 +0000 (22:57 +0000)]
Merge "Makefile: Pack brillo_update_payload and shflags into otatools."
Tao Bao [Tue, 19 Jan 2016 22:47:17 +0000 (14:47 -0800)]
Makefile: Pack brillo_update_payload and shflags into otatools.
brillo_update_payload and shflags are the scripts to generate A/B OTA
package (payload). Include them into otatools.zip.
brillo_update_payload was already included in previous CL. Move it to
the folder for executables.
Bug:
25715402
Change-Id: Idf9c05767c24c55d058cc30e696f06d4eb5fd53b
Dan Willemsen [Sat, 16 Jan 2016 00:38:46 +0000 (16:38 -0800)]
Pass the arm/thumb cflags to assembly files
This effectively changes the default instruction set of assembly files
from arm to thumb in order to match the default for C/C++.
Change-Id: I8684f144a1195b53b3e0fdd04cacf77f6a131c7e
Chih-Hung Hsieh [Tue, 19 Jan 2016 19:43:44 +0000 (11:43 -0800)]
Set USE_CLANG_PLATFORM_BUILD to default true.
BUG:
26102335
Change-Id: I3b9fa2dfbee361410caf163147945ab448bb8ddf
Neil Fuller [Mon, 18 Jan 2016 19:40:31 +0000 (19:40 +0000)]
Merge "Remove synchronized from the public API docs"
am:
8cb9be66b7
* commit '
8cb9be66b7878478aa61e7b752e3c8b916811299':
Remove synchronized from the public API docs
Neil Fuller [Mon, 18 Jan 2016 19:36:27 +0000 (19:36 +0000)]
Merge "Remove synchronized from the public API docs"
Dan Willemsen [Sat, 16 Jan 2016 20:17:01 +0000 (20:17 +0000)]
Merge "Add -Werror=date-time to target builds"
am:
5c3f812507
* commit '
5c3f812507bd025da2fc3d5fa40e8a278535dff2':
Add -Werror=date-time to target builds
Dan Willemsen [Sat, 16 Jan 2016 20:13:30 +0000 (20:13 +0000)]
Merge "Add -Werror=date-time to target builds"
Tianjie Xu [Fri, 15 Jan 2016 19:21:00 +0000 (19:21 +0000)]
Merge "Fix print error of numbers of blocks"
am:
2acd8a2eef
* commit '
2acd8a2eef88973ce222a4ed90efaa94ede1a30b':
Fix print error of numbers of blocks
Tianjie Xu [Fri, 15 Jan 2016 19:07:22 +0000 (19:07 +0000)]
Merge "Fix print error of numbers of blocks"
Neil Fuller [Wed, 25 Nov 2015 10:23:17 +0000 (10:23 +0000)]
Remove synchronized from the public API docs
The information is not useful. Javadoc hasn't included this
information for years.
Bug:
25767152
(cherry-picked from commit
a37bdc89b47893f740ab652fe8b58c44e440f334)
Change-Id: Id03a6e383118ab716ce870a1d7a3740656420fe7
Tianjie Xu [Thu, 14 Jan 2016 22:12:26 +0000 (14:12 -0800)]
Fix print error of numbers of blocks
The total number of blocks to pack as new data was printed incorrectly.
Fix printing.
Change-Id: I6a6bb8dd6682d9c57943ceb1a728995f9529e2fd
Tianjie Xu [Thu, 14 Jan 2016 19:22:39 +0000 (19:22 +0000)]
Merge "Adjust the size limit for splitting large files"
am:
9b2fe7e0b8
* commit '
9b2fe7e0b864a7fd2deae831674d97c72fe29f64':
Adjust the size limit for splitting large files
Tianjie Xu [Thu, 14 Jan 2016 19:17:00 +0000 (19:17 +0000)]
Merge "Adjust the size limit for splitting large files"
Tianjie Xu [Thu, 14 Jan 2016 00:14:10 +0000 (16:14 -0800)]
Adjust the size limit for splitting large files
Modify the number of max blocks per transfer to reduce splitting of
large files during patch generation. This will reduce the size of
final incremental OTA updater package. In specific, the size limit
for each file to transfer is set to 1/8 cachesize instead of a fix
number.
Bug:
26472126
Change-Id: Iffb135e378c4c7a91640f2fc4c40e9e93d1fe4bb
Dan Willemsen [Thu, 14 Jan 2016 02:05:24 +0000 (02:05 +0000)]
Merge "Allow building kati & makeparallel with soong"
am:
77cde9e244
* commit '
77cde9e244de9b043793ef528818de0ffea862e1':
Allow building kati & makeparallel with soong