OSDN Git Service
Daniel Rosenberg [Sat, 6 Jun 2015 00:59:27 +0000 (17:59 -0700)]
Add support for system images that contain the root directory
When the root directory is included in system, the assumption that
system is mounted at /system breaks down. Redirect /system to /
in that case.
Change-Id: I8031b32d7cb9ca699c1cc22939e28afce9d1c847
Daniel Rosenberg [Tue, 30 Jun 2015 00:20:43 +0000 (17:20 -0700)]
Add ro.build.system_root_image
ro.build.system_root_image is true if the root directory is built
into the system image.
Change-Id: I17208ebd004c63aebb09db6c3e5f795619e73bd2
Tao Bao [Wed, 28 Oct 2015 02:25:18 +0000 (19:25 -0700)]
Honor TARGET_NO_RECOVERY flag.
Don't generate recovery.img when calling 'make dist' if
TARGET_NO_RECOVERY is set. The build system passes the flag to the
packaging script which then generates recovery.img conditionally.
Bug:
25329471
Change-Id: Ia7f08943834ee39e781d7e9b5beb1b31d95a73d9
(cherry picked from commit
db45efa64764c1de5c007384ab172ad817e1d295)
Tao Bao [Sat, 8 Aug 2015 02:49:45 +0000 (19:49 -0700)]
DO NOT MERGE Change the cache partition size check into warnings.
For some old builds, we may not define cache partition size. Change the
exception into a warning to make the script backward compatible.
Change-Id: Ia90531e3455d4888cfac6510cab879c50883be53
(cherry picked from commit
575d68a48edc90d655509f2980dacc69958948de)
Tao Bao [Wed, 19 Aug 2015 01:03:56 +0000 (18:03 -0700)]
build: Don't call make_recovery_patch if there's no recovery.
Change-Id: I7ae57f6d69293645f88cbe9cc61b7cbbe8d12430
(cherry picked from commit
cbc6dc29d6ac0f42db2176177fd2d2ad74923133)
Dan Albert [Tue, 12 May 2015 18:00:31 +0000 (11:00 -0700)]
Fix using libc++_static in dynamic binaries.
Change-Id: Ia1f37c4c7ab2eb913c8aa29d80b86e44f7bc766d
(cherry picked from commit
2a4a023a541d16b2a8c66aed97748d0f0f376387)
Dan Albert [Wed, 6 May 2015 17:08:11 +0000 (10:08 -0700)]
Cleanup libc++ configuration.
Change-Id: Id1eeeb23466b04a4fe64c04e1768b98a1068b5a8
(cherry picked from commit
0ad5bd22c898cbf0e8d1e156dace080f4e11a0a1)
Bart Sears [Sun, 15 Nov 2015 18:02:33 +0000 (18:02 +0000)]
Revert "Change version back to 6.0" am:
55a149b740
am:
550b317688
* commit '
550b317688211118d8f2c50aaa80d2616903807b':
Revert "Change version back to 6.0"
Bart Sears [Sun, 15 Nov 2015 18:02:26 +0000 (18:02 +0000)]
Change version back to 6.0 am:
970f203b3d
am:
3a37a0cefd
* commit '
3a37a0cefd7599fa769fd86f7d64d781aaa88be7':
Change version back to 6.0
Bart Sears [Sun, 15 Nov 2015 17:59:44 +0000 (17:59 +0000)]
Revert "Change version back to 6.0"
am:
55a149b740
* commit '
55a149b74064b799efe9c69211a511725cb9925b':
Revert "Change version back to 6.0"
Bart Sears [Sun, 15 Nov 2015 17:59:32 +0000 (17:59 +0000)]
Change version back to 6.0
am:
970f203b3d
* commit '
970f203b3d3f17b778749c3ce47eb6b922aa606c':
Change version back to 6.0
Bart Sears [Sun, 15 Nov 2015 17:57:13 +0000 (17:57 +0000)]
Revert "Change version back to 6.0"
This reverts commit
970f203b3d3f17b778749c3ce47eb6b922aa606c.
Change-Id: Icd96990f128e303b0e2af5af0f0d4a0f7731fe60
Bart Sears [Sun, 15 Nov 2015 07:50:18 +0000 (23:50 -0800)]
Change version back to 6.0
Temporarily set the version back to 6.0 and security patch to
2015-11-01.
Change-Id: Idb09d6bab89362b18ae9657e3ed931d614c1894b
Vince Harron [Wed, 11 Nov 2015 19:37:38 +0000 (19:37 +0000)]
Switch emulator to generate userdebug images by default
am:
ba740ff57f
* commit '
ba740ff57fd314d0ad649c252841ab834e96fdaa':
Switch emulator to generate userdebug images by default
Vince Harron [Tue, 27 Oct 2015 23:08:25 +0000 (16:08 -0700)]
Switch emulator to generate userdebug images by default
This is primarily to avoid using the unsupported JIT on Android-M
It will increase app install times significantly because the app will
be compiled at install time. OTOH, It should improve application
performance dramatically.
Change-Id: Id1d637ec561db177fd52e4c111f4def2a1b45543
(cherry picked from commit
08787d747d71d7ff3f13d2275d937faefc6d7777)
Griff Hazen [Sun, 8 Nov 2015 01:00:58 +0000 (01:00 +0000)]
Let qemu_props service set system properties in ro.emu and ro.emulator
am:
20ed978ada
* commit '
20ed978ada07690b7ca6d643f6c8869e656ccff7':
Let qemu_props service set system properties in ro.emu and ro.emulator
Griff Hazen [Sun, 8 Nov 2015 00:44:44 +0000 (16:44 -0800)]
Let qemu_props service set system properties in ro.emu and ro.emulator
These boot properties are used by android wear emulator to configure
round and chin shaped devices.
Bug:
23324757
Change-Id: I812da02d771bba0ffc63b14459c7de7cbdeed142
Zach Jang [Tue, 27 Oct 2015 00:52:13 +0000 (00:52 +0000)]
Merge "Update security string to 2015-12-01" into mnc-dev am:
54cb940c4a am:
dfd3524f7b
am:
eca2b655e5
* commit '
eca2b655e5a57f0a13c55d815f6b18d8d03160fb':
Update security string to 2015-12-01
Zach Jang [Tue, 27 Oct 2015 00:48:30 +0000 (00:48 +0000)]
Merge "Update security string to 2015-12-01" into mnc-dev am:
54cb940c4a
am:
dfd3524f7b
* commit '
dfd3524f7b1fb2f0346eee7fa0dc42e8888f68aa':
Update security string to 2015-12-01
Zach Jang [Tue, 27 Oct 2015 00:44:56 +0000 (00:44 +0000)]
Merge "Update security string to 2015-12-01" into mnc-dev
am:
54cb940c4a
* commit '
54cb940c4a07701212e96f77ee4a89493b0f251b':
Update security string to 2015-12-01
Zach Jang [Tue, 27 Oct 2015 00:37:40 +0000 (00:37 +0000)]
Merge "Update security string to 2015-12-01" into mnc-dev
Zach Jang [Tue, 27 Oct 2015 00:02:12 +0000 (00:02 +0000)]
Update security string to 2015-12-01 - DO NOT MERGE am:
6575d4a2a8 am:
cc9ac27157 am:
fe64ce145e -s ours am:
0e8cf97670 am:
07e2c19536
am:
a3b35dec78
* commit '
a3b35dec78b8afe7e29e3d6a0fc7524b5fd846a2':
Update security string to 2015-12-01 - DO NOT MERGE
Zach Jang [Mon, 26 Oct 2015 23:57:13 +0000 (23:57 +0000)]
Update security string to 2015-12-01 - DO NOT MERGE am:
6575d4a2a8 am:
cc9ac27157 am:
fe64ce145e -s ours am:
0e8cf97670
am:
07e2c19536
* commit '
07e2c195367119faa4645d3f9f0dcb1c6aba7396':
Update security string to 2015-12-01 - DO NOT MERGE
Zach Jang [Mon, 26 Oct 2015 23:52:50 +0000 (23:52 +0000)]
Update security string to 2015-12-01 - DO NOT MERGE am:
6575d4a2a8 am:
cc9ac27157 am:
fe64ce145e -s ours
am:
0e8cf97670
* commit '
0e8cf97670c0b0a59d326507296829fe1bc01230':
Update security string to 2015-12-01 - DO NOT MERGE
Zach Jang [Mon, 26 Oct 2015 23:49:22 +0000 (23:49 +0000)]
Update security string to 2015-12-01 - DO NOT MERGE am:
6575d4a2a8 am:
cc9ac27157
am:
fe64ce145e -s ours
* commit '
fe64ce145e243fb3fde5a788bcd800c2987da37c':
Update security string to 2015-12-01 - DO NOT MERGE
Zach Jang [Mon, 26 Oct 2015 23:46:01 +0000 (23:46 +0000)]
Update security string to 2015-12-01 - DO NOT MERGE am:
6575d4a2a8
am:
cc9ac27157
* commit '
cc9ac271575b4c1ef3a2bff3fbdaf2b201c6e75d':
Update security string to 2015-12-01 - DO NOT MERGE
Zach Jang [Mon, 26 Oct 2015 23:42:57 +0000 (23:42 +0000)]
Update security string to 2015-12-01 - DO NOT MERGE
am:
6575d4a2a8
* commit '
6575d4a2a8c78a703e5c2e2889ecb358668d1bbd':
Update security string to 2015-12-01 - DO NOT MERGE
Zach Jang [Thu, 22 Oct 2015 22:03:14 +0000 (15:03 -0700)]
Update security string to 2015-12-01
Change-Id: I2e07d57e457effdcf685203dabfcfefa47c70bf3
Zach Jang [Thu, 22 Oct 2015 22:00:30 +0000 (15:00 -0700)]
Update security string to 2015-12-01 - DO NOT MERGE
Change-Id: I155ec6c2b57c899f20bb85f5a5cf031499ba81b0
Ian Pedowitz [Thu, 22 Oct 2015 21:59:20 +0000 (21:59 +0000)]
Bump Android to 6.0.1 am:
0a20c942c4
am:
1f9ba9f89e
* commit '
1f9ba9f89eacd2b16805cf138df16e211b51b700':
Bump Android to 6.0.1
Zach Jang [Thu, 22 Oct 2015 21:59:13 +0000 (21:59 +0000)]
Update security string to 2015-12-01 am:
0f1512bc03
am:
7b4c7fe5b7
* commit '
7b4c7fe5b77e55ede46f0b3fd5eb4a98964ff956':
Update security string to 2015-12-01
Ian Pedowitz [Thu, 22 Oct 2015 21:53:27 +0000 (21:53 +0000)]
Bump Android to 6.0.1
am:
0a20c942c4
* commit '
0a20c942c4bb110ebd971e7959ed1b2fa53e452a':
Bump Android to 6.0.1
Zach Jang [Thu, 22 Oct 2015 21:53:13 +0000 (21:53 +0000)]
Update security string to 2015-12-01
am:
0f1512bc03
* commit '
0f1512bc03b7820a2b9b93757a2309fb872f6677':
Update security string to 2015-12-01
Ian Pedowitz [Sat, 10 Oct 2015 18:00:52 +0000 (11:00 -0700)]
Bump Android to 6.0.1
Bug:
24777474
Change-Id: Ibaca3c2d583aa92c8ca998b6d380ee720b71b1b8
Zach Jang [Tue, 20 Oct 2015 00:57:33 +0000 (17:57 -0700)]
Update security string to 2015-12-01
Change-Id: I525bab4579449dd285ba87d7ddc9cb36223bf7fd
Tao Bao [Sat, 17 Oct 2015 01:27:16 +0000 (01:27 +0000)]
am
1280fa01: am
09ee6daa: am
bc5e85af: Merge "DO NOT MERGE releasetools: Always write the last block if it\'s padded." into mnc-dev
* commit '
1280fa01bd263eac1d31850fe47f8e0aa93cab82':
DO NOT MERGE releasetools: Always write the last block if it's padded.
Tao Bao [Sat, 17 Oct 2015 01:23:02 +0000 (01:23 +0000)]
am
09ee6daa: am
bc5e85af: Merge "DO NOT MERGE releasetools: Always write the last block if it\'s padded." into mnc-dev
* commit '
09ee6daa7f4d9a526532e77b45aa88bbf1f0776d':
DO NOT MERGE releasetools: Always write the last block if it's padded.
Tao Bao [Sat, 17 Oct 2015 01:19:15 +0000 (01:19 +0000)]
am
bc5e85af: Merge "DO NOT MERGE releasetools: Always write the last block if it\'s padded." into mnc-dev
* commit '
bc5e85afc9cbbbb3c7e7364a6ff2a29cfb596d38':
DO NOT MERGE releasetools: Always write the last block if it's padded.
Tao Bao [Sat, 17 Oct 2015 01:15:39 +0000 (01:15 +0000)]
Merge "DO NOT MERGE releasetools: Always write the last block if it's padded." into mnc-dev
Tao Bao [Sat, 17 Oct 2015 00:18:27 +0000 (00:18 +0000)]
am
5631d5c6: am
46ae586a: am
e09359ab: DO NOT MERGE Pass source\'s info_dict to vendor\'s releasetools.py.
* commit '
5631d5c6e12937fd50ef576c6cff1c7ed7c5ae1b':
DO NOT MERGE Pass source's info_dict to vendor's releasetools.py.
Tao Bao [Sat, 17 Oct 2015 00:13:36 +0000 (00:13 +0000)]
am
46ae586a: am
e09359ab: DO NOT MERGE Pass source\'s info_dict to vendor\'s releasetools.py.
* commit '
46ae586ab26f5bf63baaac6c68942f1bfba4addc':
DO NOT MERGE Pass source's info_dict to vendor's releasetools.py.
Tao Bao [Sat, 17 Oct 2015 00:09:35 +0000 (00:09 +0000)]
am
e09359ab: DO NOT MERGE Pass source\'s info_dict to vendor\'s releasetools.py.
* commit '
e09359abc0f8c29fbb16d35ab7375d80fde6f931':
DO NOT MERGE Pass source's info_dict to vendor's releasetools.py.
Tao Bao [Tue, 13 Oct 2015 23:37:12 +0000 (16:37 -0700)]
DO NOT MERGE Pass source's info_dict to vendor's releasetools.py.
When building incremental packages, the info_dict from the source build
should be the one in use. We have done that for most of the partitions
(system and etc.), and should pass that to vendor's script as well.
Also includes the CL in commit
aac4ad56b6c60e271d807604b20f72084c58b426
that fixes a bug in commit
6f0b219ac551710c724e3f344023943178cdc217.
Bug:
24898607
Change-Id: I4ea6037dad7061e1683661fc4c394fa3a7a7c5cd
(cherry picked from commit
6f0b219ac551710c724e3f344023943178cdc217)
Tao Bao [Sun, 6 Sep 2015 03:35:32 +0000 (20:35 -0700)]
DO NOT MERGE releasetools: Always write the last block if it's padded.
In BBOTAs if the last block of a DataImage is padded, we should always
write the whole block even for incremental OTAs. Because otherwise the
last block may be skipped if unchanged, but would fail the post-install
verification if it has non-zero contents in the padding bytes.
Bug:
24981812
Change-Id: Id0608384fcff0375aec8c158e6f909569b873d31
(cherry picked from commit
7589e961a7b8b7d964704db87f83ed8811e97ac6)
Dan Willemsen [Wed, 14 Oct 2015 03:58:06 +0000 (03:58 +0000)]
am
b70b496f: am
57a64e01: Add all-named-(dirs|files)-under and related
* commit '
b70b496fd7574120e61e5e4ea3d63cf6192ba785':
Add all-named-(dirs|files)-under and related
Dan Willemsen [Wed, 14 Oct 2015 03:58:05 +0000 (03:58 +0000)]
am
2473c641: am
7a74e5ee: Add all-cpp-files-under
* commit '
2473c641baef739bed99c13036200ad8e9812d75':
Add all-cpp-files-under
Dan Willemsen [Wed, 14 Oct 2015 03:58:04 +0000 (03:58 +0000)]
am
304d073b: am
76a89d3a: Sort all files found via
* commit '
304d073b83a8e8eb7d143945996b7c279807abd4':
Sort all files found via $(shell find)
Dan Willemsen [Wed, 14 Oct 2015 03:52:38 +0000 (03:52 +0000)]
am
57a64e01: Add all-named-(dirs|files)-under and related
* commit '
57a64e015c0dd670f9adf5a2016526678ce96a1e':
Add all-named-(dirs|files)-under and related
Dan Willemsen [Wed, 14 Oct 2015 03:52:37 +0000 (03:52 +0000)]
am
7a74e5ee: Add all-cpp-files-under
* commit '
7a74e5ee0e6c41395493d9259ccfff80717a4eaf':
Add all-cpp-files-under
Dan Willemsen [Wed, 14 Oct 2015 03:52:37 +0000 (03:52 +0000)]
am
76a89d3a: Sort all files found via
* commit '
76a89d3a0a39ffa2c9172728165da42c3b3379be':
Sort all files found via $(shell find)
Dan Willemsen [Mon, 12 Oct 2015 22:26:52 +0000 (15:26 -0700)]
Add all-named-(dirs|files)-under and related
To consolidate the number of places that we're using 'find' in the tree,
add some more helpers:
all-named-dirs-under
all-subdir-named-dirs
all-named-files-under
all-subdir-named-files
This change also makes many of the current helpers use these helpers
instead of using their own implementation.
The 'dirs' helpers are using '-type d' so that they only output
directories. It's probably safe to use '-type f' for the files helpers,
but that increased the kati load time by ~20%.
Bug:
24204119
Change-Id: I3312e2fe8c146f10955e1d986ad15d9c8be494e1
Dan Willemsen [Tue, 29 Sep 2015 23:26:28 +0000 (16:26 -0700)]
Add all-cpp-files-under
There are multiple versions of this in the tree. Let's standardize on
one that will work for everyone, and will sort the results.
Bug:
24204119
Change-Id: I09fcd80e1e8e35e64d8a8a62bbc096f87b02603f
Dan Willemsen [Tue, 22 Sep 2015 23:54:12 +0000 (16:54 -0700)]
Sort all files found via $(shell find)
Don't rely on filesystem ordering to make these the same for all builds.
Bug:
24204119
Change-Id: I7313062157764091acecf45f4b57405c28858546
Hans Boehm [Tue, 13 Oct 2015 03:55:13 +0000 (03:55 +0000)]
am
8638de1f: am
ab4d8594: Switch from Calculator to ExactCalculator
* commit '
8638de1f6f8186d4cb8b82b6c0f365f3ce8a0b24':
Switch from Calculator to ExactCalculator
Hans Boehm [Tue, 13 Oct 2015 03:49:41 +0000 (03:49 +0000)]
am
ab4d8594: Switch from Calculator to ExactCalculator
* commit '
ab4d8594591b715934d7a1106d5284e9721070ba':
Switch from Calculator to ExactCalculator
Hans Boehm [Tue, 13 Oct 2015 00:08:04 +0000 (17:08 -0700)]
Switch from Calculator to ExactCalculator
Bug:
24875598
Use ExactCalculator for AOSP builds.
This is a manual (due to intervening commits) cherrypick of
commit
53c5891460408ffe37f2aecc2044320d49cef801 (ag/748830).
Change-Id: I6c0acef640e62f8a70b7b2832b7eea662a0d301b
Tao Bao [Mon, 12 Oct 2015 18:48:13 +0000 (18:48 +0000)]
am
ed48af8d: am
b03d55aa: Merge "DO NOT MERGE: Only use a fixed timestamp when packaging." into mnc-dr-dev
* commit '
ed48af8d5b997915b209eee0ad0d580938d679a1':
DO NOT MERGE: Only use a fixed timestamp when packaging.
Tao Bao [Mon, 12 Oct 2015 18:42:21 +0000 (18:42 +0000)]
am
b03d55aa: Merge "DO NOT MERGE: Only use a fixed timestamp when packaging." into mnc-dr-dev
* commit '
b03d55aaeb5962690631ed1a25d8e628667d8ad2':
DO NOT MERGE: Only use a fixed timestamp when packaging.
Tao Bao [Mon, 12 Oct 2015 18:39:11 +0000 (18:39 +0000)]
Merge "DO NOT MERGE: Only use a fixed timestamp when packaging." into mnc-dr-dev
Ying Wang [Mon, 12 Oct 2015 17:34:19 +0000 (17:34 +0000)]
am
43f24a32: am
aecadc06: Merge "Don\'t add build number to apps\' version name for platform build." into mnc-dr-dev
* commit '
43f24a323ce95e848ef56ec5a2a1f02b41d14ffc':
Don't add build number to apps' version name for platform build.
Ying Wang [Mon, 12 Oct 2015 17:28:03 +0000 (17:28 +0000)]
am
aecadc06: Merge "Don\'t add build number to apps\' version name for platform build." into mnc-dr-dev
* commit '
aecadc06bf49a747c6e0c42dbe8cc73451360db2':
Don't add build number to apps' version name for platform build.
Ying Wang [Mon, 12 Oct 2015 17:22:45 +0000 (17:22 +0000)]
Merge "Don't add build number to apps' version name for platform build." into mnc-dr-dev
Tao Bao [Wed, 30 Sep 2015 23:01:14 +0000 (16:01 -0700)]
DO NOT MERGE: Only use a fixed timestamp when packaging.
This CL changes to use a fixed timestamp only when packaging
into the target_files zip.
Bug:
24377993
Change-Id: I01d136f4b99e1eff80c559192d93db83a3c5c0a4
(cherry picked from commit
822f5840c0f498e33829a0a00f383d9be3a7e913)
Joe Fernandez [Sat, 10 Oct 2015 00:13:38 +0000 (00:13 +0000)]
am
fed4cf89: am
1b5eef1b: am
b16edb5f: Merge "add unique ID to each windows download link. These IDs are necessary for the TOS wall to identify which link should be applied to the download button." into mnc-dev
* commit '
fed4cf896d2ba46a97bbbb753fd019f98bb42d90':
add unique ID to each windows download link. These IDs are necessary for the TOS wall to identify which link should be applied to the download button.
Joe Fernandez [Sat, 10 Oct 2015 00:08:09 +0000 (00:08 +0000)]
am
1b5eef1b: am
b16edb5f: Merge "add unique ID to each windows download link. These IDs are necessary for the TOS wall to identify which link should be applied to the download button." into mnc-dev
* commit '
1b5eef1b490cc143474ec74d58369aac9bf6629e':
add unique ID to each windows download link. These IDs are necessary for the TOS wall to identify which link should be applied to the download button.
Joe Fernandez [Fri, 9 Oct 2015 23:59:07 +0000 (23:59 +0000)]
am
b16edb5f: Merge "add unique ID to each windows download link. These IDs are necessary for the TOS wall to identify which link should be applied to the download button." into mnc-dev
* commit '
b16edb5f3ef9032b7e19c29aac2496c34bb8ac76':
add unique ID to each windows download link. These IDs are necessary for the TOS wall to identify which link should be applied to the download button.
Joe Fernandez [Fri, 9 Oct 2015 23:54:46 +0000 (23:54 +0000)]
Merge "add unique ID to each windows download link. These IDs are necessary for the TOS wall to identify which link should be applied to the download button." into mnc-dev
smain@google.com [Fri, 9 Oct 2015 23:30:05 +0000 (16:30 -0700)]
add unique ID to each windows download link.
These IDs are necessary for the TOS wall to identify which link should be applied to the download button.
Change-Id: I1b5b8b516a5b8d7fd8433c02011cb4fb2044b71f
Zach Jang [Tue, 6 Oct 2015 01:26:51 +0000 (01:26 +0000)]
am
a9b2f303: am
124a59ae: Reverting Android Security Patch Level string back to 2015-10-01
* commit '
a9b2f3030f99650e8af1b7ec35c171801cbcdae6':
Reverting Android Security Patch Level string back to 2015-10-01
Zach Jang [Tue, 6 Oct 2015 01:21:03 +0000 (01:21 +0000)]
am
124a59ae: Reverting Android Security Patch Level string back to 2015-10-01
* commit '
124a59aecc0323c1c80469c3ad5d22305c279a49':
Reverting Android Security Patch Level string back to 2015-10-01
Zach Jang [Tue, 6 Oct 2015 01:01:12 +0000 (18:01 -0700)]
Reverting Android Security Patch Level string back to 2015-10-01
Change-Id: I0ecc1c9103e7686dffcb8b7009d52aa8d546ae0b
Brian Carlstrom [Sun, 4 Oct 2015 20:00:56 +0000 (20:00 +0000)]
am
848b8e9d: am
fa2ce3b3: am
f73f79f1: Merge "Use /filelist when OUT_DIR is set" into mnc-dev
* commit '
848b8e9d2cc9f8229c95b3f2d9f92c97726ad8a6':
Use $OUT_DIR/filelist when OUT_DIR is set
Brian Carlstrom [Sun, 4 Oct 2015 19:53:49 +0000 (19:53 +0000)]
am
fa2ce3b3: am
f73f79f1: Merge "Use /filelist when OUT_DIR is set" into mnc-dev
* commit '
fa2ce3b38be8889a0ccaa5968ebdeae80f33b0de':
Use $OUT_DIR/filelist when OUT_DIR is set
Brian Carlstrom [Sun, 4 Oct 2015 19:47:22 +0000 (19:47 +0000)]
am
f73f79f1: Merge "Use /filelist when OUT_DIR is set" into mnc-dev
* commit '
f73f79f1b63c7cb7679264a6c6e4f86fdd78309c':
Use $OUT_DIR/filelist when OUT_DIR is set
Brian Carlstrom [Sun, 4 Oct 2015 19:40:41 +0000 (19:40 +0000)]
Merge "Use $OUT_DIR/filelist when OUT_DIR is set" into mnc-dev
Claes Elgemark [Thu, 1 Oct 2015 14:07:49 +0000 (14:07 +0000)]
am
1b045b3d: am
5b08efb7: (-s ours) Don\'t fail build of otatools if there are no device certificates
* commit '
1b045b3d66fb18ecf7deec31dd4fd33993f5ae83':
Don't fail build of otatools if there are no device certificates
Claes Elgemark [Thu, 1 Oct 2015 14:03:40 +0000 (14:03 +0000)]
am
5b08efb7: (-s ours) Don\'t fail build of otatools if there are no device certificates
* commit '
5b08efb73f1b114f6dfdb52284738f7210d0cf7e':
Don't fail build of otatools if there are no device certificates
Brian Carlstrom [Thu, 1 Oct 2015 03:28:54 +0000 (20:28 -0700)]
Use $OUT_DIR/filelist when OUT_DIR is set
Change-Id: Iadf3f05e752d71371d3d74e670ade3e937b1cd92
Baligh Uddin [Wed, 30 Sep 2015 20:11:08 +0000 (20:11 +0000)]
am
d9cdf5be: am
22ff0124: (-s ours) Merge "add otatools-package target" into cw-d-mr1-dev
* commit '
d9cdf5be20b8804d289da24e60724245ad7d15eb':
add otatools-package target
Baligh Uddin [Wed, 30 Sep 2015 18:39:15 +0000 (18:39 +0000)]
am
22ff0124: (-s ours) Merge "add otatools-package target" into cw-d-mr1-dev
* commit '
22ff0124fdde970072cea303b4328024994cd78c':
add otatools-package target
Ying Wang [Tue, 29 Sep 2015 22:04:28 +0000 (22:04 +0000)]
am
98f3c213: am
cb31a535: Dist the otatools package.
* commit '
98f3c213df26b7d997d6171882a7f02b90e1cb2b':
Dist the otatools package.
Ying Wang [Tue, 29 Sep 2015 21:57:09 +0000 (21:57 +0000)]
am
cb31a535: Dist the otatools package.
* commit '
cb31a535077947e45a97ef31a04b6a3b211ceb25':
Dist the otatools package.
Claes Elgemark [Wed, 1 Apr 2015 09:29:29 +0000 (11:29 +0200)]
Don't fail build of otatools if there are no device certificates
Bug:
23552169
Change-Id: I32723701d952ef2243ce0234132fa9876f0f21b6
(cherry picked from commit
8d771971212069f77851163f437c782f581bf6db)
Baligh Uddin [Tue, 29 Sep 2015 21:53:25 +0000 (21:53 +0000)]
Merge "add otatools-package target" into cw-d-mr1-dev
Ying Wang [Tue, 25 Aug 2015 00:13:53 +0000 (17:13 -0700)]
Dist the otatools package.
Bug:
23495952
(cherry picked from commit
267e957373765ad1e3ce89abe61886a305277027)
Change-Id: I49fcb9fed599268a9d37de7b14280eeb65c34788
(cherry picked from commit
fc028e59c2bc36297f23cdf2ee4fe9b1b60aa1cd)
Doug Zongker [Fri, 22 Aug 2014 15:04:58 +0000 (08:04 -0700)]
add otatools-package target
Add a target to zip up all the otatools and releasetools, for easy
copying to the OTA builder machine.
Change-Id: I55a6d93c1de75ac936d941c0e3ae72897407f563
(cherry picked from commit
f22b0f43efbc16c548692dc239a387edda15d78f)
(cherry picked from commit
32bf3f32651ddff9ffa2168017d71ec4b151a0a9)
Ying Wang [Tue, 29 Sep 2015 18:21:35 +0000 (18:21 +0000)]
am
b1bee75f: am
3d6e194e: am
393c6254: Really include drawables for all densities.
* commit '
b1bee75f79fb4addd25abb573e67ee66ce1f7ba6':
Really include drawables for all densities.
Ying Wang [Tue, 29 Sep 2015 18:13:03 +0000 (18:13 +0000)]
am
3d6e194e: am
393c6254: Really include drawables for all densities.
* commit '
3d6e194eafbb441c79d4cd306af85eeb34fb75e8':
Really include drawables for all densities.
Ying Wang [Tue, 29 Sep 2015 18:07:41 +0000 (18:07 +0000)]
am
393c6254: Really include drawables for all densities.
* commit '
393c62549a6340b3473f14b71d583e118d7e6a6d':
Really include drawables for all densities.
Ying Wang [Fri, 12 Jun 2015 17:33:59 +0000 (10:33 -0700)]
Really include drawables for all densities.
Previously with "PRODUCT_AAPT_CONFIG := normal" resource with modifier
"small" isn't included.
Bug:
21643610
Change-Id: I53940d716fb9705462b1abb882e04103e211f8af
Zach Jang [Mon, 28 Sep 2015 21:38:18 +0000 (21:38 +0000)]
am
3ab46587: am
92da6bdb: am
5e858e3d: Merge "Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA" into mnc-dev
* commit '
3ab46587418d647e201783af0df496f83d3e33f0':
Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA
Zach Jang [Mon, 28 Sep 2015 21:33:30 +0000 (21:33 +0000)]
am
92da6bdb: am
5e858e3d: Merge "Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA" into mnc-dev
* commit '
92da6bdb09e0c64996aee54da9c088f37dcc0724':
Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA
Zach Jang [Mon, 28 Sep 2015 21:27:22 +0000 (21:27 +0000)]
am
5e858e3d: Merge "Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA" into mnc-dev
* commit '
5e858e3db9f7b2037dc9e03c08f9687d5a6718bd':
Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA
Zach Jang [Mon, 28 Sep 2015 21:17:41 +0000 (21:17 +0000)]
Merge "Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA" into mnc-dev
Stephen Hines [Tue, 22 Sep 2015 22:09:39 +0000 (22:09 +0000)]
am
5e704686: Add ld.mc as a requirement for core_tiny.mk as well.
* commit '
5e704686571beb1c5ccbece9a33bb82306b35598':
Add ld.mc as a requirement for core_tiny.mk as well.
Stephen Hines [Tue, 22 Sep 2015 19:49:39 +0000 (12:49 -0700)]
Add ld.mc as a requirement for core_tiny.mk as well.
Bug:
24171451
I missed this when I initially added ld.mc as a requirement for
core_minimal.mk. This is required for RenderScript linking on the
device.
Change-Id: Ie3ffa2454214f886c38387f45b34df2dcbebd6e6
(cherry picked from commit
446ae75fb7a596f86e40f700b82bf6199f9be22b)
Zach Jang [Tue, 22 Sep 2015 00:42:49 +0000 (17:42 -0700)]
Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA
Change-Id: I80e1e5766c33f1a5c1e28e456dfe902bc8886fd4
Zach Jang [Tue, 22 Sep 2015 00:20:09 +0000 (00:20 +0000)]
am
d3d0347b: am
6a0bdb55: am
64685ea3: am
ef024064: (-s ours) am
09611509: am
63712481: am
bb97ff59: am
a7168e1c: am
e539537d: (-s ours) am
7f96f4f6: am
4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '
d3d0347be045d63328558d13cba81d90a0247b44':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
Zach Jang [Tue, 22 Sep 2015 00:20:08 +0000 (00:20 +0000)]
am
3a5be134: am
22e66b35: am
a5842d3e: am
f694d378: (-s ours) resolved conflicts for
b161297d to lmp-mr1-ub-dev
* commit '
3a5be13442f411153f2c3a2d0f50e1ed7c415f47':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
Zach Jang [Tue, 22 Sep 2015 00:13:22 +0000 (00:13 +0000)]
am
6a0bdb55: am
64685ea3: am
ef024064: (-s ours) am
09611509: am
63712481: am
bb97ff59: am
a7168e1c: am
e539537d: (-s ours) am
7f96f4f6: am
4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '
6a0bdb551810df79a3561ebe4f1cfcde8583659b':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3