OSDN Git Service
Lingfeng Yang [Tue, 17 Jan 2017 00:45:28 +0000 (00:45 +0000)]
Allow /dev/goldfish_sync
am:
bdceef4325
Change-Id: Iaa5b0fe304e3b65a4e58949d9c8fc7b3ce5f83ec
Tao Bao [Sat, 14 Jan 2017 15:43:26 +0000 (15:43 +0000)]
Merge "releasetools: Replace print stmt with print()." am:
4a0b494eea
am:
0e2a0fd76c
Change-Id: I4efbff199c3a44ddc33a0e46cdd64a6c949c5262
Tao Bao [Sat, 14 Jan 2017 15:40:27 +0000 (15:40 +0000)]
Merge "releasetools: Replace print stmt with print()."
am:
4a0b494eea
Change-Id: I8823ee5f778c3017d85c1fa6d0f159ad85178314
Tao Bao [Sat, 14 Jan 2017 15:36:40 +0000 (15:36 +0000)]
Merge "releasetools: Replace print stmt with print()."
Tao Bao [Sat, 14 Jan 2017 08:16:43 +0000 (08:16 +0000)]
Merge "releasetools: Delete the obsolete --aslr_mode/-a flag." am:
ecbb31e8c4
am:
82c2fb0e21
Change-Id: If3acd29bc8854d1c1e2b53216f5e984cdd46c0e9
Tao Bao [Sat, 14 Jan 2017 08:13:43 +0000 (08:13 +0000)]
Merge "releasetools: Delete the obsolete --aslr_mode/-a flag."
am:
ecbb31e8c4
Change-Id: I648906871d064a309b21eca4c8718bb15381f086
Treehugger Robot [Sat, 14 Jan 2017 08:08:30 +0000 (08:08 +0000)]
Merge "releasetools: Delete the obsolete --aslr_mode/-a flag."
Tao Bao [Tue, 10 Jan 2017 18:47:58 +0000 (10:47 -0800)]
releasetools: Replace print stmt with print().
So that it's compatible with Python 3.
Test: pylint --pylint=pylintrc
Change-Id: If06c135a492c94bedd713c8cbdf03155a502d5cd
Tao Bao [Fri, 13 Jan 2017 19:56:54 +0000 (11:56 -0800)]
releasetools: Delete the obsolete --aslr_mode/-a flag.
It was added in commit
96be7205dce97977909e93b73f48779fcce3bc65
("Working ASLR implementation.") in 2010, and removed in commit
1807e700a568d57901b835370d1b1ae05c3dbb0f ("don't generate retouch
commands in OTA scripts") in 2012.
Remove the obsolete --aslr_mode flag.
Test: ota_from_target_files.py still works (by generating incremental
and full OTAs respectively).
Change-Id: I6d8e62730ac192f3574d484c4a4b9b43b4ee0a9e
Chen Xu [Fri, 13 Jan 2017 22:10:32 +0000 (22:10 +0000)]
Merge "Include CarrierDefaultApp to the img" am:
5e6ce5f504
am:
10253bbea9
Change-Id: If9e2c093b2a0802c639b1a0d88e913300e94a3c0
Chen Xu [Fri, 13 Jan 2017 22:08:32 +0000 (22:08 +0000)]
Merge "Include CarrierDefaultApp to the img"
am:
5e6ce5f504
Change-Id: Ibe79b9b961f6a04535e2f34e3da2ef1e3367a9d9
Chen Xu [Fri, 13 Jan 2017 21:59:23 +0000 (21:59 +0000)]
Merge "Include CarrierDefaultApp to the img"
fionaxu [Fri, 13 Jan 2017 02:34:17 +0000 (18:34 -0800)]
Include CarrierDefaultApp to the img
Bug:
30958215
Test: Manual test
Change-Id: I67e235028b73513954b7d5f4fe2623700d176e87
Joachim Sauer [Fri, 13 Jan 2017 10:33:56 +0000 (10:33 +0000)]
Merge "Add java.time packages to whitelist." am:
4dbe67cddc
am:
4f60acde39
Change-Id: I792adfb7df7dba66236c15956c899a5b36a61a2f
Joachim Sauer [Fri, 13 Jan 2017 10:25:46 +0000 (10:25 +0000)]
Merge "Add java.time packages to whitelist."
am:
4dbe67cddc
Change-Id: I93342090e16090e73dd2377f027deedd321849d8
Joachim Sauer [Fri, 13 Jan 2017 10:18:18 +0000 (10:18 +0000)]
Merge "Add java.time packages to whitelist."
Lingfeng Yang [Tue, 10 May 2016 21:51:57 +0000 (14:51 -0700)]
Allow /dev/goldfish_sync
Change-Id: I41883eafd2b261d000c41eaf3ba04af7e2b89349
(cherry picked from commit
5d6ae8a3d467dd23a2f09a96bc4fdbea2d0353a2)
Jack He [Thu, 12 Jan 2017 08:46:13 +0000 (08:46 +0000)]
Merge "Add mk file parsers to support build variables required by system/bt" am:
7b66d28b25
am:
dfa69daccc
Change-Id: Ie7e81cfe290214734db6c09c42f4aba8d2cd2be8
Jack He [Thu, 12 Jan 2017 08:40:13 +0000 (08:40 +0000)]
Merge "Add mk file parsers to support build variables required by system/bt"
am:
7b66d28b25
Change-Id: I188658d0741722e78ed2b636e04830c0870ca728
Treehugger Robot [Thu, 12 Jan 2017 08:31:26 +0000 (08:31 +0000)]
Merge "Add mk file parsers to support build variables required by system/bt"
Jack He [Sat, 17 Dec 2016 23:36:32 +0000 (15:36 -0800)]
Add mk file parsers to support build variables required by system/bt
* BtConfigIncludeDir: Path to device specific config headers
BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR
* BTHcilpIncluded: Path to Hcilp headers
BOARD_BLUETOOTH_BDROID_HCILP_INCLUDED
* BtHciUseMct: Whether MCT is used
BLUETOOTH_HCI_USE_MCT
Bug:
32958753
Test: Code compilation, no user visible effects
Change-Id: I94cad65c77464e5b467abee05951ddfd35b9f27d
Colin Cross [Wed, 11 Jan 2017 23:59:39 +0000 (23:59 +0000)]
Merge "Don't run find on directories that don't exist" am:
c1df498f0c
am:
a8839ac623
Change-Id: Ia8043ec41fd4589a300aa2780e775d003e0f2d0a
Colin Cross [Wed, 11 Jan 2017 23:54:27 +0000 (23:54 +0000)]
Merge "Don't run find on directories that don't exist"
am:
c1df498f0c
Change-Id: If0792cb62b7e666ca700dbb9b0dbf4b3d6d3cd02
Treehugger Robot [Wed, 11 Jan 2017 23:42:40 +0000 (23:42 +0000)]
Merge "Don't run find on directories that don't exist"
Colin Cross [Wed, 11 Jan 2017 21:59:41 +0000 (13:59 -0800)]
Don't run find on directories that don't exist
$(shell find vendor) causes a warning in AOSP where vendor doesn't
exist.
Test: m -j, no warning
Change-Id: I28916594e0720c53823a3d9ed99b8af1d356af23
Joachim Sauer [Thu, 13 Oct 2016 16:24:01 +0000 (17:24 +0100)]
Add java.time packages to whitelist.
Bug:
28832222
Test: builds
Change-Id: I5a77f519f51eca93c34e4697b92a92bf72f4eda9
Jean-Luc Brouillet [Wed, 11 Jan 2017 02:17:59 +0000 (02:17 +0000)]
Merge "Move rs/scriptc to rs/script_api/include." am:
a3ab4cc9c9
am:
d9bfeff242
Change-Id: I0249452861ffd748200c02434674832a2303b20b
Jean-Luc Brouillet [Wed, 11 Jan 2017 02:12:58 +0000 (02:12 +0000)]
Merge "Move rs/scriptc to rs/script_api/include."
am:
a3ab4cc9c9
Change-Id: Iddbffd165df0bb1587fb534084014ced46fb529b
Jean-Luc Brouillet [Wed, 11 Jan 2017 02:04:15 +0000 (02:04 +0000)]
Merge "Move rs/scriptc to rs/script_api/include."
Steven Moreland [Mon, 9 Jan 2017 21:02:06 +0000 (21:02 +0000)]
Merge "embedded.mk: add android.hidl.memory@1.0-impl" am:
2ec742a956
am:
ff2c0a1433
Change-Id: I28e67e22a3fd5322a17a4ad2ee32f2b0fd0a0f70
Steven Moreland [Mon, 9 Jan 2017 20:57:36 +0000 (20:57 +0000)]
Merge "embedded.mk: add android.hidl.memory@1.0-impl"
am:
2ec742a956
Change-Id: Ifa7263257caf2198b5980b30f0efbfd129771e30
Treehugger Robot [Mon, 9 Jan 2017 20:51:15 +0000 (20:51 +0000)]
Merge "embedded.mk: add android.hidl.memory@1.0-impl"
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: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."
Jean-Luc Brouillet [Mon, 9 Jan 2017 01:40:21 +0000 (17:40 -0800)]
Move rs/scriptc to rs/script_api/include.
Test: Compiled ImageProcessing_jb
Change-Id: Icf05a603671499665d2f31a8989fa69585a6f834
Steven Moreland [Sun, 8 Jan 2017 18:00:20 +0000 (10:00 -0800)]
embedded.mk: add android.hidl.memory@1.0-impl
Bug:
34134179
Test: both 32 and 64 bit versions of this file are on the device after a
clean build.
Change-Id: I75ab12246c2c44e39b5e863dfec98dc72a36fbbe
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: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"
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: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: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>
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: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: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: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: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: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 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: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: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: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)
OSDN Git Service
