OSDN Git Service

android-x86/build.git
8 years agoreleasetools: Fix the bug with TARGET_NO_RECOVERY.
Tao Bao [Fri, 20 Nov 2015 01:05:46 +0000 (17:05 -0800)]
releasetools: Fix the bug with TARGET_NO_RECOVERY.

The packaging script is broken when we set TARGET_NO_RECOVERY and
SYSTEM_ROOT_IMAGE both. With TARGET_NO_RECOVERY set, we don't have
RECOVERY/RAMDISK/etc/recovery.fstab. It thus fails the assertion that
"/" must exist in fstab when enabling SYSTEM_ROOT_IMAGE.

Change-Id: Id509d724f18be7cf7389dd786924ead894ac0cc1
(cherry picked from commit 48550cceb0bc4a7a0ec05aa87f8b5872b9ac7246)

8 years agoOverride properties that point to out/ directory.
Tao Bao [Sun, 19 Jul 2015 09:38:53 +0000 (02:38 -0700)]
Override properties that point to out/ directory.

A few properties are stored as links to the files in the out/
directory, which are no longer available when (re)packing from
target_files zip. Redirect those properties to the actual files in
the unzipped directory when repacking.

Change-Id: I18e930cbea224ab9c6db8d4e721b1c266a671db6
(cherry picked from commit 84e7568b1fb6264c8a0b8e38ef8ed4ec78325061)

8 years agoPack file_contexts into target_files zip.
Tao Bao [Thu, 9 Jul 2015 18:51:16 +0000 (11:51 -0700)]
Pack file_contexts into target_files zip.

file_contexts (specified by SELINUX_FC) is needed both when building
and (re)packaging. We used to use the copy in out/ when building, and
looked for the copy in BOOT/RAMDISK/ when packaging from target_files
zip. With system_root_image enabled, the file_contexts needed for
building and packaging might be different from the one on device. So
we explicitly pack the file as META/file_contexts in target_files zip.

Also refactor out the overriding of selinux_fc property into
common.LoadInfoDict().

Change-Id: I0781a147319148c76d989d8f29d5ef766a502dbd
(cherry picked from commit aa7318c3849095aeb3bea00efbf303c0c40a089d)

8 years agoRename UPDATE_AB_PARTITIONS to AB_OTA_PARTITIONS.
Alex Deymo [Fri, 23 Oct 2015 01:15:27 +0000 (18:15 -0700)]
Rename UPDATE_AB_PARTITIONS to AB_OTA_PARTITIONS.

In order to have all the A/B updater variables in the same AB_OTA_
namespace we rename UPDATE_AB_PARTITIONS to AB_OTA_PARTITIONS.

Bug: None
Test: `make dist` includes the partitions.txt file if properly configured.

Change-Id: Ied4faabd7e2f0ab8a5007afb44ad2f38df8d630d
(cherry picked from commit 49be2b115c558505e0f5972e5758dcea9b3f0bde)

8 years agoPack META/ab_partitions.txt when using the A/B OTA updater.
Alex Deymo [Fri, 2 Oct 2015 00:38:09 +0000 (17:38 -0700)]
Pack META/ab_partitions.txt when using the A/B OTA updater.

The list of A/B partitions updated is product-specific. Normally you
would update boot and system, but the product could require to update
other partitions during a system update. This patch packages the list
of A/B partitions configured to be updated when using the A/B updater.
The list can be set in the product makefile by setting the make
variable UPDATE_AB_PARTITIONS.

Bug: 24387863
Test: `make dist` creates the META/ab_partitions.txt in the target_files.zip

Change-Id: I4226ab05c7c7cd74721b06f1da64c6cf4d0e52ac
(cherry picked from commit 8925d334c3d9932526242ad78ec7a0c23627c3a8)

8 years agoDO NOT MERGE Pack the update_engine_config.txt when using the A/B OTA updater.
Alex Deymo [Wed, 30 Sep 2015 02:05:37 +0000 (19:05 -0700)]
DO NOT MERGE Pack the update_engine_config.txt when using the A/B OTA updater.

This config file pulled directly from the source specifies the update
payload version supported by the code. When generating an incremental
update payload for the A/B updater, the generated payload format will
match the version supported by the old version.

Bug: 24406755
Test: `make dist` on Brillo.

Change-Id: Ib7ac6828d0d34eb31e786dbaae5d59ecf26c3576
(cherry picked from commit 70067acd663df3fb0a747085f3d928c4b1777154)

8 years agoInvoke the aidl-cpp compiler to generate C++
Christopher Wiley [Thu, 15 Oct 2015 00:27:24 +0000 (17:27 -0700)]
Invoke the aidl-cpp compiler to generate C++

(cherry picked from commit 2df75d17a8d7aacd538cf1c34cf4e11c2af53251)

Bug: 23599697
Change-Id: Iae25f62fa9e2375a36d1a930887b2bcfd9e3f8a2
Test: test application compiles generated code

8 years agoreleasetools: Pack updatable images into IMAGES/ for A/B update.
Tao Bao [Tue, 17 Nov 2015 00:32:27 +0000 (16:32 -0800)]
releasetools: Pack updatable images into IMAGES/ for A/B update.

Vendor-specific images (radio, bootloader and etc) used to stay in
RADIO/ in target_files zip. A/B updater expects them to be available
under IMAGES/. Make a copy for such images when calling
add_img_to_target_files.py.

We cannot move them directly from RADIO/ to IMAGES/, because we will
delete everything under IMAGES/ when signing for release.

Bug: 25674625
Change-Id: I1c260c1d9fc069c258b2c19cf3831f833d2fa1cf
(cherry picked from commit a0421cd1bd2398589f2292dfd92ba802110e98e1)

8 years agoAdd ro.build.ab_update property.
Tao Bao [Wed, 11 Nov 2015 18:22:48 +0000 (10:22 -0800)]
Add ro.build.ab_update property.

Set ro.build.ab_update if AB_OTA_UPDATER is true. Device will depend on
this property to call the proper update API.

Change-Id: I5916ef5b30ea3351d323382f7ce83a17df2b0a70

8 years agobuild: Fix "adb shell" in recovery for system_root_image.
Tao Bao [Thu, 30 Jul 2015 21:34:01 +0000 (14:34 -0700)]
build: Fix "adb shell" in recovery for system_root_image.

For system images that contain the root directory, "adb shell" in
recovery stops working if the image is mounted at "/system", because
sh now locates at /system/system/bin/sh. We fix the issue by mounting
the image on /system_root and create a symlink to /system_root/system
for /system.

Bug: 22855115
Change-Id: Ia6b257b75aeb67687c3909063d1725a23a5ccd60

8 years agoreleasetools: Support packaging for system_root_image.
Tao Bao [Wed, 22 Jul 2015 01:01:20 +0000 (18:01 -0700)]
releasetools: Support packaging for system_root_image.

For system images that contain the root directory, we need to find the
root directory at ROOT/ instead of BOOT/RAMDISK/.

 Conflicts:
tools/releasetools/common.py

Change-Id: Ica345c8b1b03475f8ac6c44fd576045fcf17c882

8 years agobuild: Support packaging for system_root_image.
Tao Bao [Wed, 22 Jul 2015 01:01:20 +0000 (18:01 -0700)]
build: Support packaging for system_root_image.

If system image contains the root directory
(BOARD_BUILD_SYSTEM_ROOT_IMAGE == "true"), we package the root directory
into ROOT/ instead of BOOT/RAMDISK/ in the target_files zip.

Change-Id: I817776ca97194991308b2131d0e34ab136283464

8 years agoSupport systems that use a full copy of recovery image.
Tao Bao [Wed, 22 Jul 2015 19:33:18 +0000 (12:33 -0700)]
Support systems that use a full copy of recovery image.

If BOARD_USES_FULL_RECOVERY_IMAGE == true, a full copy of recovery
image will be carried as /system/etc/recovery.img instead of a patch
at /system/recovery_from_boot.p.

Bug: 22641135
Change-Id: Ie271d3e2d55d7b003f667ac5b44203d69b23c63b
(cherry picked from commit 8beab69bd5d728810aca55536017912e65777bb8)

8 years agobuild: core: Fix issue in recovery
Daniel Rosenberg [Tue, 2 Jun 2015 23:40:58 +0000 (16:40 -0700)]
build: core: Fix issue in recovery

Now that symlinks are created at build time, the rsync while
making recovery runs into issues around the etc symlink

Change-Id: Ie781507b22e4661629840075b274eaab2f712de6

8 years agoAdd support for system images that contain the root directory
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

8 years agoAdd ro.build.system_root_image
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

8 years agoHonor TARGET_NO_RECOVERY flag.
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)

8 years agoDO NOT MERGE Change the cache partition size check into warnings.
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)

8 years agobuild: Don't call make_recovery_patch if there's no recovery.
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)

8 years agoFix using libc++_static in dynamic binaries.
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)

8 years agoCleanup libc++ configuration.
Dan Albert [Wed, 6 May 2015 17:08:11 +0000 (10:08 -0700)]
Cleanup libc++ configuration.

Change-Id: Id1eeeb23466b04a4fe64c04e1768b98a1068b5a8
(cherry picked from commit 0ad5bd22c898cbf0e8d1e156dace080f4e11a0a1)

8 years agoRevert "Change version back to 6.0" am: 55a149b740
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"

8 years agoChange version back to 6.0 am: 970f203b3d
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

8 years agoRevert "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"

8 years agoChange 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

8 years agoRevert "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

8 years agoChange version back to 6.0
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

8 years agoSwitch emulator to generate userdebug images by default
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

8 years agoSwitch 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)

8 years agoLet qemu_props service set system properties in ro.emu and ro.emulator
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

8 years agoLet 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

8 years agoMerge "Update security string to 2015-12-01" into mnc-dev am: 54cb940c4a am: dfd3524f7b
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

8 years agoMerge "Update security string to 2015-12-01" into mnc-dev am: 54cb940c4a
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

8 years agoMerge "Update security string to 2015-12-01" into mnc-dev
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

8 years agoMerge "Update security string to 2015-12-01" into mnc-dev
Zach Jang [Tue, 27 Oct 2015 00:37:40 +0000 (00:37 +0000)]
Merge "Update security string to 2015-12-01" into mnc-dev

8 years agoUpdate security string to 2015-12-01 - DO NOT MERGE am: 6575d4a2a8 am: cc9ac27157...
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

8 years agoUpdate security string to 2015-12-01 - DO NOT MERGE am: 6575d4a2a8 am: cc9ac27157...
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

8 years agoUpdate security string to 2015-12-01 - DO NOT MERGE am: 6575d4a2a8 am: cc9ac27157...
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

8 years agoUpdate security string to 2015-12-01 - DO NOT MERGE am: 6575d4a2a8 am: cc9ac27157
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

8 years agoUpdate security string to 2015-12-01 - DO NOT MERGE am: 6575d4a2a8
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

8 years agoUpdate 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

8 years agoUpdate security string to 2015-12-01
Zach Jang [Thu, 22 Oct 2015 22:03:14 +0000 (15:03 -0700)]
Update security string to 2015-12-01

Change-Id: I2e07d57e457effdcf685203dabfcfefa47c70bf3

8 years agoUpdate security string to 2015-12-01 - DO NOT MERGE
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

8 years agoBump Android to 6.0.1 am: 0a20c942c4
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

8 years agoUpdate security string to 2015-12-01 am: 0f1512bc03
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

8 years agoBump Android to 6.0.1
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

8 years agoUpdate security string to 2015-12-01
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

8 years agoBump Android to 6.0.1
Ian Pedowitz [Sat, 10 Oct 2015 18:00:52 +0000 (11:00 -0700)]
Bump Android to 6.0.1

Bug: 24777474
Change-Id: Ibaca3c2d583aa92c8ca998b6d380ee720b71b1b8

8 years agoUpdate security string to 2015-12-01
Zach Jang [Tue, 20 Oct 2015 00:57:33 +0000 (17:57 -0700)]
Update security string to 2015-12-01

Change-Id: I525bab4579449dd285ba87d7ddc9cb36223bf7fd

8 years agoam 1280fa01: am 09ee6daa: am bc5e85af: Merge "DO NOT MERGE releasetools: Always write...
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.

8 years agoam 09ee6daa: am bc5e85af: Merge "DO NOT MERGE releasetools: Always write the last...
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.

8 years agoam bc5e85af: Merge "DO NOT MERGE releasetools: Always write the last block if it...
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.

8 years agoMerge "DO NOT MERGE releasetools: Always write the last block if it's padded." into...
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

8 years agoam 5631d5c6: am 46ae586a: am e09359ab: DO NOT MERGE Pass source\'s info_dict to vendo...
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.

8 years agoam 46ae586a: am e09359ab: DO NOT MERGE Pass source\'s info_dict to vendor\'s releaset...
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.

8 years agoam e09359ab: 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.

8 years agoDO 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)

8 years agoDO NOT MERGE releasetools: Always write the last block if it's padded.
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)

8 years agoam b70b496f: am 57a64e01: Add all-named-(dirs|files)-under and related
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

8 years agoam 2473c641: am 7a74e5ee: Add all-cpp-files-under
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

8 years agoam 304d073b: am 76a89d3a: Sort all files found via
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)

8 years agoam 57a64e01: Add all-named-(dirs|files)-under and related
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

8 years agoam 7a74e5ee: Add all-cpp-files-under
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

8 years agoam 76a89d3a: Sort all files found via
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)

8 years agoAdd all-named-(dirs|files)-under and related
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

8 years agoAdd all-cpp-files-under
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

8 years agoSort all files found via $(shell find)
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

8 years agoam 8638de1f: am ab4d8594: Switch from Calculator to ExactCalculator
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

8 years agoam ab4d8594: 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

8 years agoSwitch 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

8 years agoam ed48af8d: am b03d55aa: Merge "DO NOT MERGE: Only use a fixed timestamp when packag...
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.

8 years agoam b03d55aa: Merge "DO NOT MERGE: Only use a fixed timestamp when packaging." into...
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.

8 years agoMerge "DO NOT MERGE: Only use a fixed timestamp when packaging." into mnc-dr-dev
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

8 years agoam 43f24a32: am aecadc06: Merge "Don\'t add build number to apps\' version name for...
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.

8 years agoam aecadc06: Merge "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.

8 years agoMerge "Don't add build number to apps' version name for platform build." into mnc...
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

8 years agoDO NOT MERGE: Only use a fixed timestamp when packaging.
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)

8 years agoam fed4cf89: am 1b5eef1b: am b16edb5f: Merge "add unique ID to each windows download...
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.

8 years agoam 1b5eef1b: am b16edb5f: Merge "add unique ID to each windows download link. These...
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.

8 years agoam b16edb5f: Merge "add unique ID to each windows download link. These IDs are necess...
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.

8 years agoMerge "add unique ID to each windows download link. These IDs are necessary for the...
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

8 years agoadd unique ID to each windows download link.
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

8 years agoam a9b2f303: am 124a59ae: Reverting Android Security Patch Level string back to 2015...
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

8 years agoam 124a59ae: 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

8 years agoReverting 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

8 years agoam 848b8e9d: am fa2ce3b3: am f73f79f1: Merge "Use /filelist when OUT_DIR is set"...
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

8 years agoam fa2ce3b3: am f73f79f1: Merge "Use /filelist when OUT_DIR is set" into mnc-dev
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

8 years agoam f73f79f1: Merge "Use /filelist when OUT_DIR is set" into mnc-dev
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

8 years agoMerge "Use $OUT_DIR/filelist when OUT_DIR is set" into mnc-dev
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

8 years agoam 1b045b3d: am 5b08efb7: (-s ours) Don\'t fail build of otatools if there are no...
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

8 years agoam 5b08efb7: (-s ours) 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

8 years agoUse $OUT_DIR/filelist when OUT_DIR is set
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

8 years agoam d9cdf5be: am 22ff0124: (-s ours) Merge "add otatools-package target" into cw-d...
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

8 years agoam 22ff0124: (-s ours) Merge "add otatools-package target" into cw-d-mr1-dev
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

8 years agoam 98f3c213: am cb31a535: Dist the otatools package.
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.

8 years agoam cb31a535: 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.

8 years agoDon't fail build of otatools if there are no device certificates
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)

8 years agoMerge "add otatools-package target" into cw-d-mr1-dev
Baligh Uddin [Tue, 29 Sep 2015 21:53:25 +0000 (21:53 +0000)]
Merge "add otatools-package target" into cw-d-mr1-dev

8 years agoDist the otatools package.
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)

8 years agoadd otatools-package target
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)