OSDN Git Service
The Android Automerger [Thu, 28 Jan 2016 08:04:14 +0000 (00:04 -0800)]
"NRC28"
The Android Automerger [Thu, 28 Jan 2016 08:00:32 +0000 (00:00 -0800)]
merge in nyc-release history after reset to master
Chien-Yu Chen [Thu, 28 Jan 2016 02:04:35 +0000 (02:04 +0000)]
Merge "Add cameraserver process"
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"
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
The Android Automerger [Mon, 25 Jan 2016 21:56:26 +0000 (13:56 -0800)]
"NRC25B"
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
The Android Automerger [Mon, 25 Jan 2016 08:01:01 +0000 (00:01 -0800)]
"NRC25"
The Android Automerger [Mon, 25 Jan 2016 08:00:10 +0000 (00:00 -0800)]
merge in nyc-release history after reset to master
The Android Automerger [Sun, 24 Jan 2016 08:04:25 +0000 (00:04 -0800)]
"NRC24"
The Android Automerger [Sun, 24 Jan 2016 08:00:33 +0000 (00:00 -0800)]
merge in nyc-release history after reset to master
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
Marco Nelissen [Wed, 16 Dec 2015 23:48:43 +0000 (15:48 -0800)]
Add mediacodec binary for codec process
Bug:
22775369
Change-Id: Ia0632d8329cf16c6435df87bf208e2750bb31542
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."
The Android Automerger [Fri, 22 Jan 2016 19:40:36 +0000 (11:40 -0800)]
"NRC21C"
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."