OSDN Git Service
The Android Automerger [Thu, 25 Feb 2016 22:28:25 +0000 (14:28 -0800)]
"NRC56D"
The Android Automerger [Thu, 25 Feb 2016 19:15:40 +0000 (11:15 -0800)]
"NRC56C"
The Android Automerger [Thu, 25 Feb 2016 15:34:38 +0000 (07:34 -0800)]
"NRC56B"
The Android Automerger [Thu, 25 Feb 2016 15:32:34 +0000 (07:32 -0800)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Thu, 25 Feb 2016 08:03:51 +0000 (00:03 -0800)]
"NRC56"
The Android Automerger [Thu, 25 Feb 2016 08:00:30 +0000 (00:00 -0800)]
merge in nyc-release history after reset to nyc-dev
Alex Light [Wed, 24 Feb 2016 23:34:06 +0000 (23:34 +0000)]
Merge "Mark the cortex-{a7,a53,a53.57} chips as supporting LPAE" into nyc-dev
Alex Light [Wed, 24 Feb 2016 21:08:58 +0000 (13:08 -0800)]
Mark the cortex-{a7,a53,a53.57} chips as supporting LPAE
(cherry picked from commit
bdfeb3e760feb080b449cc58129e5473bda54dec)
Bug:
27340895
Bug:
27324856
Change-Id: Id3994c6d334c8bb673fc3849550f591136a8dd6a
The Android Automerger [Wed, 24 Feb 2016 22:14:41 +0000 (14:14 -0800)]
"NRC55B"
Dan Willemsen [Wed, 24 Feb 2016 18:31:42 +0000 (18:31 +0000)]
Merge "Warn more clearly when there are duplicate copied headers" into nyc-dev
Neil Fuller [Wed, 24 Feb 2016 10:15:14 +0000 (10:15 +0000)]
Merge "Revert "Revert "Change the default for LOCAL_JAVA_LANGUAGE_VERSION from 1.7 to 1.8""" into nyc-dev
The Android Automerger [Wed, 24 Feb 2016 08:03:48 +0000 (00:03 -0800)]
"NRC55"
The Android Automerger [Wed, 24 Feb 2016 08:00:42 +0000 (00:00 -0800)]
merge in nyc-release history after reset to nyc-dev
Ying Wang [Wed, 24 Feb 2016 05:49:25 +0000 (05:49 +0000)]
Allow to build against Mac OS X SDK 10.11. am:
7f7c698959 am:
773b017ee9 am:
e511a07677
am:
6a95943887
* commit '
6a95943887c1ad35bcd059119ac506741c172048':
Allow to build against Mac OS X SDK 10.11.
Ying Wang [Wed, 24 Feb 2016 05:49:13 +0000 (05:49 +0000)]
Update mac_sdk_versions_supported. am:
8df3355f64 am:
0954a9d91f am:
2114b48a14
am:
938722577b -s ours
* commit '
938722577bb7005dd321534ca29de2ccf71869e7':
Update mac_sdk_versions_supported.
Ying Wang [Wed, 24 Feb 2016 03:01:39 +0000 (03:01 +0000)]
Allow to build against Mac OS X SDK 10.11. am:
7f7c698959 am:
773b017ee9
am:
e511a07677
* commit '
e511a07677dfc8f622f5fa8863b453aad7ffcdea':
Allow to build against Mac OS X SDK 10.11.
Ying Wang [Wed, 24 Feb 2016 03:01:22 +0000 (03:01 +0000)]
Update mac_sdk_versions_supported. am:
8df3355f64 am:
0954a9d91f
am:
2114b48a14
* commit '
2114b48a14c6108d2d4d3207c2eb87d2d72ab76d':
Update mac_sdk_versions_supported.
Ying Wang [Wed, 24 Feb 2016 02:55:16 +0000 (02:55 +0000)]
Allow to build against Mac OS X SDK 10.11. am:
7f7c698959
am:
773b017ee9
* commit '
773b017ee96ace4e4bdc176dd59fc14c979736ef':
Allow to build against Mac OS X SDK 10.11.
Ying Wang [Wed, 24 Feb 2016 02:54:51 +0000 (02:54 +0000)]
Update mac_sdk_versions_supported. am:
8df3355f64
am:
0954a9d91f
* commit '
0954a9d91f8f68133150a39afc364e1ad091a19b':
Update mac_sdk_versions_supported.
Ying Wang [Wed, 24 Feb 2016 02:46:46 +0000 (02:46 +0000)]
Allow to build against Mac OS X SDK 10.11.
am:
7f7c698959
* commit '
7f7c6989590bd9395e8ebf3a01b5b4033c89d7d1':
Allow to build against Mac OS X SDK 10.11.
Ying Wang [Wed, 24 Feb 2016 02:46:36 +0000 (02:46 +0000)]
Update mac_sdk_versions_supported.
am:
8df3355f64
* commit '
8df3355f64119adb9ca71c9f2cc9b51afb61c65a':
Update mac_sdk_versions_supported.
Ying Wang [Wed, 14 Oct 2015 01:00:45 +0000 (18:00 -0700)]
Allow to build against Mac OS X SDK 10.11.
Bug:
24739158
Change-Id: I7c57e141dd02a0d2de5a7a1ccbc72ffe422a8d6f
Ying Wang [Wed, 29 Jul 2015 23:35:40 +0000 (16:35 -0700)]
Update mac_sdk_versions_supported.
Now we requires Mac OS X SDK version at least 10.8.
Also removed the unnecessary sort call in getting
mac_sdk_versions_installed.
Lexical sort doesn't make sense when 10.10 is added to that list.
Actually the next makefile line makes sure we always get the first
match in $(mac_sdk_versions_supported):
mac_sdk_version := $(firstword $(filter $(mac_sdk_versions_installed),
$(mac_sdk_versions_supported)))
Bug:
22825165
Change-Id: I4bfafabb11f94b66704d4799fe61fe3f16429538
bohu [Wed, 24 Feb 2016 00:28:26 +0000 (16:28 -0800)]
Emulator: Add fingerprint permission to sdk system images
Since N, the android.hardware.fingerprint.xml is required.
bug:
27324642
Change-Id: Ib2f77f68bb4b9a68e1e77311fae3ce2a30bc37cb
Dan Willemsen [Tue, 23 Feb 2016 21:40:07 +0000 (13:40 -0800)]
Warn more clearly when there are duplicate copied headers
When more than one makefile tries to copy a header to the same
destination, the warning is not clear, and hard to track down and assign
blame:
build/core/copy_headers.mk:15: warning: ignoring old commands for target `out/target/product/bullhead/obj/include/qcom/display/copybit.h'
With this change, the same behavior is kept, but the warning message is
more descriptive, and contains the offending Android.mk files:
build/core/Makefile:54: Duplicate header copy: out/target/product/bullhead/obj/include/qcom/display/copybit.h
build/core/Makefile:54: Defined in: hardware/qcom/display/msm8994/libcopybit/Android.mk hardware/qcom/display/msm8994/libcopybit/Android.mk
In this case, a $(CLEAR_VARS) is missing, so the same Android.mk file is
copying the same headers twice.
Bug:
27302058
Change-Id: Icf8f580ae71a78741db21c1d8f3213424459e637
(cherry picked from commit
6f60f020d781d9a93786616039323e9f25e02c0b)
Bo Hu [Tue, 23 Feb 2016 21:46:31 +0000 (21:46 +0000)]
Merge "emulator: allows surfaceflinger to change qemu.gles value" into nyc-dev
The Android Automerger [Tue, 23 Feb 2016 21:07:51 +0000 (13:07 -0800)]
"NRC54B"
Prathmesh Prabhu [Tue, 23 Feb 2016 20:32:28 +0000 (12:32 -0800)]
Generic x86_64: Bump system image partition size to 1.75 GB.
BUG=b.android.com/201662
Change-Id: I3b13082d73a3e1c9f49cb9158d2423dc580a8c75
Ying Wang [Mon, 22 Feb 2016 23:54:27 +0000 (15:54 -0800)]
Make sure my_src_jar is set up properly for host prebuilt jar
Make sure my_src_jar is set up properly for host prebuilt jar when we
need to generate host .jack for host dalvik java libraries.
(cherry picked from commit
86e74b96fcc46d6d6c3758b13cca755c12e7de8a)
Change-Id: I79393bc416fafb6d9cd28b12070a58ae5731587d
Neil Fuller [Tue, 23 Feb 2016 11:17:32 +0000 (11:17 +0000)]
Revert "Revert "Change the default for LOCAL_JAVA_LANGUAGE_VERSION from 1.7 to 1.8""
This reverts commit
799d603029701fd565538ed7d09be3cdf34dded9.
Neil Fuller [Tue, 23 Feb 2016 10:24:39 +0000 (10:24 +0000)]
Merge "Revert "Change the default for LOCAL_JAVA_LANGUAGE_VERSION from 1.7 to 1.8"" into nyc-dev
Neil Fuller [Tue, 23 Feb 2016 10:18:42 +0000 (10:18 +0000)]
Revert "Change the default for LOCAL_JAVA_LANGUAGE_VERSION from 1.7 to 1.8"
Reverting: broke the messaging app due to a recent change
there (commit
280a2fbe41f24eed11fcf5e13b803de17525b261).
This reverts commit
dfcd9124880528a7bfbf9ba361b1a2040035ca06.
Change-Id: I055f35c0a7400ab2887c91d017eebaed1adaf972
Neil Fuller [Tue, 23 Feb 2016 09:47:35 +0000 (09:47 +0000)]
Merge "Change the default for LOCAL_JAVA_LANGUAGE_VERSION from 1.7 to 1.8" into nyc-dev
The Android Automerger [Tue, 23 Feb 2016 08:04:26 +0000 (00:04 -0800)]
"NRC54"
The Android Automerger [Tue, 23 Feb 2016 08:00:36 +0000 (00:00 -0800)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Tue, 23 Feb 2016 00:25:13 +0000 (16:25 -0800)]
"NRC53C"
The Android Automerger [Mon, 22 Feb 2016 22:18:57 +0000 (14:18 -0800)]
"NRC53B"
Sami Tolvanen [Wed, 10 Feb 2016 18:41:26 +0000 (10:41 -0800)]
Clear logd intermediates
Needed by changes from
Idcdc5bff133f13c1267f0ec0a75cc8cf1ddbda0d
Bug:
26902605
Change-Id: Id3ca7889ede30b54b7af73dd50653ca1a20d59aa
(cherry picked from commit
d7da0ffb20a421a5c9c90084b30e8f665d165f5b)
Yohann Roussel [Mon, 22 Feb 2016 13:04:51 +0000 (13:04 +0000)]
Merge "Add support for testing obfuscated app with Jack" into nyc-dev
Calin Juravle [Mon, 22 Feb 2016 11:41:59 +0000 (11:41 +0000)]
Merge "Add profman to the build scripts" into nyc-dev
Yohann Roussel [Tue, 3 Nov 2015 17:33:21 +0000 (18:33 +0100)]
Add support for testing obfuscated app with Jack
Bug:
17481317
Bug:
27215871
Bug:
27215868
(cherry picked from commit
505dafb03bdbd9351b5eb8565ac4d8195592ff9a)
Change-Id: Ia12fb92585cfcc595eef6cd096d27e779e596f7d
The Android Automerger [Mon, 22 Feb 2016 08:01:19 +0000 (00:01 -0800)]
"NRC53"
The Android Automerger [Mon, 22 Feb 2016 08:00:10 +0000 (00:00 -0800)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Sun, 21 Feb 2016 08:04:11 +0000 (00:04 -0800)]
"NRC52"
The Android Automerger [Sun, 21 Feb 2016 08:00:30 +0000 (00:00 -0800)]
merge in nyc-release history after reset to nyc-dev
bohu [Sat, 20 Feb 2016 01:20:32 +0000 (17:20 -0800)]
emulator: allows surfaceflinger to change qemu.gles value
This is to allow surfaceflinger to always load vendor provided
egl libraries first and fall back to software renderer, and then
set the qemu.gles to correct value reflecting what libraries
are actually used.
bug:
27273457
Change-Id: Ifaca31aa2e562f50baa41fd228df9836bc3b1667
Prathmesh Prabhu [Sat, 20 Feb 2016 01:02:03 +0000 (01:02 +0000)]
Merge "Allow smooth upgrade of AVD's from older API's." into nyc-dev
Lingfeng Yang [Fri, 5 Feb 2016 18:40:21 +0000 (10:40 -0800)]
Allow smooth upgrade of AVD's from older API's.
If we are using an old API for the emulator
(API 19 for example) and then upgrade the AVD
to API 23 through the AVD settings, we get a bunch
of crashes in the TelephonyProvider,
as it is looking for a file that does not exist
that concerns upgrading from old "apn"'s.
This CL adds this file to the files to be copied
to /etc in the system image.
BUG: b.android.com/200390
BUG=
27273457
RELEASE NOTE: Fixed telephony service crashes on startup when upgrading from an old API.
Change-Id: I227713880bf20541c759aab588c00197ac7aebfd
(cherry picked from commit
e5083159401edf1df5109b56d1aedbbb739584e6)
The Android Automerger [Fri, 19 Feb 2016 23:46:58 +0000 (15:46 -0800)]
"NRC50"
The Android Automerger [Fri, 19 Feb 2016 23:43:11 +0000 (15:43 -0800)]
merge in nyc-release history after reset to nyc-dev
Bjoern Johansson [Wed, 18 Nov 2015 18:04:21 +0000 (10:04 -0800)]
Explicitly use messaging app in SDK phone builds
This change explicitly includes only the messaging app instead of all of
aosp_base_telephony. This fixes the issue where on initial boot the user
was prompted to select a Home app. This happened because the
aosp_base_telephony makefile includes other makefiles that in turn add
the package Provision which has an activity with an intent filter for
handling HOME. SdkSetup already had such an activity so with two choices
it was left to the user to decide which one to use.
BUG=
27273457
Change-Id: I42e77b892ce235a5fa858561325ae37973cfb0cd
(cherry picked from commit
12de252f451b34cfa67f7256027dad84dcfd984d)
Zach Jang [Fri, 19 Feb 2016 22:34:03 +0000 (22:34 +0000)]
Updating security string patch to 2016-04-01 am:
e182d2a95c am:
054bbb9766 am:
7e6a1633c8 am:
eb651e2e45 am:
3f53b385de am:
fc30358acb
am:
c4d9b64a68
* commit '
c4d9b64a686dbfbc8e2f91d96203a7328249f5dd':
Updating security string patch to 2016-04-01
Zach Jang [Fri, 19 Feb 2016 22:28:35 +0000 (22:28 +0000)]
Updating security string patch to 2016-04-01 am:
e182d2a95c am:
054bbb9766 am:
7e6a1633c8 am:
eb651e2e45 am:
3f53b385de
am:
fc30358acb
* commit '
fc30358acbfaa41e2c3282832ceb3607a0c2fcb9':
Updating security string patch to 2016-04-01
Zach Jang [Fri, 19 Feb 2016 22:22:57 +0000 (22:22 +0000)]
Updating security string patch to 2016-04-01 am:
e182d2a95c am:
054bbb9766 am:
7e6a1633c8 am:
eb651e2e45
am:
3f53b385de
* commit '
3f53b385dec6b45d0e4d07a29ce43b3c510b1d10':
Updating security string patch to 2016-04-01
Zach Jang [Fri, 19 Feb 2016 22:17:28 +0000 (22:17 +0000)]
Updating security string patch to 2016-04-01 am:
e182d2a95c am:
054bbb9766 am:
7e6a1633c8
am:
eb651e2e45
* commit '
eb651e2e450f1756e6acea4f570379af7d146920':
Updating security string patch to 2016-04-01
Zach Jang [Fri, 19 Feb 2016 22:11:32 +0000 (22:11 +0000)]
Updating security string patch to 2016-04-01 am:
e182d2a95c am:
054bbb9766
am:
7e6a1633c8
* commit '
7e6a1633c8ebb622271020cbb0aedae355e6501a':
Updating security string patch to 2016-04-01
Zach Jang [Fri, 19 Feb 2016 22:06:14 +0000 (22:06 +0000)]
Updating security string patch to 2016-04-01 am:
e182d2a95c
am:
054bbb9766
* commit '
054bbb9766312a2caefd5375341d49074a6d25bf':
Updating security string patch to 2016-04-01
Zach Jang [Fri, 19 Feb 2016 22:00:21 +0000 (22:00 +0000)]
Updating security string patch to 2016-04-01
am:
e182d2a95c
* commit '
e182d2a95c52e37d2a6f924c8ff386b52b08a0c9':
Updating security string patch to 2016-04-01
Zach Jang [Fri, 19 Feb 2016 21:50:29 +0000 (13:50 -0800)]
Updating security string patch to 2016-04-01
b/
27272697
Change-Id: I99c2c892a21f4c36226ea5f8d94689d6218ccf7e
The Android Automerger [Fri, 19 Feb 2016 17:49:09 +0000 (09:49 -0800)]
"NRC49C"
Calin Juravle [Fri, 19 Feb 2016 16:54:20 +0000 (16:54 +0000)]
Add profman to the build scripts
Bug:
26719109
Bug:
26563023
Change-Id: I91e4baa0102362035d9a73dcfd5bc4645906aae1
dcashman [Thu, 18 Feb 2016 22:07:44 +0000 (14:07 -0800)]
Label ranchu block devices.
Address the following denials:
avc: denied { getattr } for pid=1166 comm="e2fsck" path="/dev/block/vdc" dev="tmpfs" ino=2880 scontext=u:r:fsck:s0 tcontext=u:object_r:block_device:s0 tclass=blk_file permissive=0
avc: denied { read write } for pid=1166 comm="e2fsck" name="vdc" dev="tmpfs" ino=2880 scontext=u:r:fsck:s0 tcontext=u:object_r:block_device:s0 tclass=blk_file permissive=0
Bug:
27224003
Change-Id: I4792420822d238e6ad1bf757634c924b95150515
Stephen Hines [Fri, 19 Feb 2016 03:35:15 +0000 (03:35 +0000)]
Merge "Define a class for renderscript bitcode files" into nyc-dev
bohu [Tue, 1 Dec 2015 19:19:03 +0000 (11:19 -0800)]
Revert "emulator.mk: Add ethernet permission"
ranchu device now has gsm working properly, remove ethernet.
This reverts commit
9dcb26902571b6d8aa1a41e28be6fb87fd483425.
(cherry picked from commit
58d066f7ccb65cc1f2fc69aff5e95fbfc7f5f0f7)
Change-Id: I05ced00f7e24cb2af6654fc38d71d63453ce4944
Dan Willemsen [Sat, 13 Feb 2016 08:19:40 +0000 (00:19 -0800)]
Define a class for renderscript bitcode files
These have been using SHARED_LIBRARIES, but aren't elf shared libraries.
Continue installing them to /system/lib[64], but do not apply any other
normal shared library logic to them.
(cherry picked from commit
c6e194ffadc2b2c83daed3011d6afa1764244499)
Change-Id: I0041650af92cd8063ca33215010d5eff514a89bc
Chaoren Lin [Wed, 18 Nov 2015 02:55:33 +0000 (18:55 -0800)]
emulator: Include the ranchu gps library
Change-Id: I45b8bec7739b42744766852b68580b01b4ce26a0
(cherry picked from commit
b8b6638dd0183c68e12ed88f1a4cbdce84c09a15)
Prathmesh Prabhu [Fri, 19 Feb 2016 00:39:05 +0000 (00:39 +0000)]
Merge "Add camera.ranchu.* to target/product/emulator.mk" into nyc-dev
The Android Automerger [Thu, 18 Feb 2016 19:29:45 +0000 (11:29 -0800)]
"NRC49B"
The Android Automerger [Thu, 18 Feb 2016 08:03:03 +0000 (00:03 -0800)]
"NRC49"
The Android Automerger [Thu, 18 Feb 2016 08:00:33 +0000 (00:00 -0800)]
merge in nyc-release history after reset to nyc-dev
Alex Klyubin [Thu, 18 Feb 2016 02:03:32 +0000 (02:03 +0000)]
Merge "Switch to production constant for v2 signing scheme ID." into nyc-dev
The Android Automerger [Thu, 18 Feb 2016 00:38:45 +0000 (16:38 -0800)]
"NRC48C"
Lingfeng Yang [Tue, 17 Nov 2015 23:42:23 +0000 (15:42 -0800)]
Add camera.ranchu.* to target/product/emulator.mk
This is for QEMU2 camera support in
the new emulator.
Change-Id: I036773719eff97619594e9d9ac161c10b5e218b5
(cherry picked from commit
6a3bbdce10aae72727d97ab09d90c967cfd51b9c)
The Android Automerger [Wed, 17 Feb 2016 21:16:30 +0000 (13:16 -0800)]
"NRC48B"
Ying Wang [Tue, 16 Feb 2016 23:42:26 +0000 (15:42 -0800)]
Use LOCAL_COMPATIBILITY_SUPPORT_FILES relative to $(TOP).
So that you can have LOCAL_COMPATIBILITY_SUPPORT_FILES generated in the
out directory.
Change-Id: I3e011fc3db5de170f7befcb12841d230283671a6
(cherry picked from commit
c3e4b2f390301ffd86a8773d6fb5336b71564dad)
Alex Klyubin [Tue, 16 Feb 2016 20:42:37 +0000 (12:42 -0800)]
Switch to production constant for v2 signing scheme ID.
Bug:
25794543
(cherry picked from commit
97dd58a071c16c31ab2ce3f29f8fa7e2db7c8b52)
Change-Id: Iefb8eec4e512115bc6a0f5126249e8b2c8b66ddb
The Android Automerger [Wed, 17 Feb 2016 08:03:25 +0000 (00:03 -0800)]
"NRC48"
The Android Automerger [Wed, 17 Feb 2016 08:00:22 +0000 (00:00 -0800)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Tue, 16 Feb 2016 21:15:20 +0000 (13:15 -0800)]
"NRC47C"
Colin Cross [Fri, 5 Feb 2016 08:10:20 +0000 (00:10 -0800)]
makeparallel: unset MAKEFLAGS and MAKELEVEL
makeparallel inherits values for MAKEFLAGS and MAKELEVEL from make
through the environment, but they should not be propagated to the child
process in case the child process tries to run make again.
Bug:
26071246
Change-Id: I4c5df10ea8055cd1f1f61a892d5b1a7acb287bbb
(cherry picked from commit
d8f0d68b78e968c5d014a9bac9463dbcf522b1c5)
The Android Automerger [Tue, 16 Feb 2016 15:04:27 +0000 (07:04 -0800)]
"NRC47B"
Neil Fuller [Tue, 16 Feb 2016 13:04:51 +0000 (13:04 +0000)]
Change the default for LOCAL_JAVA_LANGUAGE_VERSION from 1.7 to 1.8
Modify the compiler flags for Jack and javac.
This has the following effects:
1) Generally, some of the type inference rules changed.
2) javac: bytecode is generated with the v52 major version (not v51)
3) jack: Java 8 language features are supported.
The javac / dx toolchain does not support Java 8 language features.
Bug:
26753820
Change-Id: Icf619f601def30600a42a70815fc8cc754eafa8a
The Android Automerger [Tue, 16 Feb 2016 08:02:08 +0000 (00:02 -0800)]
"NRC47"
The Android Automerger [Tue, 16 Feb 2016 08:00:12 +0000 (00:00 -0800)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Mon, 15 Feb 2016 08:01:25 +0000 (00:01 -0800)]
"NRC46"
The Android Automerger [Mon, 15 Feb 2016 08:00:08 +0000 (00:00 -0800)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Sun, 14 Feb 2016 08:05:53 +0000 (00:05 -0800)]
"NRC45"
The Android Automerger [Sun, 14 Feb 2016 08:00:41 +0000 (00:00 -0800)]
merge in nyc-release history after reset to nyc-dev
Jeff Tinker [Sat, 13 Feb 2016 08:08:33 +0000 (08:08 +0000)]
Merge "Add mediadrm service" into nyc-dev
The Android Automerger [Fri, 12 Feb 2016 22:01:06 +0000 (14:01 -0800)]
"NRC42E"
Jeff Tinker [Fri, 12 Feb 2016 17:00:49 +0000 (09:00 -0800)]
Add mediadrm service
Part of media security hardening
This is an intermediate step toward moving
mediadrm to a new service separate from mediaserver.
This first step allows mediadrmservice to run based
on the system property media.mediadrmservice.enable
so it can be selectively enabled on devices that
support using native_handles for secure buffers.
bug:
22990512
Change-Id: I9fecb59158d560201f64721cdc026f5604cc3945
The Android Automerger [Fri, 12 Feb 2016 16:28:19 +0000 (08:28 -0800)]
"NRC42D"
The Android Automerger [Fri, 12 Feb 2016 02:38:10 +0000 (18:38 -0800)]
"NRC42C"
Aurimas Liutikas [Fri, 12 Feb 2016 02:11:21 +0000 (18:11 -0800)]
Fix 2 unused parameter warnings in zipalign.
ZipFile parameter was not used and therefore can be removed.
Bug:
26936282
Change-Id: Id2b6e693b40571b7e7486304a6effaedc1b3c940
The Android Automerger [Thu, 11 Feb 2016 21:45:54 +0000 (13:45 -0800)]
"NRC42B"
Tao Bao [Thu, 11 Feb 2016 17:50:41 +0000 (09:50 -0800)]
Makefile: Add the missing library in otatools.zip.
With the change in [1], delta_generator now needs
libprotobuf-cpp-lite.so instead of libprotobuf-cpp-lite-rtti.so to
generate A/B payloads.
[1] commit
ab5bd668f6be600a8cceb8772e426c0aa902a5e1
Bug:
27145830
Change-Id: Ib9a93bf0fbe7fa44fc5fb94668d17fa1a2e07b05
Alex Klyubin [Thu, 11 Feb 2016 18:50:12 +0000 (18:50 +0000)]
Merge "Sign APKs using SHA-256 instead of SHA-1 when possible." into nyc-dev
Tao Bao [Thu, 11 Feb 2016 17:50:41 +0000 (09:50 -0800)]
Makefile: Add the missing library in otatools.zip.
With the change in [1], delta_generator now needs
libprotobuf-cpp-lite.so instead of libprotobuf-cpp-lite-rtti.so to
generate A/B payloads.
[1] commit
ab5bd668f6be600a8cceb8772e426c0aa902a5e1
Bug:
27145830
Change-Id: Ib9a93bf0fbe7fa44fc5fb94668d17fa1a2e07b05
Sebastien Hertz [Thu, 11 Feb 2016 09:49:07 +0000 (09:49 +0000)]
Merge "Remove usages of jill.jar, use jack instead" into nyc-dev
The Android Automerger [Thu, 11 Feb 2016 08:04:29 +0000 (00:04 -0800)]
"NRC42"