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
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
cd43ea88e5
Merge changes from topic 'fsconfig2-fixups' am: abf3dbe248
...
am: 2fe7f7a402
2017-01-05 00:34:23 +00:00
William Roberts
d469a347fb
fsconfig: fix pylint warning am: 4165c635b8
...
am: 3f9be0b6ae
2017-01-05 00:34:16 +00:00
William Roberts
e344c7672c
fsconfig: fix style formating with yapf am: 820421c9b5
...
am: 529b397e83
2017-01-05 00:34:10 +00:00
Elliott Hughes
2fe7f7a402
Merge changes from topic 'fsconfig2-fixups'
...
am: abf3dbe248
2017-01-05 00:31:18 +00:00
William Roberts
3f9be0b6ae
fsconfig: fix pylint warning
...
am: 4165c635b8
2017-01-05 00:31:16 +00:00
William Roberts
529b397e83
fsconfig: fix style formating with yapf
...
am: 820421c9b5
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
d63d5fffcd
Merge changes from topic 'build-vts-zip' am: d0c693ff64
...
am: a50ead8336
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
2017-01-04 23:08:31 +00:00
Keun Soo Yim
03616abb42
include VTS packaging task files am: b74649d027
...
am: 33f6d707fa
2017-01-04 23:08:25 +00:00
Dan Willemsen
a50ead8336
Merge changes from topic 'build-vts-zip'
...
am: d0c693ff64
2017-01-04 23:05:35 +00:00
Keun Soo Yim
ed61c29cfd
delete vts.mk (which is moved to test/vts)
...
am: 18a316c161
2017-01-04 23:05:34 +00:00
Keun Soo Yim
33f6d707fa
include VTS packaging task files
...
am: b74649d027
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
150db0ea6f
Merge "Define TARGET_OUT_VENDOR_APPS_PRIVILEGED for 2nd arch" am: 1a4a0a4539
...
am: 82e3d0d007
2017-01-04 02:48:19 +00:00
Hung-ying Tyan
82e3d0d007
Merge "Define TARGET_OUT_VENDOR_APPS_PRIVILEGED for 2nd arch"
...
am: 1a4a0a4539
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
d7217e2847
Merge "fs_config: Fix oem range parsing" am: ce6c8e629f
...
am: c16a64b832
2017-01-04 00:44:11 +00:00
Elliott Hughes
c16a64b832
Merge "fs_config: Fix oem range parsing"
...
am: ce6c8e629f
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
085daa6451
Merge "blockimgdiff.py: Clean up stash id computation in BBOTA v3+." am: 7cfc591596
...
am: 74b665fef1
2017-01-03 23:50:20 +00:00
Tao Bao
74b665fef1
Merge "blockimgdiff.py: Clean up stash id computation in BBOTA v3+."
...
am: 7cfc591596
2017-01-03 23:48:21 +00:00
Tao Bao
7cfc591596
Merge "blockimgdiff.py: Clean up stash id computation in BBOTA v3+."
2017-01-03 23:44:41 +00:00
Richard Uhler
8a02582f70
Merge "Remove option for non-pic dex preopt." am: c184ef515c
...
am: ffb29d7497
2017-01-03 09:52:16 +00:00
Richard Uhler
ffb29d7497
Merge "Remove option for non-pic dex preopt."
...
am: c184ef515c
2017-01-03 09:44:21 +00:00
Treehugger Robot
c184ef515c
Merge "Remove option for non-pic dex preopt."
2017-01-03 09:39:39 +00:00
Johan Redestig
1552a28e5f
fs_config: Fix oem range parsing
...
Addresses the following build error:
"value" not in valid range [], got: 2901 for: "AID_ABC" file:\
"device/somc/abc/config.fs"
that happens when parsing device/somc/abc/config.fs:
[AID_ABC]
value: 2901
The problem is that the AID.PREFIX is 'AID_' so the _OEM_RANGE
expression is searching for AID__OEM_RESERVED, which never
exists. Drop the extra '_'.
Change-Id: I8a1556731e14e49cef66e3e91121e4be23a308e0
Test: ./build/tools/fs_config/fs_config_generator.py fsconfig --aid-header=system/core/include/private/android_filesystem_config.h device/somc/abc/config.fs
2017-01-03 09:45:33 +01:00
Tao Bao
3a2e350239
blockimgdiff.py: Clean up stash id computation in BBOTA v3+.
...
Only BBOTA v2 needs to maintain a pool of available 'stash slot id'.
BBOTA v3+ uses the hash of the stashed blocks as the slot id, which
doesn't need the id pool anymore.
Bug: 33694544
Test: Generate v2 and v4 incrementals w/ and w/o the CL. They produce
the same packages respectively.
Change-Id: I8121af5b6b1bee98c3639d54a00b06fd12e378e8
2016-12-28 09:26:46 -08:00
Elliott Hughes
9d5a9e7c6e
Merge "Revert "Revert "Merge changes from topic 'fsconfig-2'""" am: 5f60b74297
...
am: 71f582ac30
2016-12-27 21:09:07 +00:00
Elliott Hughes
8a2ed5159c
Revert "Revert "Merge changes from topic 'fsconfig-2'"" am: 2d7c86dfea
...
am: feb4f2e54a
2016-12-27 21:08:52 +00:00
Elliott Hughes
71f582ac30
Merge "Revert "Revert "Merge changes from topic 'fsconfig-2'"""
...
am: 5f60b74297
2016-12-27 21:01:24 +00:00
Elliott Hughes
feb4f2e54a
Revert "Revert "Merge changes from topic 'fsconfig-2'""
...
am: 2d7c86dfea
2016-12-27 21:01:23 +00:00
Elliott Hughes
5f60b74297
Merge "Revert "Revert "Merge changes from topic 'fsconfig-2'"""
2016-12-27 20:51:07 +00:00
Alan Viverette
670a4b4fa6
Merge "Update pathmap.mk for renderscript support library migration" am: cafc7efee0
...
am: 7621a86097
2016-12-23 03:15:04 +00:00
Alan Viverette
7621a86097
Merge "Update pathmap.mk for renderscript support library migration"
...
am: cafc7efee0
2016-12-23 03:08:34 +00:00
Treehugger Robot
cafc7efee0
Merge "Update pathmap.mk for renderscript support library migration"
2016-12-23 03:02:55 +00:00
Alan Viverette
e8b339d1d3
Update pathmap.mk for renderscript support library migration
...
am: b78260919d
2016-12-23 01:38:28 +00:00
Alan Viverette
cdeb44df2f
Update pathmap.mk for renderscript support library migration
...
Bug: 30255901
Change-Id: I213baaf4c76a7e5b8d20168624b74eb61582d215
(cherry picked from commit 49f03349c8
2016-12-22 17:32:20 -08:00
Alan Viverette
b78260919d
Update pathmap.mk for renderscript support library migration
...
Bug: 30255901
Change-Id: I213baaf4c76a7e5b8d20168624b74eb61582d215
(cherry picked from commit 49f03349c8
2016-12-23 00:55:56 +00:00
Colin Cross
5b0573233f
Merge "Update pathmap.mk for renderscript support library migration" into nyc-mr1-dev-plus-aosp
2016-12-23 00:54:33 +00:00
Dan Willemsen
bbf841d45f
Merge "Remove --ignore_dirty=$(OUT_DIR)/% from Kati flags" am: fb2efba189
...
am: 952d5adcde
2016-12-22 23:39:47 +00:00
Dan Willemsen
952d5adcde
Merge "Remove --ignore_dirty=$(OUT_DIR)/% from Kati flags"
...
am: fb2efba189
2016-12-22 23:33:46 +00:00
Dan Willemsen
fb2efba189
Merge "Remove --ignore_dirty=$(OUT_DIR)/% from Kati flags"
2016-12-22 23:27:38 +00:00
Alan Viverette
74b13397d9
Update pathmap.mk for renderscript support library migration
...
Bug: 30255901
Change-Id: I213baaf4c76a7e5b8d20168624b74eb61582d215
(cherry picked from commit 49f03349c8
2016-12-22 23:27:18 +00:00
