Commit Graph

23683 Commits

Author SHA1 Message Date
Tao Bao
37b96ef26b 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 db45efa647)
2015-11-16 12:02:24 -08:00
Tao Bao
116977c7db 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 575d68a48e)
2015-11-16 12:02:24 -08:00
Tao Bao
60ad0cdc22 build: Don't call make_recovery_patch if there's no recovery.
Change-Id: I7ae57f6d69293645f88cbe9cc61b7cbbe8d12430
(cherry picked from commit cbc6dc29d6)
2015-11-16 12:02:24 -08:00
Dan Albert
e10bb316b1 Fix using libc++_static in dynamic binaries.
Change-Id: Ia1f37c4c7ab2eb913c8aa29d80b86e44f7bc766d
(cherry picked from commit 2a4a023a54)
2015-11-16 12:02:24 -08:00
Dan Albert
ea07676552 Cleanup libc++ configuration.
Change-Id: Id1eeeb23466b04a4fe64c04e1768b98a1068b5a8
(cherry picked from commit 0ad5bd22c8)
2015-11-16 12:02:24 -08:00
Bart Sears
7b67e0dd73 Revert "Change version back to 6.0" am: 55a149b740
am: 550b317688

* commit '550b317688211118d8f2c50aaa80d2616903807b':
  Revert "Change version back to 6.0"
2015-11-15 18:02:33 +00:00
Bart Sears
e373f066fb Change version back to 6.0 am: 970f203b3d
am: 3a37a0cefd

* commit '3a37a0cefd7599fa769fd86f7d64d781aaa88be7':
  Change version back to 6.0
2015-11-15 18:02:26 +00:00
Bart Sears
550b317688 Revert "Change version back to 6.0"
am: 55a149b740

* commit '55a149b74064b799efe9c69211a511725cb9925b':
  Revert "Change version back to 6.0"
2015-11-15 17:59:44 +00:00
Bart Sears
3a37a0cefd Change version back to 6.0
am: 970f203b3d

* commit '970f203b3d3f17b778749c3ce47eb6b922aa606c':
  Change version back to 6.0
2015-11-15 17:59:32 +00:00
Bart Sears
55a149b740 Revert "Change version back to 6.0"
This reverts commit 970f203b3d.

Change-Id: Icd96990f128e303b0e2af5af0f0d4a0f7731fe60
2015-11-15 17:57:13 +00:00
Bart Sears
970f203b3d Change version back to 6.0
Temporarily set the version back to 6.0 and security patch to
2015-11-01.

Change-Id: Idb09d6bab89362b18ae9657e3ed931d614c1894b
2015-11-14 23:50:18 -08:00
Vince Harron
796f000346 Switch emulator to generate userdebug images by default
am: ba740ff57f

* commit 'ba740ff57fd314d0ad649c252841ab834e96fdaa':
  Switch emulator to generate userdebug images by default
2015-11-11 19:37:38 +00:00
Vince Harron
ba740ff57f 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)
2015-11-11 16:32:54 +00:00
Griff Hazen
3943e48c6e 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
2015-11-08 01:00:58 +00:00
Griff Hazen
20ed978ada 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
2015-11-07 16:44:54 -08:00
Zach Jang
e23d93a7f2 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
2015-10-27 00:52:13 +00:00
Zach Jang
eca2b655e5 Merge "Update security string to 2015-12-01" into mnc-dev am: 54cb940c4a
am: dfd3524f7b

* commit 'dfd3524f7b1fb2f0346eee7fa0dc42e8888f68aa':
  Update security string to 2015-12-01
2015-10-27 00:48:30 +00:00
Zach Jang
dfd3524f7b Merge "Update security string to 2015-12-01" into mnc-dev
am: 54cb940c4a

* commit '54cb940c4a07701212e96f77ee4a89493b0f251b':
  Update security string to 2015-12-01
2015-10-27 00:44:56 +00:00
Zach Jang
54cb940c4a Merge "Update security string to 2015-12-01" into mnc-dev 2015-10-27 00:37:40 +00:00
Zach Jang
3c407e4573 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
2015-10-27 00:02:12 +00:00
Zach Jang
a3b35dec78 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
2015-10-26 23:57:13 +00:00
Zach Jang
07e2c19536 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
2015-10-26 23:52:50 +00:00
Zach Jang
0e8cf97670 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
2015-10-26 23:49:22 +00:00
Zach Jang
fe64ce145e 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
2015-10-26 23:46:01 +00:00
Zach Jang
cc9ac27157 Update security string to 2015-12-01 - DO NOT MERGE
am: 6575d4a2a8

* commit '6575d4a2a8c78a703e5c2e2889ecb358668d1bbd':
  Update security string to 2015-12-01 - DO NOT MERGE
2015-10-26 23:42:57 +00:00
Zach Jang
19eec07122 Update security string to 2015-12-01
Change-Id: I2e07d57e457effdcf685203dabfcfefa47c70bf3
2015-10-22 15:03:14 -07:00
Zach Jang
6575d4a2a8 Update security string to 2015-12-01 - DO NOT MERGE
Change-Id: I155ec6c2b57c899f20bb85f5a5cf031499ba81b0
2015-10-22 15:00:30 -07:00
Ian Pedowitz
4919ed4afc Bump Android to 6.0.1 am: 0a20c942c4
am: 1f9ba9f89e

* commit '1f9ba9f89eacd2b16805cf138df16e211b51b700':
  Bump Android to 6.0.1
2015-10-22 21:59:20 +00:00
Zach Jang
5e994e0d9c Update security string to 2015-12-01 am: 0f1512bc03
am: 7b4c7fe5b7

* commit '7b4c7fe5b77e55ede46f0b3fd5eb4a98964ff956':
  Update security string to 2015-12-01
2015-10-22 21:59:13 +00:00
Ian Pedowitz
1f9ba9f89e Bump Android to 6.0.1
am: 0a20c942c4

* commit '0a20c942c4bb110ebd971e7959ed1b2fa53e452a':
  Bump Android to 6.0.1
2015-10-22 21:53:27 +00:00
Zach Jang
7b4c7fe5b7 Update security string to 2015-12-01
am: 0f1512bc03

* commit '0f1512bc03b7820a2b9b93757a2309fb872f6677':
  Update security string to 2015-12-01
2015-10-22 21:53:13 +00:00
Ian Pedowitz
0a20c942c4 Bump Android to 6.0.1
Bug: 24777474
Change-Id: Ibaca3c2d583aa92c8ca998b6d380ee720b71b1b8
2015-10-22 21:46:00 +00:00
Zach Jang
0f1512bc03 Update security string to 2015-12-01
Change-Id: I525bab4579449dd285ba87d7ddc9cb36223bf7fd
2015-10-19 17:57:33 -07:00
Tao Bao
512d7b87dc 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.
2015-10-17 01:27:16 +00:00
Tao Bao
1280fa01bd 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.
2015-10-17 01:23:02 +00:00
Tao Bao
09ee6daa7f 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.
2015-10-17 01:19:15 +00:00
Tao Bao
bc5e85afc9 Merge "DO NOT MERGE releasetools: Always write the last block if it's padded." into mnc-dev 2015-10-17 01:15:39 +00:00
Tao Bao
9cc6c37a54 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.
2015-10-17 00:18:27 +00:00
Tao Bao
5631d5c6e1 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.
2015-10-17 00:13:36 +00:00
Tao Bao
46ae586ab2 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.
2015-10-17 00:09:35 +00:00
Tao Bao
e09359abc0 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 aac4ad56b6
that fixes a bug in commit 6f0b219ac5.

Bug: 24898607
Change-Id: I4ea6037dad7061e1683661fc4c394fa3a7a7c5cd
(cherry picked from commit 6f0b219ac5)
2015-10-16 15:47:51 -07:00
Tao Bao
3203bc10f0 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 7589e961a7)
2015-10-16 14:46:46 -07:00
Dan Willemsen
aaa03edef9 am b70b496f: am 57a64e01: Add all-named-(dirs|files)-under and related
* commit 'b70b496fd7574120e61e5e4ea3d63cf6192ba785':
  Add all-named-(dirs|files)-under and related
2015-10-14 03:58:06 +00:00
Dan Willemsen
1ed3bb79a9 am 2473c641: am 7a74e5ee: Add all-cpp-files-under
* commit '2473c641baef739bed99c13036200ad8e9812d75':
  Add all-cpp-files-under
2015-10-14 03:58:05 +00:00
Dan Willemsen
b2415086f6 am 304d073b: am 76a89d3a: Sort all files found via
* commit '304d073b83a8e8eb7d143945996b7c279807abd4':
  Sort all files found via $(shell find)
2015-10-14 03:58:04 +00:00
Dan Willemsen
b70b496fd7 am 57a64e01: Add all-named-(dirs|files)-under and related
* commit '57a64e015c0dd670f9adf5a2016526678ce96a1e':
  Add all-named-(dirs|files)-under and related
2015-10-14 03:52:38 +00:00
Dan Willemsen
2473c641ba am 7a74e5ee: Add all-cpp-files-under
* commit '7a74e5ee0e6c41395493d9259ccfff80717a4eaf':
  Add all-cpp-files-under
2015-10-14 03:52:37 +00:00
Dan Willemsen
304d073b83 am 76a89d3a: Sort all files found via
* commit '76a89d3a0a39ffa2c9172728165da42c3b3379be':
  Sort all files found via $(shell find)
2015-10-14 03:52:37 +00:00
Dan Willemsen
57a64e015c 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
2015-10-13 16:14:57 -07:00
Dan Willemsen
7a74e5ee0e 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
2015-10-13 16:14:53 -07:00