Lingfeng Yang
9f7ef7bed8
Allow /dev/goldfish_sync
...
am: bdceef4325
Change-Id: Iaa5b0fe304e3b65a4e58949d9c8fc7b3ce5f83ec
2017-01-17 00:45:28 +00:00
Tao Bao
3cf2daceb6
Merge "releasetools: Replace print stmt with print()." am: 4a0b494eea
...
am: 0e2a0fd76c
Change-Id: I4efbff199c3a44ddc33a0e46cdd64a6c949c5262
2017-01-14 15:43:26 +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
6c828d25b8
Merge "releasetools: Delete the obsolete --aslr_mode/-a flag." am: ecbb31e8c4
...
am: 82c2fb0e21
Change-Id: If3acd29bc8854d1c1e2b53216f5e984cdd46c0e9
2017-01-14 08:16:43 +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
189298d536
Merge "Include CarrierDefaultApp to the img" am: 5e6ce5f504
...
am: 10253bbea9
Change-Id: If9e2c093b2a0802c639b1a0d88e913300e94a3c0
2017-01-13 22:10:32 +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
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
95874afdfb
Merge "Add java.time packages to whitelist." am: 4dbe67cddc
...
am: 4f60acde39
Change-Id: I792adfb7df7dba66236c15956c899a5b36a61a2f
2017-01-13 10:33:56 +00: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
Lingfeng Yang
bdceef4325
Allow /dev/goldfish_sync
...
Change-Id: I41883eafd2b261d000c41eaf3ba04af7e2b89349
(cherry picked from commit 5d6ae8a3d467dd23a2f09a96bc4fdbea2d0353a2)
2017-01-12 11:35:53 -08:00
Jack He
258cf95456
Merge "Add mk file parsers to support build variables required by system/bt" am: 7b66d28b25
...
am: dfa69daccc
Change-Id: Ie7e81cfe290214734db6c09c42f4aba8d2cd2be8
2017-01-12 08:46:13 +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
3432bf504c
Merge "Don't run find on directories that don't exist" am: c1df498f0c
...
am: a8839ac623
Change-Id: Ia8043ec41fd4589a300aa2780e775d003e0f2d0a
2017-01-11 23:59:39 +00: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
235123a821
Merge "Move rs/scriptc to rs/script_api/include." am: a3ab4cc9c9
...
am: d9bfeff242
Change-Id: I0249452861ffd748200c02434674832a2303b20b
2017-01-11 02:17:59 +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
d1f4fc175e
Merge "embedded.mk: add android.hidl.memory@1.0-impl" am: 2ec742a956
...
am: ff2c0a1433
Change-Id: I28e67e22a3fd5322a17a4ad2ee32f2b0fd0a0f70
2017-01-09 21:02:06 +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
7a160eb5c8
Merge "Split seapp_contexts into plat and nonplat components." am: 082e8e07ac
...
am: a44337de33
Change-Id: I98a149f6609739986b52e594075c72b0cebd2c00
2017-01-09 20:42:55 +00:00
Dan Cashman
1960e5f085
Split seapp_contexts into plat and nonplat components. am: 6f1ea7101f
...
am: c6321e54b6
Change-Id: I8548f258416b730625d332e461b16df5b27c5c9a
2017-01-09 20:42:47 +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
da855a7081
Merge "Makefile: Pack e2fsdroid into otatools.zip." am: bb6935051a
...
am: ca95ee0465
Change-Id: I3258e0fd12a859fdf307b854fe0a1af6cc0250c0
2017-01-09 19:32:44 +00:00
Tao Bao
f2305870f0
Makefile: Pack e2fsdroid into otatools.zip. am: bcc3109262
...
am: 8c07d3c840
Change-Id: I618f192b092feef99f430b65a4463c925e382d1b
2017-01-09 19:32:30 +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
f0069a0c7f
Merge "Allow goldfish-setup to take wake locks" am: 10f6bf093d
...
am: 528a561d4e
Change-Id: I94dc950a2401967c1688290762fea8df0fab96ed
2017-01-06 20:07:19 +00: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
Treehugger Robot
10f6bf093d
Merge "Allow goldfish-setup to take wake locks"
2017-01-06 19:57:53 +00:00
Lingfeng Yang
de0eaf2b7b
Allow goldfish-setup to take wake locks
...
Change-Id: I6a5db8586168e47e974a82afd2e75fd858aa5750
2017-01-06 10:12:08 -08:00
dcashman
9937a72425
Merge "Build split file_contexts." am: 80e70ae04a
...
am: dc9771e24c
Change-Id: Iff2afa4574052a4580739ce04904401334d1c270
2017-01-06 17:33:14 +00:00