Commit graph

34610 commits

Author SHA1 Message Date
Dan Willemsen
cb43c0f8db Merge "TARGET_RECOVERY_UPDATER_LIBS should not be used with AB updates" am: 81648927fb
am: ce324c6848

Change-Id: I1260ea1bba7de40cb0f9a3661f281406f48cd708
2017-01-05 22:51:44 +00:00
Dan Willemsen
ce324c6848 Merge "TARGET_RECOVERY_UPDATER_LIBS should not be used with AB updates"
am: 81648927fb

Change-Id: I34c35cdd94e2251109275de38520b7059529ee5a
2017-01-05 22:48:11 +00:00
Dan Willemsen
81648927fb Merge "TARGET_RECOVERY_UPDATER_LIBS should not be used with AB updates" 2017-01-05 22:42:07 +00:00
Dan Cashman
6f1ea7101f Split seapp_contexts into plat and nonplat components.
Bug: 33746381
Test: Device boots with no extra denials.
Change-Id: Ib403be429562f5e22ed4dd042fb04b0795b558db
2017-01-05 12:56:24 -08:00
dcashman
b52f040bec Build split file_contexts.
Bug: 31363362
Test: Device uses new file_contexts files for labeling decisions.
Change-Id: I33c3297a2ec806f4b9f5dd25f3dd20c4b1001641
Signed-off-by: Sandeep Patil <sspatil@google.com>
2017-01-05 11:25:13 -08:00
Patrick Tjin
37a73e0f09 build_image: add support for specifying number of inodes [DO NOT MERGE]
Add support for specifying number of inodes when creating
system, vendor, oem partitions.  These are all read-only
and have no use for extra inodes.  Removing extra inodes
saves a lot of space.

Bug: 32246383
Bug: 33252070
Bug: 33428604
Change-Id: I13f1d4614b64a4abc752c42a1c65d3d151481c21
2017-01-05 11:19:43 -08:00
Lingfeng Yang
e1b174f11c Allow /dev/goldfish_sync
manual cherry pick of:
https://googleplex-android-review.git.corp.google.com/#/c/1024926/

Change-Id: I41883eafd2b261d000c41eaf3ba04af7e2b89349
(cherry picked from commit 10bbf13fe7a3c2bfa28a4f560bb6f85de4edf786)
2017-01-05 18:54:59 +00:00
Dan Willemsen
00cf76767f TARGET_RECOVERY_UPDATER_LIBS should not be used with AB updates
Also mark these variables as readonly so that later Android.mk cannot
change them.

Bug: 33607778
Test: build/tools/kati_all_products.sh -j12
Change-Id: I5f9a4df02bfdfd56549728f074bbb3fc251edb3d
2017-01-04 17:36:30 -08:00
Elliott Hughes
19aabae006 Merge changes from topic 'fsconfig2-fixups' am: abf3dbe248 am: 2fe7f7a402 am: cd43ea88e5
am: a2838a8427

Change-Id: Ia464313ada5d7631639e9e86c85b0c2f688cde29
2017-01-05 00:39:26 +00:00
William Roberts
fc6ab0c42c fsconfig: fix pylint warning am: 4165c635b8 am: 3f9be0b6ae am: d469a347fb
am: 04a672bdb6

Change-Id: I35ee3d659ccf377fcbef2df3b526f9334f9823a4
2017-01-05 00:39:18 +00:00
William Roberts
ceec74b6f9 fsconfig: fix style formating with yapf am: 820421c9b5 am: 529b397e83 am: e344c7672c
am: 37e403e4a3

Change-Id: I6132dc60a93247247ae8045d9afca260571f908f
2017-01-05 00:39:12 +00:00
Elliott Hughes
a2838a8427 Merge changes from topic 'fsconfig2-fixups' am: abf3dbe248 am: 2fe7f7a402
am: cd43ea88e5

Change-Id: I4bfa97c683d5d04cbe5130ea25d1788a5fd9357f
2017-01-05 00:36:52 +00:00
William Roberts
04a672bdb6 fsconfig: fix pylint warning am: 4165c635b8 am: 3f9be0b6ae
am: d469a347fb

Change-Id: Ie0a9cd1b3f1d1893d756668029c43f1420807a20
2017-01-05 00:36:47 +00:00
William Roberts
37e403e4a3 fsconfig: fix style formating with yapf am: 820421c9b5 am: 529b397e83
am: e344c7672c

Change-Id: I995e36f93a8d0e0ef87de429744c989d87dc8ed7
2017-01-05 00:36:41 +00:00
Elliott Hughes
cd43ea88e5 Merge changes from topic 'fsconfig2-fixups' am: abf3dbe248
am: 2fe7f7a402

Change-Id: If119f71509b9e11668d526ce965880271d004487
2017-01-05 00:34:23 +00:00
William Roberts
d469a347fb fsconfig: fix pylint warning am: 4165c635b8
am: 3f9be0b6ae

Change-Id: Iad144edd409640385a69ce0f5c35048d30a494f9
2017-01-05 00:34:16 +00:00
William Roberts
e344c7672c fsconfig: fix style formating with yapf am: 820421c9b5
am: 529b397e83

Change-Id: Ie42a5e8732a8c963334c5e3a5d38a232dccd75a5
2017-01-05 00:34:10 +00:00
Elliott Hughes
2fe7f7a402 Merge changes from topic 'fsconfig2-fixups'
am: abf3dbe248

Change-Id: I0149e85d05c3fb60f8ab0e878a3a8172a1edaede
2017-01-05 00:31:18 +00:00
William Roberts
3f9be0b6ae fsconfig: fix pylint warning
am: 4165c635b8

Change-Id: Ic417993b369e152754887ed48b087fc2f5eea0c9
2017-01-05 00:31:16 +00:00
William Roberts
529b397e83 fsconfig: fix style formating with yapf
am: 820421c9b5

Change-Id: Ib23e0fb880903881efa34f243889a203026a80d3
2017-01-05 00:31:10 +00:00
Elliott Hughes
abf3dbe248 Merge changes from topic 'fsconfig2-fixups'
* changes:
  fsconfig: fix pylint warning
  fsconfig: fix style formating with yapf
2017-01-05 00:26:04 +00:00
Dan Willemsen
3196fb81a1 Merge changes from topic 'build-vts-zip' am: d0c693ff64 am: a50ead8336 am: d63d5fffcd
am: 0f74b8a26b

Change-Id: I9c13c4f105e7ee952cdd3ecc10bce9791a89000c
2017-01-04 23:13:37 +00:00
Keun Soo Yim
ac32e9c346 delete vts.mk (which is moved to test/vts) am: 18a316c161 am: ed61c29cfd am: f1125508ba
am: 9ab61d6739

Change-Id: Ia9b1acff1d2e69ccedf59eab200baa110e968a6b
2017-01-04 23:13:31 +00:00
Keun Soo Yim
023d34289f include VTS packaging task files am: b74649d027 am: 33f6d707fa am: 03616abb42
am: f6e2dad822

Change-Id: Iae399e0eecd12b861cc9faef27f96399059e3b6e
2017-01-04 23:13:26 +00:00
Dan Willemsen
0f74b8a26b Merge changes from topic 'build-vts-zip' am: d0c693ff64 am: a50ead8336
am: d63d5fffcd

Change-Id: I174d13d97cb54760688e5b4cd1fe79e1a5553e9f
2017-01-04 23:10:36 +00:00
Keun Soo Yim
9ab61d6739 delete vts.mk (which is moved to test/vts) am: 18a316c161 am: ed61c29cfd
am: f1125508ba

Change-Id: Ib803efe818f406d5e12e408969902114ed2c5b30
2017-01-04 23:10:30 +00:00
Keun Soo Yim
f6e2dad822 include VTS packaging task files am: b74649d027 am: 33f6d707fa
am: 03616abb42

Change-Id: I0e134d05415e5bd79c4e8c16795ddb66a8d05501
2017-01-04 23:10:25 +00:00
Dan Willemsen
d63d5fffcd Merge changes from topic 'build-vts-zip' am: d0c693ff64
am: a50ead8336

Change-Id: I409e26a885e5361a23c6bbae9c8fc994e45f7fcd
2017-01-04 23:08:37 +00:00
Keun Soo Yim
f1125508ba delete vts.mk (which is moved to test/vts) am: 18a316c161
am: ed61c29cfd

Change-Id: If7f214225e07c3b5789d2d79b808c432c92fee27
2017-01-04 23:08:31 +00:00
Keun Soo Yim
03616abb42 include VTS packaging task files am: b74649d027
am: 33f6d707fa

Change-Id: Ia84408c4ea3215acefd3f666525df397d868fc52
2017-01-04 23:08:25 +00:00
Dan Willemsen
a50ead8336 Merge changes from topic 'build-vts-zip'
am: d0c693ff64

Change-Id: Ic2b1d3165c4da7d89080f3016286a4a7ed815b2b
2017-01-04 23:05:35 +00:00
Keun Soo Yim
ed61c29cfd delete vts.mk (which is moved to test/vts)
am: 18a316c161

Change-Id: I1853517cff9d3697143b8c5c2fd6459e502040c4
2017-01-04 23:05:34 +00:00
Keun Soo Yim
33f6d707fa include VTS packaging task files
am: b74649d027

Change-Id: I94d3ceb03b7815b49291ca127fdd41a8affca8fe
2017-01-04 23:05:29 +00:00
Dan Willemsen
d0c693ff64 Merge changes from topic 'build-vts-zip'
* changes:
  delete vts.mk (which is moved to test/vts)
  include VTS packaging task files
2017-01-04 22:58:54 +00:00
Keun Soo Yim
18a316c161 delete vts.mk (which is moved to test/vts)
Test: m -j vts
Change-Id: I3ab29e59b6f77f3ac92bbfe7a6f7a8f36b2ba3bd
(cherry picked from commit a942dc8433)
2017-01-04 13:16:33 -08:00
Keun Soo Yim
b74649d027 include VTS packaging task files
Test: m -j vts
Change-Id: I8737412bf4e7b5c2db32325105e7c588949b959d
(cherry picked from commit 199a710f73)
2017-01-04 13:16:33 -08:00
William Roberts
4165c635b8 fsconfig: fix pylint warning
Fix pylint warning:
W:292,47: Cell variable lineno defined in loop (cell-var-from-loop)

For the closure function that prints the error message, we actually
want the value of modified lineno within the closure.

Test: run unit tests

Change-Id: I7d08184563d347c826ca1af7558fb8e378f151e1
Signed-off-by: William Roberts <william.c.roberts@intel.com>
2017-01-04 18:22:05 +00:00
William Roberts
820421c9b5 fsconfig: fix style formating with yapf
A few changes got introduced that yapf re-styles. To make it easy,
keep this file formated to:

yapf -i --style=google fs_config_generator.py

Test: run unit tests

Change-Id: I3160b92d7fd07a4d315dde59f1d20fe4c7587da1
Signed-off-by: William Roberts <william.c.roberts@intel.com>
2017-01-04 18:21:28 +00:00
Hung-ying Tyan
c290723f4b Merge "Define TARGET_OUT_VENDOR_APPS_PRIVILEGED for 2nd arch" am: 1a4a0a4539 am: 82e3d0d007 am: 150db0ea6f
am: 7218cfb462

Change-Id: Iba954ad2ab7a387000254c153ceec1ae2902ee85
2017-01-04 02:52:49 +00:00
Hung-ying Tyan
7218cfb462 Merge "Define TARGET_OUT_VENDOR_APPS_PRIVILEGED for 2nd arch" am: 1a4a0a4539 am: 82e3d0d007
am: 150db0ea6f

Change-Id: I1b0fddf2b72e47a38bdac605819dbab4f6f2dd84
2017-01-04 02:50:18 +00:00
Hung-ying Tyan
150db0ea6f Merge "Define TARGET_OUT_VENDOR_APPS_PRIVILEGED for 2nd arch" am: 1a4a0a4539
am: 82e3d0d007

Change-Id: I65daac2e70657ae651a705d3768555ab1b727d05
2017-01-04 02:48:19 +00:00
Hung-ying Tyan
82e3d0d007 Merge "Define TARGET_OUT_VENDOR_APPS_PRIVILEGED for 2nd arch"
am: 1a4a0a4539

Change-Id: Ic1bee5c763d5375c676f96db273d3126c85dd85b
2017-01-04 02:46:19 +00:00
Treehugger Robot
1a4a0a4539 Merge "Define TARGET_OUT_VENDOR_APPS_PRIVILEGED for 2nd arch" 2017-01-04 02:44:04 +00:00
Elliott Hughes
5317a94798 Merge "fs_config: Fix oem range parsing" am: ce6c8e629f am: c16a64b832 am: d7217e2847
am: 83e65d0e9f

Change-Id: I6a03aa3801ba64f5596a4b60b1577a890f7c1ad5
2017-01-04 00:48:41 +00:00
Elliott Hughes
83e65d0e9f Merge "fs_config: Fix oem range parsing" am: ce6c8e629f am: c16a64b832
am: d7217e2847

Change-Id: Ibb5896d37c2ca354e35d392cebde8ad22b6e60f8
2017-01-04 00:46:10 +00:00
Elliott Hughes
d7217e2847 Merge "fs_config: Fix oem range parsing" am: ce6c8e629f
am: c16a64b832

Change-Id: Iafb13daaa210eea2c19e11eb1d9b2d94a5d047bb
2017-01-04 00:44:11 +00:00
Elliott Hughes
c16a64b832 Merge "fs_config: Fix oem range parsing"
am: ce6c8e629f

Change-Id: I74d198a2638b875233859a1c7ff723b04b47a353
2017-01-04 00:41:40 +00:00
Elliott Hughes
ce6c8e629f Merge "fs_config: Fix oem range parsing" 2017-01-04 00:37:58 +00:00
Tao Bao
eee32c7b4a Merge "blockimgdiff.py: Clean up stash id computation in BBOTA v3+." am: 7cfc591596 am: 74b665fef1 am: 085daa6451
am: 6fbb51cb57

Change-Id: Ie9dd316576355899e0009b1c04ebca544a8e3a16
2017-01-03 23:55:18 +00:00
Tao Bao
6fbb51cb57 Merge "blockimgdiff.py: Clean up stash id computation in BBOTA v3+." am: 7cfc591596 am: 74b665fef1
am: 085daa6451

Change-Id: I0304bebe8645c4f95925d28e38f91184395a8b29
2017-01-03 23:52:22 +00:00