Josh Gao
7cf55a4581
Merge "Add crash_dump and tombstoned products."
...
am: 6651199eeb
Change-Id: Iccd2f0043281115494f17e4c3d69f7c9a8a6af03
2017-01-18 23:16:55 +00:00
Josh Gao
6651199eeb
Merge "Add crash_dump and tombstoned products."
2017-01-18 23:04:09 +00:00
Jorim Jaggi
27b7101c6c
Merge "Revert "SELinux: split property_contexts into platform and non-platform components.""
...
am: ce0bae2f47
Change-Id: I230c5966278be38339fd369075be30320d27bcd2
2017-01-18 16:42:00 +00:00
Jorim Jaggi
b909e2c1aa
Revert "SELinux: split property_contexts into platform and non-platform components."
...
am: 8cbd925748
Change-Id: Id5007d02d02bf27e7ab96c48dbecb908f81dd496
2017-01-18 16:41:33 +00:00
Jorim Jaggi
ce0bae2f47
Merge "Revert "SELinux: split property_contexts into platform and non-platform components.""
2017-01-18 16:33:32 +00:00
Jorim Jaggi
8cbd925748
Revert "SELinux: split property_contexts into platform and non-platform components."
...
This reverts commit c5ffdd4bb4
.
Change-Id: I4c5fa6c68cbf0124117153660a2fd363f72388b6
2017-01-18 15:37:30 +00:00
Sandeep Patil
cb0a92be8b
Merge "SELinux: split property_contexts into platform and non-platform components."
...
am: f91d163625
Change-Id: I014a2249a6bc7808292a3253721fe0d6724cd344
2017-01-18 06:17:24 +00:00
Sandeep Patil
a94ae916ce
SELinux: split property_contexts into platform and non-platform components.
...
am: c5ffdd4bb4
Change-Id: Id6a41eb5a4c1cc63c6ca93197f357a7de0604bab
2017-01-18 06:12:26 +00:00
Treehugger Robot
f91d163625
Merge "SELinux: split property_contexts into platform and non-platform components."
2017-01-18 06:09:02 +00:00
Sandeep Patil
bbf5e0b99b
Merge "SELinux: split service_contexts into platform and non-platform components."
...
am: a91d63fa65
Change-Id: I872a51e28f8cd70972c1d924ba6591c0e9df4f13
2017-01-18 00:41:38 +00:00
Sandeep Patil
c5ffdd4bb4
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>
2017-01-18 00:41:15 +00:00
Sandeep Patil
0068df10f6
SELinux: split service_contexts into platform and non-platform components.
...
am: e4ade08f63
Change-Id: Icad4eca1ac22b99a6aa0f130799143ee89727f55
2017-01-18 00:41:03 +00:00
Treehugger Robot
a91d63fa65
Merge "SELinux: split service_contexts into platform and non-platform components."
2017-01-18 00:36:56 +00:00
Josh Gao
e6b2ddaf69
Add crash_dump and tombstoned products.
...
Bug: http://b/30705528
Change-Id: I3f6c98f6f907f93e082db085a122557fc8488c83
2017-01-17 13:55:18 -08:00
Connor O'Brien
80daf82c0b
Merge "Pass flash erase & logical block size to mke2fs"
...
am: cf4f7eac85
Change-Id: I135f5117e4c0ac02ee22e0d2e6262894cb18b629
2017-01-17 20:13:33 +00:00
Connor O'Brien
cf4f7eac85
Merge "Pass flash erase & logical block size to mke2fs"
2017-01-17 20:07:11 +00:00
Sandeep Patil
e4ade08f63
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>
2017-01-17 04:39:00 +00:00
Tao Bao
0e2a0fd76c
Merge "releasetools: Replace print stmt with print()."
...
am: 4a0b494eea
Change-Id: I8823ee5f778c3017d85c1fa6d0f159ad85178314
2017-01-14 15:40:27 +00:00
Tao Bao
4a0b494eea
Merge "releasetools: Replace print stmt with print()."
2017-01-14 15:36:41 +00:00
Tao Bao
82c2fb0e21
Merge "releasetools: Delete the obsolete --aslr_mode/-a flag."
...
am: ecbb31e8c4
Change-Id: I648906871d064a309b21eca4c8718bb15381f086
2017-01-14 08:13:43 +00:00
Treehugger Robot
ecbb31e8c4
Merge "releasetools: Delete the obsolete --aslr_mode/-a flag."
2017-01-14 08:08:30 +00:00
Tao Bao
89fbb0f6d5
releasetools: Replace print stmt with print().
...
So that it's compatible with Python 3.
Test: pylint --pylint=pylintrc
Change-Id: If06c135a492c94bedd713c8cbdf03155a502d5cd
2017-01-13 14:55:14 -08:00
Tao Bao
2a0d1da4d9
releasetools: Delete the obsolete --aslr_mode/-a flag.
...
It was added in commit 96be7205dc
("Working ASLR implementation.") in 2010, and removed in commit
1807e700a5
("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
2017-01-13 22:46:27 +00:00
Chen Xu
10253bbea9
Merge "Include CarrierDefaultApp to the img"
...
am: 5e6ce5f504
Change-Id: Ibe79b9b961f6a04535e2f34e3da2ef1e3367a9d9
2017-01-13 22:08:32 +00:00
Chen Xu
5e6ce5f504
Merge "Include CarrierDefaultApp to the img"
2017-01-13 21:59:23 +00:00
Connor O'Brien
20f08c3e16
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>
2017-01-13 12:17:05 -08:00
fionaxu
94e974dece
Include CarrierDefaultApp to the img
...
Bug: 30958215
Test: Manual test
Change-Id: I67e235028b73513954b7d5f4fe2623700d176e87
2017-01-13 11:49:58 -08:00
Joachim Sauer
4f60acde39
Merge "Add java.time packages to whitelist."
...
am: 4dbe67cddc
Change-Id: I93342090e16090e73dd2377f027deedd321849d8
2017-01-13 10:25:46 +00:00
Joachim Sauer
4dbe67cddc
Merge "Add java.time packages to whitelist."
2017-01-13 10:18:20 +00:00
Jack He
dfa69daccc
Merge "Add mk file parsers to support build variables required by system/bt"
...
am: 7b66d28b25
Change-Id: I188658d0741722e78ed2b636e04830c0870ca728
2017-01-12 08:40:13 +00:00
Treehugger Robot
7b66d28b25
Merge "Add mk file parsers to support build variables required by system/bt"
2017-01-12 08:31:26 +00:00
Jack He
da214cd572
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
2017-01-11 17:11:32 -08:00
Colin Cross
a8839ac623
Merge "Don't run find on directories that don't exist"
...
am: c1df498f0c
Change-Id: If0792cb62b7e666ca700dbb9b0dbf4b3d6d3cd02
2017-01-11 23:54:27 +00:00
Treehugger Robot
c1df498f0c
Merge "Don't run find on directories that don't exist"
2017-01-11 23:42:41 +00:00
Colin Cross
efb30be703
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
2017-01-11 23:31:46 +00:00
Joachim Sauer
66d05aebd6
Add java.time packages to whitelist.
...
Bug: 28832222
Test: builds
Change-Id: I5a77f519f51eca93c34e4697b92a92bf72f4eda9
2017-01-11 12:48:33 +00:00
Jean-Luc Brouillet
d9bfeff242
Merge "Move rs/scriptc to rs/script_api/include."
...
am: a3ab4cc9c9
Change-Id: Iddbffd165df0bb1587fb534084014ced46fb529b
2017-01-11 02:12:58 +00:00
Jean-Luc Brouillet
a3ab4cc9c9
Merge "Move rs/scriptc to rs/script_api/include."
2017-01-11 02:04:16 +00:00
Steven Moreland
ff2c0a1433
Merge "embedded.mk: add android.hidl.memory@1.0-impl"
...
am: 2ec742a956
Change-Id: Ifa7263257caf2198b5980b30f0efbfd129771e30
2017-01-09 20:57:36 +00:00
Treehugger Robot
2ec742a956
Merge "embedded.mk: add android.hidl.memory@1.0-impl"
2017-01-09 20:51:16 +00:00
Dan Cashman
a44337de33
Merge "Split seapp_contexts into plat and nonplat components."
...
am: 082e8e07ac
Change-Id: Id18ea3cafe444dc8574fd9ac0970f66dc0dad1aa
2017-01-09 20:38:07 +00:00
Dan Cashman
c6321e54b6
Split seapp_contexts into plat and nonplat components.
...
am: 6f1ea7101f
Change-Id: If495c16b0259134492ba6f912a4d54c90fedc468
2017-01-09 20:37:46 +00:00
Treehugger Robot
082e8e07ac
Merge "Split seapp_contexts into plat and nonplat components."
2017-01-09 20:30:22 +00:00
Tao Bao
ca95ee0465
Merge "Makefile: Pack e2fsdroid into otatools.zip."
...
am: bb6935051a
Change-Id: Id514131231d4f5123322e4d9e0c0f797198cb275
2017-01-09 19:27:01 +00:00
Tao Bao
8c07d3c840
Makefile: Pack e2fsdroid into otatools.zip.
...
am: bcc3109262
Change-Id: I32ef5db01b70420994f48fe35a8eb4ba071eb4be
2017-01-09 19:27:00 +00:00
Tao Bao
bb6935051a
Merge "Makefile: Pack e2fsdroid into otatools.zip."
2017-01-09 19:17:21 +00:00
Jean-Luc Brouillet
eba449391e
Move rs/scriptc to rs/script_api/include.
...
Test: Compiled ImageProcessing_jb
Change-Id: Icf05a603671499665d2f31a8989fa69585a6f834
2017-01-08 17:57:48 -08:00
Steven Moreland
94946d0eb8
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
2017-01-08 10:00:20 -08:00
Tao Bao
bcc3109262
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
2017-01-06 14:32:51 -08:00
Lingfeng Yang
528a561d4e
Merge "Allow goldfish-setup to take wake locks"
...
am: 10f6bf093d
Change-Id: I0c6100a314ea619d91b1b4a2c82894b102cdaaea
2017-01-06 20:03:48 +00:00