OSDN Git Service
Stephen Hines [Thu, 26 Jan 2017 07:19:53 +0000 (07:19 +0000)]
Merge "Switch to clang-
3625443."
am:
296c345be9
Change-Id: I874c41aacd7e3f17f88a4f2ff54a16c6fac10042
Treehugger Robot [Thu, 26 Jan 2017 07:13:16 +0000 (07:13 +0000)]
Merge "Switch to clang-
3625443."
Tao Bao [Wed, 25 Jan 2017 18:56:40 +0000 (18:56 +0000)]
Merge "Revert "Revert "releasetools: Generate streamable A/B OTA packages."""
am:
499e53f607
Change-Id: I1d1cece713f23ba51f6ba73e404e5cd9b4b2ef34
Tao Bao [Wed, 25 Jan 2017 18:54:22 +0000 (18:54 +0000)]
Merge "Revert "Revert "releasetools: Generate streamable A/B OTA packages."""
Jaekyun Seok [Wed, 25 Jan 2017 07:18:54 +0000 (07:18 +0000)]
Merge "Prevent abuse of property overrides"
am:
7ae18449ec
Change-Id: I035eab9562c13747d6a6917bb7be3dad81348ff6
Treehugger Robot [Wed, 25 Jan 2017 07:15:07 +0000 (07:15 +0000)]
Merge "Prevent abuse of property overrides"
Tao Bao [Wed, 25 Jan 2017 06:10:49 +0000 (22:10 -0800)]
Revert "Revert "releasetools: Generate streamable A/B OTA packages.""
This reverts commit
ea4325baf8a673e869cac8981781cf57c4821cb5 to re-land
commit
ef1bb4360f0b9ccc54afd7a39077b7ca4d8a9a36. It fixes the bug when
handling a package without care_map.txt (e.g. dm-verity not enabled).
In order to support streaming A/B OTA packages, we pack
payload_properties.txt and care_map.txt in ZIP_STORED mode. These two
entries along with payload.bin (already in ZIP_STORED prior to this CL)
can be fetched directly based on the offset and length info.
We write the offset and length info into the package metadata entry
(META-INF/com/android/metadata), which can be parsed by the OTA server.
payload_properties.txt and care_map.txt are usually less than 1-KiB. So
the change only incurs marginal size increase.
Bug:
33382114
Test: Generate an A/B OTA package. Verify the 'streaming-property-files'
entry in the metadata file.
Test: Generate an A/B OTA package on a device with dm-verity not enabled.
Change-Id: I3469c8b62385a1fc58b4fb82e3f9d4690aef52ba
Jaekyun Seok [Fri, 20 Jan 2017 04:17:12 +0000 (13:17 +0900)]
Prevent abuse of property overrides
To prevent abuse of PRODUCT_*PROPERTY_OVERRIDES and
ADDITIONAL*PROPERTIES, the following rules should be applied.
- Mark PRODUCT_*PROPERTY_OVERRIDES readonly after reading product
specs.
- Disallow any changes on ADDITIONAL*PROPERTIES from product specs
and BoardConfig.mk.
- Mark ADDITIONAL*PROPERTIES readonly before reading Android.mk
files.
Test: building succeeded on marlin-userdebug.
Bug:
34116668
Change-Id: I93d8de086ec85ba787165a156bdcc7df04310be1
(cherry picked from commit
294286d95c7647c1c20c3537f065c21e85371695)
Tao Bao [Wed, 25 Jan 2017 01:49:00 +0000 (01:49 +0000)]
Merge "Revert "releasetools: Generate streamable A/B OTA packages.""
am:
5ce7034463
Change-Id: If2a3ee497124b87d1ff3c6bb10a05065c856bd96
Tao Bao [Wed, 25 Jan 2017 01:45:44 +0000 (01:45 +0000)]
Merge "Revert "releasetools: Generate streamable A/B OTA packages.""
Tao Bao [Wed, 25 Jan 2017 01:41:13 +0000 (01:41 +0000)]
Revert "releasetools: Generate streamable A/B OTA packages."
This reverts commit
ef1bb4360f0b9ccc54afd7a39077b7ca4d8a9a36.
It has broken the builds that don't have care_map.txt entry.
Change-Id: I343455e66be5e79457968dfc2813c7c1c234b6dc
Tao Bao [Tue, 24 Jan 2017 23:59:24 +0000 (23:59 +0000)]
Merge "releasetools: Generate streamable A/B OTA packages."
am:
41130f495f
Change-Id: I33e4eb9cc536c7d49535a4c393a6b3303add9742
Tao Bao [Tue, 24 Jan 2017 23:55:52 +0000 (23:55 +0000)]
Merge "releasetools: Generate streamable A/B OTA packages."
Hiroshi Yamauchi [Tue, 24 Jan 2017 22:20:19 +0000 (22:20 +0000)]
Merge "Enable PRODUCT_ART_USE_READ_BARRIER by default."
am:
131731fd49
Change-Id: I434953132243db254adf8513240e33257b917b21
Calin Juravle [Tue, 24 Jan 2017 22:19:32 +0000 (22:19 +0000)]
Merge "Add dexoptanalyzer to art PRODUCT_PACKAGES"
am:
eddf3adec7
Change-Id: I3405653797259f6529e1fd4e10434a435a3365fd
Hiroshi Yamauchi [Tue, 24 Jan 2017 22:14:43 +0000 (22:14 +0000)]
Merge "Enable PRODUCT_ART_USE_READ_BARRIER by default."
Calin Juravle [Tue, 24 Jan 2017 22:14:10 +0000 (22:14 +0000)]
Merge "Add dexoptanalyzer to art PRODUCT_PACKAGES"
Evgenii Stepanov [Tue, 24 Jan 2017 20:54:57 +0000 (20:54 +0000)]
Merge "Force Thumb for CFI targets."
am:
34eb9f7f60
Change-Id: Ie28255f6d8eb78ff5813623e167ad51ea1ab768b
Evgenii Stepanov [Tue, 24 Jan 2017 20:54:42 +0000 (20:54 +0000)]
Merge "Run $(AR) with LLVMgold.so plugin for CFI targets."
am:
96c81711c1
Change-Id: I914f2c1e037ad8988181801f7689636952beb5b2
Evgenii Stepanov [Tue, 24 Jan 2017 20:52:25 +0000 (20:52 +0000)]
Merge "Force Thumb for CFI targets."
Evgenii Stepanov [Tue, 24 Jan 2017 20:50:36 +0000 (20:50 +0000)]
Merge "Run $(AR) with LLVMgold.so plugin for CFI targets."
Hiroshi Yamauchi [Tue, 24 Jan 2017 19:08:44 +0000 (11:08 -0800)]
Enable PRODUCT_ART_USE_READ_BARRIER by default.
Bug:
34084559
Bug:
34576638
Test: Boot gce_x86_phone on master
Change-Id: If284beb9551e55a4a698679399feb26e4acfd3d9
Evgenii Stepanov [Tue, 24 Jan 2017 00:57:38 +0000 (16:57 -0800)]
Run $(AR) with LLVMgold.so plugin for CFI targets.
Bug:
34623182
Test: add LOCAL_SANITIZE:=cfi to some static libraries under libstagefright
Change-Id: I4f0d8cbd794e0ce4737c59a4617e93c7a5defec1
Stephen Hines [Mon, 23 Jan 2017 23:03:55 +0000 (15:03 -0800)]
Switch to clang-
3625443.
Bug: http://b/
31532493
Test: Manual validation.
Change-Id: I0490b60c996052669fbfd545d7c3eed17fdd3547
Evgenii Stepanov [Fri, 20 Jan 2017 22:12:08 +0000 (14:12 -0800)]
Force Thumb for CFI targets.
Bug:
22033465
Test: bionic device tests
Change-Id: I66eb83bc7153cc34dde4fa1abfa861182a10f1fa
Tao Bao [Wed, 11 Jan 2017 19:57:10 +0000 (11:57 -0800)]
releasetools: Generate streamable A/B OTA packages.
In order to support streaming A/B OTA packages, we pack
payload_properties.txt and care_map.txt in ZIP_STORED mode. These two
entries along with payload.bin (already in ZIP_STORED prior to this CL)
can be fetched directly based on the offset and length info.
We write the offset and length info into the package metadata entry
(META-INF/com/android/metadata), which can be parsed by the OTA server.
payload_properties.txt and care_map.txt are usually less than 1-KiB. So
the change only incurs marginal size increase.
Bug:
33382114
Test: Generate an A/B OTA package. Verify the 'streaming-property-files'
entry in the metadata file.
Change-Id: I04504e834eb36e18876c5f5a5a09289ee05c6f9a
Vishwath Mohan [Fri, 20 Jan 2017 01:45:43 +0000 (01:45 +0000)]
Merge "Hide CFI behind a global flag."
am:
2d7fb30207
Change-Id: I40127230f3016e91d9c1010b0cfb9d95b95fa05f
Vishwath Mohan [Fri, 20 Jan 2017 01:45:37 +0000 (01:45 +0000)]
Merge "Hide CFI behind a global flag."
am:
c0bf85a615
Change-Id: I232a6a5d94ba28a965ba6d69e2dfdbdb66a2eeb8
Vishwath Mohan [Fri, 20 Jan 2017 01:32:43 +0000 (01:32 +0000)]
Merge "Hide CFI behind a global flag."
Vishwath Mohan [Fri, 20 Jan 2017 01:32:43 +0000 (01:32 +0000)]
Merge "Hide CFI behind a global flag."
Dan Willemsen [Fri, 20 Jan 2017 01:09:34 +0000 (01:09 +0000)]
Merge "Support native test prebuilts for X86+ARM builds"
am:
bf28f5933a
Change-Id: I393d50f0452534c40f76fd83703bc7ae443d8a98
Treehugger Robot [Fri, 20 Jan 2017 00:59:41 +0000 (00:59 +0000)]
Merge "Support native test prebuilts for X86+ARM builds"
Vishwath Mohan [Thu, 19 Jan 2017 22:35:31 +0000 (14:35 -0800)]
Hide CFI behind a global flag.
This CL ensures that locally enabling CFI in a .bp file is not honored
unless it is enabled globally using ENABLE_CFI=true first, effectively
hiding it behind a flag.
Bug:
30227045
Bug:
22033465
Test: m -j40 works and device boots
Test: cfi is correctly honored only when the global flag is set.
Change-Id: Id026302e7f714b90a9e2c996f7a9314f534f90c2
Colin Cross [Thu, 19 Jan 2017 06:48:21 +0000 (06:48 +0000)]
Merge "Don't pass empty arguments to ninja"
am:
f8acdc50fa
Change-Id: Ic9de7ca0f8269de190570554348053c4f7976195
Treehugger Robot [Thu, 19 Jan 2017 06:43:46 +0000 (06:43 +0000)]
Merge "Don't pass empty arguments to ninja"
Colin Cross [Thu, 19 Jan 2017 05:12:28 +0000 (21:12 -0800)]
Don't pass empty arguments to ninja
Passing an empty argument in argv to ninja results in an error:
ninja: error: empty path
Don't add jarg to the argument list if it is empty.
Bug:
34392351
Test: m -j
Change-Id: I39c8998c79b09835650628e1413ae7625cdbc555
Vishwath Mohan [Thu, 19 Jan 2017 01:50:29 +0000 (17:50 -0800)]
Hide CFI behind a global flag.
This CL ensures that the LOCAL_SANITIZE=cfi is not honored unless it
is enabled globally using ENABLE_CFI='true' first. This allows CFI to
be hidden behind a flag.
Bug:
30227045
Bug:
22033465
Test: m -j40 works and device boots
Test: cfi is correctly honored only when the global flag is set.
Change-Id: If4508ba448bd4260020483f9c11ee849bb419713
Colin Cross [Thu, 19 Jan 2017 00:12:27 +0000 (00:12 +0000)]
Merge "Convert -j to a reasonable parallelism for kati"
am:
bb5c13d359
Change-Id: Id3c6a55e0d6feb91d928a01ffd0875b574a8e5fb
Treehugger Robot [Thu, 19 Jan 2017 00:08:39 +0000 (00:08 +0000)]
Merge "Convert -j to a reasonable parallelism for kati"
Josh Gao [Wed, 18 Jan 2017 23:16:55 +0000 (23:16 +0000)]
Merge "Add crash_dump and tombstoned products."
am:
6651199eeb
Change-Id: Iccd2f0043281115494f17e4c3d69f7c9a8a6af03
Josh Gao [Wed, 18 Jan 2017 23:04:08 +0000 (23:04 +0000)]
Merge "Add crash_dump and tombstoned products."
Colin Cross [Wed, 18 Jan 2017 22:38:20 +0000 (14:38 -0800)]
Convert -j to a reasonable parallelism for kati
When running makeparallel in non-ninja mode, which is used when running
kati with USE_GOMA=true, convert -j to a reasonable parallelism value
the same way ninja does.
Bug:
34392351
Test: make -C build/make/tools/makeparallel makeparallel_test
Change-Id: I9aee4dd2a3b0f2b1c2c10087be83f7b2b06f4368
Jorim Jaggi [Wed, 18 Jan 2017 16:42:00 +0000 (16:42 +0000)]
Merge "Revert "SELinux: split property_contexts into platform and non-platform components.""
am:
ce0bae2f47
Change-Id: I230c5966278be38339fd369075be30320d27bcd2
Jorim Jaggi [Wed, 18 Jan 2017 16:41:33 +0000 (16:41 +0000)]
Revert "SELinux: split property_contexts into platform and non-platform components."
am:
8cbd925748
Change-Id: Id5007d02d02bf27e7ab96c48dbecb908f81dd496
Jorim Jaggi [Wed, 18 Jan 2017 16:33:31 +0000 (16:33 +0000)]
Merge "Revert "SELinux: split property_contexts into platform and non-platform components.""
Jorim Jaggi [Wed, 18 Jan 2017 15:37:30 +0000 (15:37 +0000)]
Revert "SELinux: split property_contexts into platform and non-platform components."
This reverts commit
c5ffdd4bb44bae3ad67ecea745f79b0a05015708.
Change-Id: I4c5fa6c68cbf0124117153660a2fd363f72388b6
Sandeep Patil [Wed, 18 Jan 2017 06:17:24 +0000 (06:17 +0000)]
Merge "SELinux: split property_contexts into platform and non-platform components."
am:
f91d163625
Change-Id: I014a2249a6bc7808292a3253721fe0d6724cd344
Sandeep Patil [Wed, 18 Jan 2017 06:12:26 +0000 (06:12 +0000)]
SELinux: split property_contexts into platform and non-platform components.
am:
c5ffdd4bb4
Change-Id: Id6a41eb5a4c1cc63c6ca93197f357a7de0604bab
Treehugger Robot [Wed, 18 Jan 2017 06:09:02 +0000 (06:09 +0000)]
Merge "SELinux: split property_contexts into platform and non-platform components."
Sandeep Patil [Wed, 18 Jan 2017 00:41:38 +0000 (00:41 +0000)]
Merge "SELinux: split service_contexts into platform and non-platform components."
am:
a91d63fa65
Change-Id: I872a51e28f8cd70972c1d924ba6591c0e9df4f13
Sandeep Patil [Tue, 27 Dec 2016 23:47:06 +0000 (15:47 -0800)]
SELinux: split property_contexts into platform and non-platform components.
Bug:
33746484
Test: Successfully boot with original service and property contexts.
Successfully boot with split serivce and property contexts.
Change-Id: I1f218ca842407d30650b8987ded6679672171091
Signed-off-by: Sandeep Patil <sspatil@google.com>
Sandeep Patil [Wed, 18 Jan 2017 00:41:03 +0000 (00:41 +0000)]
SELinux: split service_contexts into platform and non-platform components.
am:
e4ade08f63
Change-Id: Icad4eca1ac22b99a6aa0f130799143ee89727f55
Treehugger Robot [Wed, 18 Jan 2017 00:36:55 +0000 (00:36 +0000)]
Merge "SELinux: split service_contexts into platform and non-platform components."
Dan Willemsen [Tue, 17 Jan 2017 22:19:50 +0000 (14:19 -0800)]
Support native test prebuilts for X86+ARM builds
This allows Soong native tests to be built and installed on these
builds.
Bug:
32177952
Test: m -j bionic-unit-tests
Change-Id: Ifbe39ba7a8991cb87d10c5da679992cf3065444e
Josh Gao [Wed, 26 Oct 2016 20:28:32 +0000 (13:28 -0700)]
Add crash_dump and tombstoned products.
Bug: http://b/
30705528
Change-Id: I3f6c98f6f907f93e082db085a122557fc8488c83
Calin Juravle [Tue, 17 Jan 2017 20:46:34 +0000 (12:46 -0800)]
Add dexoptanalyzer to art PRODUCT_PACKAGES
Test: build & boot
Bug:
32871170
Change-Id: Iae89984ef3df253c75f400e68f00b24fcc2b82d5
Connor O'Brien [Tue, 17 Jan 2017 20:13:33 +0000 (20:13 +0000)]
Merge "Pass flash erase & logical block size to mke2fs"
am:
cf4f7eac85
Change-Id: I135f5117e4c0ac02ee22e0d2e6262894cb18b629
Connor O'Brien [Tue, 17 Jan 2017 20:07:10 +0000 (20:07 +0000)]
Merge "Pass flash erase & logical block size to mke2fs"
Sandeep Patil [Tue, 27 Dec 2016 23:09:03 +0000 (15:09 -0800)]
SELinux: split service_contexts into platform and non-platform components.
Bug:
33746484
Test: Successfully boot with original service and property contexts.
Successfully boot with split serivce and property contexts.
Change-Id: I6fec8d9b3023de09d69198c9e72311a1f03fe844
Signed-off-by: Sandeep Patil <sspatil@google.com>
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: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: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"
Connor O'Brien [Fri, 6 Jan 2017 00:48:14 +0000 (16:48 -0800)]
Pass flash erase & logical block size to mke2fs
This information can be used to tune ext4 stripe and stride in the
userdata partition for better performance
Test: Build & flash userdata, confirm correct stripe & stride values
Bug:
33243520
Merged-In: Ia97cdd2d0239c3484b895fce49299f692ef911d8
Change-Id: Ia97cdd2d0239c3484b895fce49299f692ef911d8
Signed-off-by: Connor O'Brien <connoro@google.com>
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: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."
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: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: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 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: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: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: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: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: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>
OSDN Git Service
