Commit Graph

23739 Commits

Author SHA1 Message Date
Andy Huang 624ecb988b Merge "remove Exchange2 from core.mk" into mnc-dr1.5-dev
am: 0936632c93

* commit '0936632c93caf436732a85bbf7beb3c5cecafd5b':
  remove Exchange2 from core.mk
2016-01-13 21:26:14 +00:00
Andy Huang 0936632c93 Merge "remove Exchange2 from core.mk" into mnc-dr1.5-dev 2016-01-13 21:23:07 +00:00
Zach Jang b0b568b5c8 Updating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43e am: 53e7d9bf7f am: c9da4cce57 am: 6c61548bb7 am: 6facd249d5
am: 1b29f2f9c9

* commit '1b29f2f9c97bc1b099712cd7c93c31e7f7a18ad1':
  Updating security patch string to 2016-03-01
2016-01-12 01:38:31 +00:00
Zach Jang 1b29f2f9c9 Updating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43e am: 53e7d9bf7f am: c9da4cce57 am: 6c61548bb7
am: 6facd249d5

* commit '6facd249d51ffef6afa369b11041ae07733883b8':
  Updating security patch string to 2016-03-01
2016-01-12 01:35:21 +00:00
Zach Jang 6facd249d5 Updating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43e am: 53e7d9bf7f am: c9da4cce57
am: 6c61548bb7

* commit '6c61548bb7e426704760c9351e3211fb45d67dae':
  Updating security patch string to 2016-03-01
2016-01-12 01:33:23 +00:00
Zach Jang 6c61548bb7 Updating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43e am: 53e7d9bf7f
am: c9da4cce57

* commit 'c9da4cce57d387f52b675d1024459af5e73c6dbc':
  Updating security patch string to 2016-03-01
2016-01-12 01:30:53 +00:00
Zach Jang c9da4cce57 Updating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43e
am: 53e7d9bf7f

* commit '53e7d9bf7f298c438157dccc5222b7484b083d9e':
  Updating security patch string to 2016-03-01
2016-01-12 01:28:37 +00:00
Zach Jang 53e7d9bf7f Updating security patch string to 2016-03-01 am: c24c6ccd4d
am: 293887c43e

* commit '293887c43ee5b797f8628f5983f64bf766002009':
  Updating security patch string to 2016-03-01
2016-01-12 01:26:41 +00:00
Zach Jang 293887c43e Updating security patch string to 2016-03-01
am: c24c6ccd4d

* commit 'c24c6ccd4d5de8be010b74b9021b8fdb926e1dad':
  Updating security patch string to 2016-03-01
2016-01-12 01:24:55 +00:00
Zach Jang c24c6ccd4d Updating security patch string to 2016-03-01
b/26499556

Change-Id: I18a5ad9d8d08e2050053bcebc1a9a0c46db86733
2016-01-11 17:12:37 -08:00
Zach Jang 4d64f608c3 DO NOT MERGE - Update security string to 2016-02-01 am: 929a4abd2b am: af970fb308 am: 41846b0063 -s ours am: db4d57a84c am: 02115bf55a am: 4c51cd1a9b
am: 3a68198b39

* commit '3a68198b39229ed24f6749a6f491072d04f1bac8':
  DO NOT MERGE - Update security string to 2016-02-01
2015-12-09 23:15:48 +00:00
Zach Jang 3a68198b39 DO NOT MERGE - Update security string to 2016-02-01 am: 929a4abd2b am: af970fb308 am: 41846b0063 -s ours am: db4d57a84c am: 02115bf55a
am: 4c51cd1a9b

* commit '4c51cd1a9b5c41e4092aef7c5fb4cc0364873a2c':
  DO NOT MERGE - Update security string to 2016-02-01
2015-12-09 23:13:05 +00:00
Zach Jang 4c51cd1a9b DO NOT MERGE - Update security string to 2016-02-01 am: 929a4abd2b am: af970fb308 am: 41846b0063 -s ours am: db4d57a84c
am: 02115bf55a

* commit '02115bf55a840790bbbca3c452a85bc97381522a':
  DO NOT MERGE - Update security string to 2016-02-01
2015-12-09 23:09:34 +00:00
Zach Jang 02115bf55a DO NOT MERGE - Update security string to 2016-02-01 am: 929a4abd2b am: af970fb308 am: 41846b0063 -s ours
am: db4d57a84c

* commit 'db4d57a84c8f0f6b51d9b69c2e0ec3ac825270c0':
  DO NOT MERGE - Update security string to 2016-02-01
2015-12-09 23:06:44 +00:00
Zach Jang 61fc840849 Update Security String to 2016-02-01 am: f0f73c06e2 am: 5e2b003a11 am: 8b5be4dd4f
am: 1536565dc3

* commit '1536565dc3ef67ad2e0ac7727554c29bb9638a97':
  Update Security String to 2016-02-01
2015-12-09 23:06:44 +00:00
Zach Jang db4d57a84c DO NOT MERGE - Update security string to 2016-02-01 am: 929a4abd2b am: af970fb308
am: 41846b0063  -s ours

* commit '41846b00633d3eba58193565c8f6c213006cea5d':
  DO NOT MERGE - Update security string to 2016-02-01
2015-12-09 23:03:18 +00:00
Zach Jang 1536565dc3 Update Security String to 2016-02-01 am: f0f73c06e2 am: 5e2b003a11
am: 8b5be4dd4f

* commit '8b5be4dd4f50266362f689d4c8f7d20fc25c5baf':
  Update Security String to 2016-02-01
2015-12-09 15:03:18 -08:00
Zach Jang 41846b0063 DO NOT MERGE - Update security string to 2016-02-01 am: 929a4abd2b
am: af970fb308

* commit 'af970fb308dd7914e8dccb56e8ea08d50e92e617':
  DO NOT MERGE - Update security string to 2016-02-01
2015-12-09 23:00:35 +00:00
Zach Jang 8b5be4dd4f Update Security String to 2016-02-01 am: f0f73c06e2
am: 5e2b003a11

* commit '5e2b003a116c8de6bfadf4b74d0cc676e0ed0d76':
  Update Security String to 2016-02-01
2015-12-09 23:00:35 +00:00
Zach Jang af970fb308 DO NOT MERGE - Update security string to 2016-02-01
am: 929a4abd2b

* commit '929a4abd2b777715bc730593aee87643a30706d6':
  DO NOT MERGE - Update security string to 2016-02-01
2015-12-09 14:57:15 -08:00
Zach Jang 5e2b003a11 Update Security String to 2016-02-01
am: f0f73c06e2

* commit 'f0f73c06e25e17ecf8e06f42c51efac102597f57':
  Update Security String to 2016-02-01
2015-12-09 14:57:15 -08:00
Zach Jang 929a4abd2b DO NOT MERGE - Update security string to 2016-02-01
b/26110717

Change-Id: Ifbb78b8c7cd5d2efa9e5501fc4e7216f336ccadc
2015-12-09 14:45:57 -08:00
Zach Jang f0f73c06e2 Update Security String to 2016-02-01
b/26110717

Change-Id: I1085f5d053b07c6c81d2ef22fbba5ab9157a67f2
2015-12-09 20:48:10 +00:00
Andy Huang 6019adf259 remove Exchange2 from core.mk
Change-Id: I962d706d19eef5bbde3abed516d0a674ba50c1c1
2015-12-09 12:21:49 -08:00
Vince Harron aba12deedb Shorten TARGET_BRAND from generic_<arch> to Android am: 5806531f92
am: e13b13c7f6

* commit 'e13b13c7f67b80a7e99147d76ce307d6bb5296db':
  Shorten TARGET_BRAND from generic_<arch> to Android
2015-11-24 22:54:42 +00:00
Vince Harron e13b13c7f6 Shorten TARGET_BRAND from generic_<arch> to Android
am: 5806531f92

* commit '5806531f92a3670362ec8dceafd0079d51afbd18':
  Shorten TARGET_BRAND from generic_<arch> to Android
2015-11-24 22:50:50 +00:00
Vince Harron 5806531f92 Shorten TARGET_BRAND from generic_<arch> to Android
Switching to userdebug emulator images increased ro.build.fingerprint
Past the 91 character limit.  This should bring the build server
builds under this limit.

Fixing it for local builds will be a bit more difficult.

Bug: 25829506

Change-Id: I7daee3478716adcb860cced1b770a2d00a72f1a2
(cherry picked from commit efbeab78d3581009b3da20991a3a83d733393f45)
2015-11-24 18:51:59 +00:00
Zach Jang 402e6d4c11 Update Security String to 2016-01-01 - DO NOT MERGE am: 58cdbdc5ad am: 645f200ae8 am: 2cd2a76c64 -s ours am: c7b96cdd5e am: 8909bdfc4a am: a68c55822c
am: 8e9728630b

* commit '8e9728630b2e552280b1e90b912e28d4b53dd93b':
  Update Security String to 2016-01-01 - DO NOT MERGE
2015-11-21 01:15:41 +00:00
Zach Jang 8e9728630b Update Security String to 2016-01-01 - DO NOT MERGE am: 58cdbdc5ad am: 645f200ae8 am: 2cd2a76c64 -s ours am: c7b96cdd5e am: 8909bdfc4a
am: a68c55822c

* commit 'a68c55822c115db2151b1d155566a06b01756d20':
  Update Security String to 2016-01-01 - DO NOT MERGE
2015-11-21 01:12:28 +00:00
Zach Jang a68c55822c Update Security String to 2016-01-01 - DO NOT MERGE am: 58cdbdc5ad am: 645f200ae8 am: 2cd2a76c64 -s ours am: c7b96cdd5e
am: 8909bdfc4a

* commit '8909bdfc4abd8ffc6511c864fe968530abe40b8a':
  Update Security String to 2016-01-01 - DO NOT MERGE
2015-11-21 01:07:24 +00:00
Zach Jang 8909bdfc4a Update Security String to 2016-01-01 - DO NOT MERGE am: 58cdbdc5ad am: 645f200ae8 am: 2cd2a76c64 -s ours
am: c7b96cdd5e

* commit 'c7b96cdd5e83ea7c62912bc779e7bc49c59023c7':
  Update Security String to 2016-01-01 - DO NOT MERGE
2015-11-21 01:01:49 +00:00
Zach Jang c7b96cdd5e Update Security String to 2016-01-01 - DO NOT MERGE am: 58cdbdc5ad am: 645f200ae8
am: 2cd2a76c64  -s ours

* commit '2cd2a76c64dead0b057b7e9a1223f67f9a9d2e7f':
  Update Security String to 2016-01-01 - DO NOT MERGE
2015-11-21 00:58:36 +00:00
Zach Jang daf00af42d Update Security String to 2016-01-01 to mnc-dev am: 170459f438 am: bcf2866fb1 am: 3ce70dfe46
am: 10c8949d75

* commit '10c8949d7503bad5450543774d8c0364d8c1fc36':
  Update Security String to 2016-01-01 to mnc-dev
2015-11-21 00:58:35 +00:00
Zach Jang 2cd2a76c64 Update Security String to 2016-01-01 - DO NOT MERGE am: 58cdbdc5ad
am: 645f200ae8

* commit '645f200ae8708414d06618989328dc3e3c84a917':
  Update Security String to 2016-01-01 - DO NOT MERGE
2015-11-21 00:55:17 +00:00
Zach Jang 10c8949d75 Update Security String to 2016-01-01 to mnc-dev am: 170459f438 am: bcf2866fb1
am: 3ce70dfe46

* commit '3ce70dfe467246c28290f8ca24c1f5319b46142b':
  Update Security String to 2016-01-01 to mnc-dev
2015-11-21 00:55:17 +00:00
Zach Jang 645f200ae8 Update Security String to 2016-01-01 - DO NOT MERGE
am: 58cdbdc5ad

* commit '58cdbdc5ad54f9c26d94860c2d0be712f88a8f07':
  Update Security String to 2016-01-01 - DO NOT MERGE
2015-11-21 00:51:39 +00:00
Zach Jang 3ce70dfe46 Update Security String to 2016-01-01 to mnc-dev am: 170459f438
am: bcf2866fb1

* commit 'bcf2866fb1ea50ea31ede70f62b864332f61b980':
  Update Security String to 2016-01-01 to mnc-dev
2015-11-21 00:51:39 +00:00
Zach Jang bcf2866fb1 Update Security String to 2016-01-01 to mnc-dev
am: 170459f438

* commit '170459f4385d35dd991549e1b545c376ca8df281':
  Update Security String to 2016-01-01 to mnc-dev
2015-11-21 00:48:16 +00:00
Zach Jang 170459f438 Update Security String to 2016-01-01 to mnc-dev
http://b/25819582

Change-Id: Ie55f9476110b08591da05774f582a6e48ce12de7
2015-11-20 22:55:19 +00:00
Zach Jang 58cdbdc5ad Update Security String to 2016-01-01 - DO NOT MERGE
http://b/25819582

Change-Id: I99d8ca004bb5d35613f3a2314597717f6b7c04c7
2015-11-20 22:54:48 +00:00
Tao Bao 448dccbc7d 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 48550cceb0)
2015-11-20 05:45:43 +00:00
Tao Bao cb219828ff 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 84e7568b1f)
2015-11-19 17:02:13 -08:00
Tao Bao a6a3aa9398 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 aa7318c384)
2015-11-20 00:58:26 +00:00
Alex Deymo d06e1c16d8 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 49be2b115c)
2015-11-18 21:22:49 -08:00
Alex Deymo d22f7eb3ec 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 8925d334c3)
2015-11-18 21:22:18 -08:00
Alex Deymo b6ef41dc30 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 70067acd66)
2015-11-18 20:45:33 -08:00
Christopher Wiley 7c6a7d09ba Invoke the aidl-cpp compiler to generate C++
(cherry picked from commit 2df75d17a8)

Bug: 23599697
Change-Id: Iae25f62fa9e2375a36d1a930887b2bcfd9e3f8a2
Test: test application compiles generated code
2015-11-17 17:50:41 +00:00
Tao Bao 26259ef4d7 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 a0421cd1bd)
2015-11-16 22:25:27 -08:00
Tao Bao 532fdf4479 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
2015-11-16 12:38:07 -08:00
Tao Bao f4d759930c 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
2015-11-16 12:38:07 -08:00