OSDN Git Service
Prathmesh Prabhu [Fri, 26 Feb 2016 19:17:20 +0000 (11:17 -0800)]
[Emulator] Add comment about including AOSP messaging on AOSP images.
We've gone back and forth on this a few times.
Just state clearly why we're including the AOSP messaging APP here.
BUG:
22097835
Change-Id: I26864ba033f0a211d038fa3526241c869d677217
Keun Soo Yim [Fri, 26 Feb 2016 19:24:09 +0000 (19:24 +0000)]
Merge "build file change for vts to use the existing cts-tradefed infrastructure" into nyc-dev
Lorenzo Colitti [Thu, 25 Feb 2016 06:50:28 +0000 (15:50 +0900)]
Remove dhcpcd from the base target makefile.
Bug:
27192644
Change-Id: Iacac58e05c441dd267c7f09f91dbfcb94f54167c
Tao Bao [Tue, 23 Feb 2016 19:38:39 +0000 (11:38 -0800)]
releasetools: Support generating downgrade incremental OTAs.
Add --downgrade flag to ota_from_target_files.py script. It allows
generating an incremental OTA that updates from a newer build to an
older one (based on timestamp comparison). "post-timestamp" line in the
metadata file will be replaced by "ota-downgrade=yes". A data wipe will
always be enforced, so "ota-wipe=yes" will also be included in the
metadata file.
Bug:
26883782
Change-Id: Iaa05f662d948b7ab632a9fbb7051cc3f8bf68c21
(cherry picked from commit
5d1825664a0fec256fa28d62aadcac96f59a41b2)
Keun Soo Yim [Wed, 24 Feb 2016 23:41:01 +0000 (15:41 -0800)]
build file change for vts to use the existing cts-tradefed infrastructure
Mostly done by stuartscott@
Change-Id: I016405757f39df833d532bc01fd2237e5e961a8a
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
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
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
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
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
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)
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
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
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
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)
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
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)
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
Jeff Tinker [Sat, 13 Feb 2016 08:08:33 +0000 (08:08 +0000)]
Merge "Add mediadrm service" into nyc-dev
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
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
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
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
2cfd1d108c82bdedccb03917e09aa5e677e8fde2)
Change-Id: I38450d07ddc05c705de40313f843beada8db7d98
Sami Tolvanen [Tue, 9 Feb 2016 20:28:58 +0000 (12:28 -0800)]
Fix metadata location when file system doesn't span the partition
Pad the sparse image with a zero fill chunk to correctly position
verity and FEC metadata at the end of the partition.
Bug:
27073791
Change-Id: I9f70d579a42e5007d50e9c02a98a608d2815f0ed
(cherry picked from commit
6a8781a25113b9b49dddc8c8e043c27d5a943e3a)
Alex Klyubin [Wed, 10 Feb 2016 18:15:26 +0000 (18:15 +0000)]
Merge "Use Jan 1 2009 as timestamp in OTA update ZIPs." into nyc-dev
Tao Bao [Thu, 4 Feb 2016 22:26:02 +0000 (14:26 -0800)]
releasetools: Add two new entries to metadata.
Add "ota-required-cache" into the metadata file in an OTA package,
which shows the minimum free space on /cache to apply the update.
Add "ota-type" into the metadata file, which shows the OTA type for
this package (i.e. one of FILE, BLOCK and AB).
Also add the cache free space check into updater-script when generating
block-based incremental OTAs (we only had such lines for file-based
incrementals before).
Bug:
26731903
Change-Id: Id6ff0fc4cdfb1443636b0b3800b0f8bddb5bb1d0
(cherry picked from commit
d8d14bec0d9fb604060634729b4a09c7898d0c9a)
Tao Bao [Wed, 10 Feb 2016 17:36:59 +0000 (17:36 +0000)]
Merge "improve performance of blockimgdiff" into nyc-dev
Doug Zongker [Tue, 9 Feb 2016 16:28:09 +0000 (08:28 -0800)]
improve performance of blockimgdiff
Substantially improves the performance of some BlockImageDiff steps on
large images. GenerateDigraph and AssertSequenceGood are now linear in
the number of blocks in the target image rather than quadratic in the
size of the partition. FindVertexSequence tracks the score of each
vertex, the set of sources and sinks, and maintains a heap for finding
the best vertex to use for the greedy step, instead of repeatedly
re-scanning the set of remaining vertexes.
Change-Id: Ifeea5053d80ef4f06a5aa239c9a1797dd5e47841
(cherry picked from commit
2d2dd1526dba2f9b533c4e0f2655524fea2cca4d)
Yohann Roussel [Tue, 19 Jan 2016 15:08:34 +0000 (16:08 +0100)]
Remove usages of jill.jar, use jack instead
Bug:
27113650
(cherry picked from commit
d0bb7bdf5a62fd1cd0469e0b5d6b54feaecb3cdd)
Change-Id: I218ed2bda032b00bee4c52994a0aadce6d699133
Alex Klyubin [Tue, 9 Feb 2016 21:09:57 +0000 (13:09 -0800)]
Use Jan 1 2009 as timestamp in OTA update ZIPs.
This is a follow-up to
6c41036bcf35fe39162b50d27533f0f3bfab3028 where
I forgot to update a section of OTA update ZIP code.
Bug:
26864066
(cherry picked from commit
f735851fa95ea7b372ab4245a7b583667efb4ea9)
Change-Id: I4f85ce170ac72d13a9c8636414927a295e350458
Marco Nelissen [Wed, 10 Feb 2016 05:46:33 +0000 (05:46 +0000)]
Merge "Add mediacodec binary for codec process" into nyc-dev
Patrick Tjin [Tue, 9 Feb 2016 23:40:38 +0000 (15:40 -0800)]
Add compressor options for squashfs vendor images
Change-Id: I4f9f5d62e24654cb37d436cb73dd5893aed30fa8
Patrick Tjin [Tue, 9 Feb 2016 22:12:47 +0000 (14:12 -0800)]
Allow squashfs for vendor image only
Previously, the squashfs dependencies were included only if
the system image was squashfs. Allow the vendor image trigger
the dependency.
Change-Id: I5b1c513e9c13d83efc3ca6a904f08a91d9cca85f
Marco Nelissen [Wed, 3 Feb 2016 00:13:16 +0000 (16:13 -0800)]
Add mediacodec binary for codec process
Bug:
22775369
Change-Id: If8087fd289968a6eb09a7f038243447ade5dd9d3
Alex Deymo [Fri, 5 Feb 2016 23:43:38 +0000 (23:43 +0000)]
Merge "ota_from_target_files: Include the payload properties." am:
db82f72752
am:
07085a5113
* commit '
07085a511385a9dfa71414735641f96119ec342c':
ota_from_target_files: Include the payload properties.
Alex Deymo [Fri, 5 Feb 2016 23:16:47 +0000 (23:16 +0000)]
Merge "ota_from_target_files: Include the payload properties."
am:
db82f72752
* commit '
db82f72752532bf2b98103171b3d7cd8405b88e4':
ota_from_target_files: Include the payload properties.
Alex Deymo [Fri, 5 Feb 2016 23:11:18 +0000 (23:11 +0000)]
Merge "ota_from_target_files: Include the payload properties."
Dan Willemsen [Fri, 5 Feb 2016 18:20:34 +0000 (18:20 +0000)]
Merge "Fix unused src tracking for generated .o files" am:
478913f88f
am:
d02bb7bfc5
* commit '
d02bb7bfc51343ab88eb2e05157155673ddf8130':
Fix unused src tracking for generated .o files
Dan Willemsen [Fri, 5 Feb 2016 18:18:20 +0000 (18:18 +0000)]
Merge "Fix unused src tracking for generated .o files"
am:
478913f88f
* commit '
478913f88fdafc61015e87129486e12ddeb7d184':
Fix unused src tracking for generated .o files
Dan Willemsen [Fri, 5 Feb 2016 18:12:20 +0000 (18:12 +0000)]
Merge "Fix unused src tracking for generated .o files"
Alex Deymo [Fri, 5 Feb 2016 06:29:29 +0000 (22:29 -0800)]
ota_from_target_files: Include the payload properties.
When building an A/B OTA package, include the payload.bin properties as
a key-value pairs text file, so it can easily be passed to
update_engine during payload application.
Bug:
26991255
TEST=`ota_from_target_files out/dist/${BOARD}-target_files.zip full-ota.zip` includes the properties.
Change-Id: I445c8a8e412a8e16b48b6ee626db8e27d48a38a9
Colin Cross [Fri, 5 Feb 2016 00:04:43 +0000 (00:04 +0000)]
Merge "Don\'t build otatools for PDK" am:
9e8866f4a4
am:
3611f2f440
* commit '
3611f2f440944dadd74b36a235c41c7957a6963c':
Don't build otatools for PDK
Colin Cross [Fri, 5 Feb 2016 00:01:49 +0000 (00:01 +0000)]
Merge "Don\'t build otatools for PDK"
am:
9e8866f4a4
* commit '
9e8866f4a4ec60778d55366afaf29f7d2e22e9ee':
Don't build otatools for PDK
Colin Cross [Thu, 4 Feb 2016 23:49:41 +0000 (23:49 +0000)]
Merge "Don't build otatools for PDK"
Chih-Hung Hsieh [Thu, 4 Feb 2016 23:43:05 +0000 (15:43 -0800)]
resolve merge conflicts of
dc1afa9c0f to master.
Change-Id: I4236d9f79cbca689d0fcc400d4c10a663209bc2a
Chih-hung Hsieh [Thu, 4 Feb 2016 23:29:24 +0000 (23:29 +0000)]
Merge "Remove USE_CLANG_PLATFORM_BUILD in BoardConfig.mk"
am:
9ff17cf7bc
* commit '
9ff17cf7bcc4b88a6a407f0c573b181a91f30ec8':
Remove USE_CLANG_PLATFORM_BUILD in BoardConfig.mk
Chih-hung Hsieh [Thu, 4 Feb 2016 23:22:19 +0000 (23:22 +0000)]
Merge "Remove USE_CLANG_PLATFORM_BUILD in BoardConfig.mk"
Colin Cross [Thu, 4 Feb 2016 23:19:16 +0000 (23:19 +0000)]
Merge "Build .toc when building a module by name" am:
1b21a15049
am:
af5b95ac90
* commit '
af5b95ac90ae06cf9efc52436e2e24d8c55541ce':
Build .toc when building a module by name
Colin Cross [Thu, 4 Feb 2016 23:17:20 +0000 (23:17 +0000)]
Merge "Build .toc when building a module by name"
am:
1b21a15049
* commit '
1b21a1504952addbfef585d91afd2fddc5cf29ae':
Build .toc when building a module by name
Colin Cross [Thu, 4 Feb 2016 23:13:31 +0000 (23:13 +0000)]
Merge "Build .toc when building a module by name"
Colin Cross [Thu, 4 Feb 2016 23:09:23 +0000 (15:09 -0800)]
Don't build otatools for PDK
Change-Id: I5e73d103300ac938f80b3ff0af978c123d649fed
Dan Willemsen [Thu, 4 Feb 2016 22:18:48 +0000 (14:18 -0800)]
Fix unused src tracking for generated .o files
*.o files that are passed in via LOCAL_GENERATED_SOURCES are added
directly to all_objects, they are not mixed with the normal_objects that
we track. So omit them from they my_gen_src_files list so that we don't
warn that they're unused.
Change-Id: I94b85504032e70fbcc00207d6200557700dd0a89
Colin Cross [Thu, 4 Feb 2016 21:28:04 +0000 (13:28 -0800)]
Build .toc when building a module by name
Building a module by name with make <module name>, or with mm or mma
through all_modules, should also build the .toc file so that future uses
of mm on modules that depend on this one can find the .toc file.
Bug:
26936761
Change-Id: Id0c592f0860a10b732b2b5b13c7e967c9bcb1c6b
Stephen Hines [Thu, 4 Feb 2016 19:52:45 +0000 (19:52 +0000)]
Merge "Fix LLVM_RTLIB_PATH for new prebuilts." am:
042d589fa2
am:
1972757ef8
* commit '
1972757ef8e4de53b3400e62a1711c52eecd0a2b':
Fix LLVM_RTLIB_PATH for new prebuilts.
Stephen Hines [Thu, 4 Feb 2016 19:50:04 +0000 (19:50 +0000)]
Merge "Fix LLVM_RTLIB_PATH for new prebuilts."
am:
042d589fa2
* commit '
042d589fa247a7d8fdb94043598cd04cf6857ca0':
Fix LLVM_RTLIB_PATH for new prebuilts.
Stephen Hines [Thu, 4 Feb 2016 19:46:07 +0000 (19:46 +0000)]
Merge "Fix LLVM_RTLIB_PATH for new prebuilts."
Stephen Hines [Thu, 4 Feb 2016 19:43:41 +0000 (11:43 -0800)]
Fix LLVM_RTLIB_PATH for new prebuilts.
This moved from lib/ to lib64/, but wasn't noticed because no one builds
with the profiler on by default.
Change-Id: I0155263b4a50437ea0864338fb34baefc3df59d2
Chih-Hung Hsieh [Thu, 4 Feb 2016 18:55:56 +0000 (10:55 -0800)]
Remove USE_CLANG_PLATFORM_BUILD in BoardConfig.mk
Use global default USE_CLANG_PLATFORM_BUILD set in core/envsetup.mk,
or user provided environment variable USE_CLANG_PLATFORM_BUILD.
BUG:
26102335
Change-Id: I7e12219a60f36bb44797bb028b4a5873a67c9210
Stephen Hines [Thu, 4 Feb 2016 07:40:23 +0000 (07:40 +0000)]