OSDN Git Service
Dan Cashman [Mon, 9 Jan 2017 20:47:54 +0000 (20:47 +0000)]
Merge "Split seapp_contexts into plat and nonplat components." am:
082e8e07ac am:
a44337de33
am:
7a160eb5c8
Change-Id: I92a2abfbb1b3381bd9c4db8cf267d33c56b3e748
Dan Cashman [Mon, 9 Jan 2017 20:47:47 +0000 (20:47 +0000)]
Split seapp_contexts into plat and nonplat components. am:
6f1ea7101f am:
c6321e54b6
am:
1960e5f085
Change-Id: I8f89ecb6d46877871c4686b7cdfc1548317c00f2
Dan Cashman [Mon, 9 Jan 2017 20:42:55 +0000 (20:42 +0000)]
Merge "Split seapp_contexts into plat and nonplat components." am:
082e8e07ac
am:
a44337de33
Change-Id: I98a149f6609739986b52e594075c72b0cebd2c00
Dan Cashman [Mon, 9 Jan 2017 20:42:47 +0000 (20:42 +0000)]
Split seapp_contexts into plat and nonplat components. am:
6f1ea7101f
am:
c6321e54b6
Change-Id: I8548f258416b730625d332e461b16df5b27c5c9a
Dan Cashman [Mon, 9 Jan 2017 20:38:07 +0000 (20:38 +0000)]
Merge "Split seapp_contexts into plat and nonplat components."
am:
082e8e07ac
Change-Id: Id18ea3cafe444dc8574fd9ac0970f66dc0dad1aa
Dan Cashman [Mon, 9 Jan 2017 20:37:46 +0000 (20:37 +0000)]
Split seapp_contexts into plat and nonplat components.
am:
6f1ea7101f
Change-Id: If495c16b0259134492ba6f912a4d54c90fedc468
Treehugger Robot [Mon, 9 Jan 2017 20:30:21 +0000 (20:30 +0000)]
Merge "Split seapp_contexts into plat and nonplat components."
Tao Bao [Mon, 9 Jan 2017 19:37:15 +0000 (19:37 +0000)]
Merge "Makefile: Pack e2fsdroid into otatools.zip." am:
bb6935051a am:
ca95ee0465
am:
da855a7081
Change-Id: I82755a18d863ae3cb6b0a8fb4542ded3f5b8e08b
Tao Bao [Mon, 9 Jan 2017 19:37:01 +0000 (19:37 +0000)]
Makefile: Pack e2fsdroid into otatools.zip. am:
bcc3109262 am:
8c07d3c840
am:
f2305870f0
Change-Id: I5cb4fdbed689a5635340e751ee08ef606cfbb771
Tao Bao [Mon, 9 Jan 2017 19:32:44 +0000 (19:32 +0000)]
Merge "Makefile: Pack e2fsdroid into otatools.zip." am:
bb6935051a
am:
ca95ee0465
Change-Id: I3258e0fd12a859fdf307b854fe0a1af6cc0250c0
Tao Bao [Mon, 9 Jan 2017 19:32:30 +0000 (19:32 +0000)]
Makefile: Pack e2fsdroid into otatools.zip. am:
bcc3109262
am:
8c07d3c840
Change-Id: I618f192b092feef99f430b65a4463c925e382d1b
Tao Bao [Mon, 9 Jan 2017 19:27:01 +0000 (19:27 +0000)]
Merge "Makefile: Pack e2fsdroid into otatools.zip."
am:
bb6935051a
Change-Id: Id514131231d4f5123322e4d9e0c0f797198cb275
Tao Bao [Mon, 9 Jan 2017 19:27:00 +0000 (19:27 +0000)]
Makefile: Pack e2fsdroid into otatools.zip.
am:
bcc3109262
Change-Id: I32ef5db01b70420994f48fe35a8eb4ba071eb4be
Tao Bao [Mon, 9 Jan 2017 19:17:20 +0000 (19:17 +0000)]
Merge "Makefile: Pack e2fsdroid into otatools.zip."
Tao Bao [Fri, 6 Jan 2017 22:24:18 +0000 (14:24 -0800)]
Makefile: Pack e2fsdroid into otatools.zip.
e2fsdroid is needed to create ext4 images with mke2fs. Also pack both
sets of mke2fs and make_ext4fs tools into otatools.zip. Because we use
the latest otatools.zip to create OTAs, which needs to handle
target_files.zip using either of them.
Bug:
34126605
Test: `m otatools-package` and check it has e2fsdroid and make_ext4fs.
Test: Use otatools.zip to sign a TF.zip that defines
TARGET_USES_MKE2FS={true,false}.
Change-Id: I9967e4f078cbe912914c6c511681cba82356ae8e
Lingfeng Yang [Fri, 6 Jan 2017 20:11:19 +0000 (20:11 +0000)]
Merge "Allow goldfish-setup to take wake locks" am:
10f6bf093d am:
528a561d4e
am:
f0069a0c7f
Change-Id: Iff439685a59151844915828ec952880c2843e051
Lingfeng Yang [Fri, 6 Jan 2017 20:07:19 +0000 (20:07 +0000)]
Merge "Allow goldfish-setup to take wake locks" am:
10f6bf093d
am:
528a561d4e
Change-Id: I94dc950a2401967c1688290762fea8df0fab96ed
Lingfeng Yang [Fri, 6 Jan 2017 20:03:48 +0000 (20:03 +0000)]
Merge "Allow goldfish-setup to take wake locks"
am:
10f6bf093d
Change-Id: I0c6100a314ea619d91b1b4a2c82894b102cdaaea
Treehugger Robot [Fri, 6 Jan 2017 19:57:52 +0000 (19:57 +0000)]
Merge "Allow goldfish-setup to take wake locks"
Patrick Tjin [Fri, 6 Jan 2017 18:31:48 +0000 (18:31 +0000)]
build_image: add support for specifying number of inodes [DO NOT MERGE]
am:
37a73e0f09 -s ours
Change-Id: Ibbd39ba62b40b34b0d3c74c356d4047019e2c491
Lingfeng Yang [Fri, 6 Jan 2017 18:12:08 +0000 (10:12 -0800)]
Allow goldfish-setup to take wake locks
Change-Id: I6a5db8586168e47e974a82afd2e75fd858aa5750
dcashman [Fri, 6 Jan 2017 17:37:13 +0000 (17:37 +0000)]
Merge "Build split file_contexts." am:
80e70ae04a am:
dc9771e24c
am:
9937a72425
Change-Id: I72996355a0b77ac3b40361d214b7ce9b4f3778b4
dcashman [Fri, 6 Jan 2017 17:33:14 +0000 (17:33 +0000)]
Merge "Build split file_contexts." am:
80e70ae04a
am:
dc9771e24c
Change-Id: Iff2afa4574052a4580739ce04904401334d1c270
dcashman [Fri, 6 Jan 2017 17:29:10 +0000 (17:29 +0000)]
Merge "Build split file_contexts."
am:
80e70ae04a
Change-Id: I2445d8e3e5f205cf3761fcf1ea12af007bbed0d9
Treehugger Robot [Fri, 6 Jan 2017 17:23:45 +0000 (17:23 +0000)]
Merge "Build split file_contexts."
Dan Willemsen [Thu, 5 Jan 2017 22:55:13 +0000 (22:55 +0000)]
Merge "TARGET_RECOVERY_UPDATER_LIBS should not be used with AB updates" am:
81648927fb am:
ce324c6848
am:
cb43c0f8db
Change-Id: I3789913b087288d31738f51668c79a502c3e3745
Dan Willemsen [Thu, 5 Jan 2017 22:51:44 +0000 (22:51 +0000)]
Merge "TARGET_RECOVERY_UPDATER_LIBS should not be used with AB updates" am:
81648927fb
am:
ce324c6848
Change-Id: I1260ea1bba7de40cb0f9a3661f281406f48cd708
Dan Willemsen [Thu, 5 Jan 2017 22:48:11 +0000 (22:48 +0000)]
Merge "TARGET_RECOVERY_UPDATER_LIBS should not be used with AB updates"
am:
81648927fb
Change-Id: I34c35cdd94e2251109275de38520b7059529ee5a
Dan Willemsen [Thu, 5 Jan 2017 22:42:06 +0000 (22:42 +0000)]
Merge "TARGET_RECOVERY_UPDATER_LIBS should not be used with AB updates"
Dan Cashman [Thu, 22 Dec 2016 15:17:40 +0000 (07:17 -0800)]
Split seapp_contexts into plat and nonplat components.
Bug:
33746381
Test: Device boots with no extra denials.
Change-Id: Ib403be429562f5e22ed4dd042fb04b0795b558db
dcashman [Mon, 12 Dec 2016 18:34:47 +0000 (10:34 -0800)]
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>
Patrick Tjin [Thu, 20 Oct 2016 17:58:12 +0000 (10:58 -0700)]
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
Dan Willemsen [Thu, 5 Jan 2017 01:16:09 +0000 (17:16 -0800)]
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
Elliott Hughes [Thu, 5 Jan 2017 00:36:52 +0000 (00:36 +0000)]
Merge changes from topic 'fsconfig2-fixups' am:
abf3dbe248 am:
2fe7f7a402
am:
cd43ea88e5
Change-Id: I4bfa97c683d5d04cbe5130ea25d1788a5fd9357f
William Roberts [Thu, 5 Jan 2017 00:36:47 +0000 (00:36 +0000)]
fsconfig: fix pylint warning am:
4165c635b8 am:
3f9be0b6ae
am:
d469a347fb
Change-Id: Ie0a9cd1b3f1d1893d756668029c43f1420807a20
William Roberts [Thu, 5 Jan 2017 00:36:41 +0000 (00:36 +0000)]
fsconfig: fix style formating with yapf am:
820421c9b5 am:
529b397e83
am:
e344c7672c
Change-Id: I995e36f93a8d0e0ef87de429744c989d87dc8ed7
Elliott Hughes [Thu, 5 Jan 2017 00:34:23 +0000 (00:34 +0000)]
Merge changes from topic 'fsconfig2-fixups' am:
abf3dbe248
am:
2fe7f7a402
Change-Id: If119f71509b9e11668d526ce965880271d004487
William Roberts [Thu, 5 Jan 2017 00:34:16 +0000 (00:34 +0000)]
fsconfig: fix pylint warning am:
4165c635b8
am:
3f9be0b6ae
Change-Id: Iad144edd409640385a69ce0f5c35048d30a494f9
William Roberts [Thu, 5 Jan 2017 00:34:10 +0000 (00:34 +0000)]
fsconfig: fix style formating with yapf am:
820421c9b5
am:
529b397e83
Change-Id: Ie42a5e8732a8c963334c5e3a5d38a232dccd75a5
Elliott Hughes [Thu, 5 Jan 2017 00:31:18 +0000 (00:31 +0000)]
Merge changes from topic 'fsconfig2-fixups'
am:
abf3dbe248
Change-Id: I0149e85d05c3fb60f8ab0e878a3a8172a1edaede
William Roberts [Thu, 5 Jan 2017 00:31:16 +0000 (00:31 +0000)]
fsconfig: fix pylint warning
am:
4165c635b8
Change-Id: Ic417993b369e152754887ed48b087fc2f5eea0c9
William Roberts [Thu, 5 Jan 2017 00:31:10 +0000 (00:31 +0000)]
fsconfig: fix style formating with yapf
am:
820421c9b5
Change-Id: Ib23e0fb880903881efa34f243889a203026a80d3
Elliott Hughes [Thu, 5 Jan 2017 00:26:04 +0000 (00:26 +0000)]
Merge changes from topic 'fsconfig2-fixups'
* changes:
fsconfig: fix pylint warning
fsconfig: fix style formating with yapf
Dan Willemsen [Wed, 4 Jan 2017 23:10:36 +0000 (23:10 +0000)]
Merge changes from topic 'build-vts-zip' am:
d0c693ff64 am:
a50ead8336
am:
d63d5fffcd
Change-Id: I174d13d97cb54760688e5b4cd1fe79e1a5553e9f
Keun Soo Yim [Wed, 4 Jan 2017 23:10:30 +0000 (23:10 +0000)]
delete vts.mk (which is moved to test/vts) am:
18a316c161 am:
ed61c29cfd
am:
f1125508ba
Change-Id: Ib803efe818f406d5e12e408969902114ed2c5b30
Keun Soo Yim [Wed, 4 Jan 2017 23:10:25 +0000 (23:10 +0000)]
include VTS packaging task files am:
b74649d027 am:
33f6d707fa
am:
03616abb42
Change-Id: I0e134d05415e5bd79c4e8c16795ddb66a8d05501
Dan Willemsen [Wed, 4 Jan 2017 23:08:37 +0000 (23:08 +0000)]
Merge changes from topic 'build-vts-zip' am:
d0c693ff64
am:
a50ead8336
Change-Id: I409e26a885e5361a23c6bbae9c8fc994e45f7fcd
Keun Soo Yim [Wed, 4 Jan 2017 23:08:31 +0000 (23:08 +0000)]
delete vts.mk (which is moved to test/vts) am:
18a316c161
am:
ed61c29cfd
Change-Id: If7f214225e07c3b5789d2d79b808c432c92fee27
Keun Soo Yim [Wed, 4 Jan 2017 23:08:25 +0000 (23:08 +0000)]
include VTS packaging task files am:
b74649d027
am:
33f6d707fa
Change-Id: Ia84408c4ea3215acefd3f666525df397d868fc52
Dan Willemsen [Wed, 4 Jan 2017 23:05:35 +0000 (23:05 +0000)]
Merge changes from topic 'build-vts-zip'
am:
d0c693ff64
Change-Id: Ic2b1d3165c4da7d89080f3016286a4a7ed815b2b
Keun Soo Yim [Wed, 4 Jan 2017 23:05:34 +0000 (23:05 +0000)]
delete vts.mk (which is moved to test/vts)
am:
18a316c161
Change-Id: I1853517cff9d3697143b8c5c2fd6459e502040c4
Keun Soo Yim [Wed, 4 Jan 2017 23:05:29 +0000 (23:05 +0000)]
include VTS packaging task files
am:
b74649d027
Change-Id: I94d3ceb03b7815b49291ca127fdd41a8affca8fe
Dan Willemsen [Wed, 4 Jan 2017 22:58:53 +0000 (22:58 +0000)]
Merge changes from topic 'build-vts-zip'
* changes:
delete vts.mk (which is moved to test/vts)
include VTS packaging task files
Keun Soo Yim [Fri, 2 Sep 2016 18:43:43 +0000 (11:43 -0700)]
delete vts.mk (which is moved to test/vts)
Test: m -j vts
Change-Id: I3ab29e59b6f77f3ac92bbfe7a6f7a8f36b2ba3bd
(cherry picked from commit
a942dc8433c4e02bdfe0313471bcac8fef318fde)
Keun Soo Yim [Wed, 31 Aug 2016 16:20:51 +0000 (09:20 -0700)]
include VTS packaging task files
Test: m -j vts
Change-Id: I8737412bf4e7b5c2db32325105e7c588949b959d
(cherry picked from commit
199a710f73d9522b599ff75b8dc8ea54e7fcf6e0)
William Roberts [Wed, 14 Dec 2016 03:17:07 +0000 (19:17 -0800)]
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>
William Roberts [Wed, 14 Dec 2016 03:12:35 +0000 (19:12 -0800)]
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>
Hung-ying Tyan [Wed, 4 Jan 2017 02:50:18 +0000 (02:50 +0000)]
Merge "Define TARGET_OUT_VENDOR_APPS_PRIVILEGED for 2nd arch" am:
1a4a0a4539 am:
82e3d0d007
am:
150db0ea6f
Change-Id: I1b0fddf2b72e47a38bdac605819dbab4f6f2dd84
Hung-ying Tyan [Wed, 4 Jan 2017 02:48:19 +0000 (02:48 +0000)]
Merge "Define TARGET_OUT_VENDOR_APPS_PRIVILEGED for 2nd arch" am:
1a4a0a4539
am:
82e3d0d007
Change-Id: I65daac2e70657ae651a705d3768555ab1b727d05
Hung-ying Tyan [Wed, 4 Jan 2017 02:46:19 +0000 (02:46 +0000)]
Merge "Define TARGET_OUT_VENDOR_APPS_PRIVILEGED for 2nd arch"
am:
1a4a0a4539
Change-Id: Ic1bee5c763d5375c676f96db273d3126c85dd85b
Treehugger Robot [Wed, 4 Jan 2017 02:44:04 +0000 (02:44 +0000)]
Merge "Define TARGET_OUT_VENDOR_APPS_PRIVILEGED for 2nd arch"
Elliott Hughes [Wed, 4 Jan 2017 00:46:10 +0000 (00:46 +0000)]
Merge "fs_config: Fix oem range parsing" am:
ce6c8e629f am:
c16a64b832
am:
d7217e2847
Change-Id: Ibb5896d37c2ca354e35d392cebde8ad22b6e60f8
Elliott Hughes [Wed, 4 Jan 2017 00:44:11 +0000 (00:44 +0000)]
Merge "fs_config: Fix oem range parsing" am:
ce6c8e629f
am:
c16a64b832
Change-Id: Iafb13daaa210eea2c19e11eb1d9b2d94a5d047bb
Elliott Hughes [Wed, 4 Jan 2017 00:41:40 +0000 (00:41 +0000)]
Merge "fs_config: Fix oem range parsing"
am:
ce6c8e629f
Change-Id: I74d198a2638b875233859a1c7ff723b04b47a353
Elliott Hughes [Wed, 4 Jan 2017 00:37:58 +0000 (00:37 +0000)]
Merge "fs_config: Fix oem range parsing"
Tao Bao [Tue, 3 Jan 2017 23:52:22 +0000 (23:52 +0000)]
Merge "blockimgdiff.py: Clean up stash id computation in BBOTA v3+." am:
7cfc591596 am:
74b665fef1
am:
085daa6451
Change-Id: I0304bebe8645c4f95925d28e38f91184395a8b29
Tao Bao [Tue, 3 Jan 2017 23:50:20 +0000 (23:50 +0000)]
Merge "blockimgdiff.py: Clean up stash id computation in BBOTA v3+." am:
7cfc591596
am:
74b665fef1
Change-Id: I4d9b7eb0c73faee8c7044690750560840fa4d820
Tao Bao [Tue, 3 Jan 2017 23:48:21 +0000 (23:48 +0000)]
Merge "blockimgdiff.py: Clean up stash id computation in BBOTA v3+."
am:
7cfc591596
Change-Id: Ifaf7f387b840d9f3e59bdbf93beab41a245f7ed5
Tao Bao [Tue, 3 Jan 2017 23:44:41 +0000 (23:44 +0000)]
Merge "blockimgdiff.py: Clean up stash id computation in BBOTA v3+."
Richard Uhler [Tue, 3 Jan 2017 10:00:46 +0000 (10:00 +0000)]
Merge "Remove option for non-pic dex preopt." am:
c184ef515c am:
ffb29d7497
am:
8a02582f70
Change-Id: I85e5b259300d15f9e2ba5825cc5efb33066f3baf
Richard Uhler [Tue, 3 Jan 2017 09:52:16 +0000 (09:52 +0000)]
Merge "Remove option for non-pic dex preopt." am:
c184ef515c
am:
ffb29d7497
Change-Id: I15c5c9f03f33a02a7f39e781e5e945fe5c74f4bd
Richard Uhler [Tue, 3 Jan 2017 09:44:21 +0000 (09:44 +0000)]
Merge "Remove option for non-pic dex preopt."
am:
c184ef515c
Change-Id: If76f8195ecb8b914fdea259de2e80ebebb5ebfe3
Treehugger Robot [Tue, 3 Jan 2017 09:39:38 +0000 (09:39 +0000)]
Merge "Remove option for non-pic dex preopt."
Johan Redestig [Tue, 3 Jan 2017 08:36:47 +0000 (09:36 +0100)]
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
Tao Bao [Wed, 28 Dec 2016 17:14:39 +0000 (09:14 -0800)]
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
Elliott Hughes [Tue, 27 Dec 2016 21:16:08 +0000 (21:16 +0000)]
Merge "Revert "Revert "Merge changes from topic 'fsconfig-2'""" am:
5f60b74297 am:
71f582ac30
am:
9d5a9e7c6e
Change-Id: I2af7cd105fa6e200ed28156f83c30c57b66f6d3c
Elliott Hughes [Tue, 27 Dec 2016 21:15:54 +0000 (21:15 +0000)]
Revert "Revert "Merge changes from topic 'fsconfig-2'"" am:
2d7c86dfea am:
feb4f2e54a
am:
8a2ed5159c
Change-Id: I7ff77ba1282fbddedbd10a3a63b055ac36ee83ae
Elliott Hughes [Tue, 27 Dec 2016 21:09:07 +0000 (21:09 +0000)]
Merge "Revert "Revert "Merge changes from topic 'fsconfig-2'""" am:
5f60b74297
am:
71f582ac30
Change-Id: If090fbd6fef18dbed6258d58c7aa45d6ace27e14
Elliott Hughes [Tue, 27 Dec 2016 21:08:52 +0000 (21:08 +0000)]
Revert "Revert "Merge changes from topic 'fsconfig-2'"" am:
2d7c86dfea
am:
feb4f2e54a
Change-Id: I5e6d138662e8f21f85e77466f897ffab9afd0f2d
Elliott Hughes [Tue, 27 Dec 2016 21:01:24 +0000 (21:01 +0000)]
Merge "Revert "Revert "Merge changes from topic 'fsconfig-2'"""
am:
5f60b74297
Change-Id: Ib88d2780ee2a7ba0b070087cc1ed8921f4247100
Elliott Hughes [Tue, 27 Dec 2016 21:01:23 +0000 (21:01 +0000)]
Revert "Revert "Merge changes from topic 'fsconfig-2'""
am:
2d7c86dfea
Change-Id: I825336a18f7d7525bb49dd65d24ddccbfef84ba5
Elliott Hughes [Tue, 27 Dec 2016 20:51:06 +0000 (20:51 +0000)]
Merge "Revert "Revert "Merge changes from topic 'fsconfig-2'"""
Alan Viverette [Fri, 23 Dec 2016 03:21:05 +0000 (03:21 +0000)]
Merge "Update pathmap.mk for renderscript support library migration" am:
cafc7efee0 am:
7621a86097
am:
670a4b4fa6
Change-Id: Ibae6e9e2b0eed11390b3d36970894952116c1a90
Alan Viverette [Fri, 23 Dec 2016 03:15:04 +0000 (03:15 +0000)]
Merge "Update pathmap.mk for renderscript support library migration" am:
cafc7efee0
am:
7621a86097
Change-Id: I9adc6741d91caf5c575c11070b2277a50c3dc940
Alan Viverette [Fri, 23 Dec 2016 03:08:34 +0000 (03:08 +0000)]
Merge "Update pathmap.mk for renderscript support library migration"
am:
cafc7efee0
Change-Id: Ic85e61e12524b46073a0fd3b092eb42bc6d5c283
Treehugger Robot [Fri, 23 Dec 2016 03:02:54 +0000 (03:02 +0000)]
Merge "Update pathmap.mk for renderscript support library migration"
Alan Viverette [Fri, 23 Dec 2016 01:44:29 +0000 (01:44 +0000)]
Update pathmap.mk for renderscript support library migration am:
b78260919d
am:
e8b339d1d3
Change-Id: Ibe6eee89e8e1d847f42d1a79eb7ccb6d2fe39d8a
Alan Viverette [Fri, 23 Dec 2016 01:38:28 +0000 (01:38 +0000)]
Update pathmap.mk for renderscript support library migration
am:
b78260919d
Change-Id: Ic8bdcfa3e55cb6b1f501efbff9aee9304811f41f
Alan Viverette [Tue, 26 Jul 2016 17:06:37 +0000 (13:06 -0400)]
Update pathmap.mk for renderscript support library migration
Bug:
30255901
Change-Id: I213baaf4c76a7e5b8d20168624b74eb61582d215
(cherry picked from commit
49f03349c818de16be3a0c74f6dc07c85b94b7b0)
Colin Cross [Fri, 23 Dec 2016 01:02:06 +0000 (01:02 +0000)]
Merge "Update pathmap.mk for renderscript support library migration" into nyc-mr1-dev-plus-aosp
am:
5b0573233f
Change-Id: Ie35be50e72068a71bc0e5cb64c48da529a60ffb2
Alan Viverette [Fri, 23 Dec 2016 01:01:56 +0000 (01:01 +0000)]
Update pathmap.mk for renderscript support library migration
am:
74b13397d9
Change-Id: I503654db7c70d6785e9b2559e9709fb06177733e
Alan Viverette [Tue, 26 Jul 2016 17:06:37 +0000 (13:06 -0400)]
Update pathmap.mk for renderscript support library migration
Bug:
30255901
Change-Id: I213baaf4c76a7e5b8d20168624b74eb61582d215
(cherry picked from commit
49f03349c818de16be3a0c74f6dc07c85b94b7b0)
Colin Cross [Fri, 23 Dec 2016 00:54:32 +0000 (00:54 +0000)]
Merge "Update pathmap.mk for renderscript support library migration" into nyc-mr1-dev-plus-aosp
Dan Willemsen [Thu, 22 Dec 2016 23:45:17 +0000 (23:45 +0000)]
Merge "Remove --ignore_dirty=$(OUT_DIR)/% from Kati flags" am:
fb2efba189 am:
952d5adcde
am:
bbf841d45f
Change-Id: I0086eb66a855525560c3b962773350c221f9bb3d
Dan Willemsen [Thu, 22 Dec 2016 23:39:47 +0000 (23:39 +0000)]
Merge "Remove --ignore_dirty=$(OUT_DIR)/% from Kati flags" am:
fb2efba189
am:
952d5adcde
Change-Id: I57b99cf8d157dbcf8f10e8d1d4b56a8529d1354f
Dan Willemsen [Thu, 22 Dec 2016 23:33:46 +0000 (23:33 +0000)]
Merge "Remove --ignore_dirty=$(OUT_DIR)/% from Kati flags"
am:
fb2efba189
Change-Id: I63dd0ac17a099ac6da5e8e63be280983e042a839
Dan Willemsen [Thu, 22 Dec 2016 23:27:37 +0000 (23:27 +0000)]
Merge "Remove --ignore_dirty=$(OUT_DIR)/% from Kati flags"
Alan Viverette [Tue, 26 Jul 2016 17:06:37 +0000 (13:06 -0400)]
Update pathmap.mk for renderscript support library migration
Bug:
30255901
Change-Id: I213baaf4c76a7e5b8d20168624b74eb61582d215
(cherry picked from commit
49f03349c818de16be3a0c74f6dc07c85b94b7b0)
Alan Viverette [Tue, 26 Jul 2016 17:06:37 +0000 (13:06 -0400)]
Update pathmap.mk for renderscript support library migration
Bug:
30255901
Change-Id: I213baaf4c76a7e5b8d20168624b74eb61582d215
(cherry picked from commit
49f03349c818de16be3a0c74f6dc07c85b94b7b0)
Dan Willemsen [Sat, 10 Sep 2016 06:18:22 +0000 (23:18 -0700)]
Remove --ignore_dirty=$(OUT_DIR)/% from Kati flags
We really should be re-running Kati when a file in here changes, since
it may actually affect the result. The general problem we've run into is
when there are two kati output files that are clean according to the
current rules, but if they actually ran we'd force an installclean.
This also had the side-effect of not running shell commands that touched
$OUT_DIR, like writing files using $(shell echo ... >out/...), now those
may be run.
This will cause Kati to re-read the makefiles more often -- twice when a
CleanSpec.mk changes, twice when switching products on the same device.
Basically every time we read the old state, do something about it, and
write out the new state, we need to rerun the next time so we aren't
continuously cleaning up what changed.
Bug:
30947985
Test: Manual, switching between configurations; enable --regen_debug
Change-Id: I888f9f8295f318f8214b2c79525cf94f457a5a8b
OSDN Git Service
