Jack He
dfa69daccc
Merge "Add mk file parsers to support build variables required by system/bt"
...
am: 7b66d28b25
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
2017-01-11 23:59:39 +00:00
Colin Cross
a8839ac623
Merge "Don't run find on directories that don't exist"
...
am: c1df498f0c
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
2017-01-11 02:17:59 +00:00
Jean-Luc Brouillet
d9bfeff242
Merge "Move rs/scriptc to rs/script_api/include."
...
am: a3ab4cc9c9
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
2017-01-09 21:02:06 +00:00
Steven Moreland
ff2c0a1433
Merge "embedded.mk: add android.hidl.memory@1.0-impl"
...
am: 2ec742a956
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
2017-01-09 20:42:55 +00:00
Dan Cashman
1960e5f085
Split seapp_contexts into plat and nonplat components. am: 6f1ea7101f
...
am: c6321e54b6
2017-01-09 20:42:47 +00:00
Dan Cashman
a44337de33
Merge "Split seapp_contexts into plat and nonplat components."
...
am: 082e8e07ac
2017-01-09 20:38:07 +00:00
Dan Cashman
c6321e54b6
Split seapp_contexts into plat and nonplat components.
...
am: 6f1ea7101f
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
2017-01-09 19:32:44 +00:00
Tao Bao
f2305870f0
Makefile: Pack e2fsdroid into otatools.zip. am: bcc3109262
...
am: 8c07d3c840
2017-01-09 19:32:30 +00:00
Tao Bao
ca95ee0465
Merge "Makefile: Pack e2fsdroid into otatools.zip."
...
am: bb6935051a
2017-01-09 19:27:01 +00:00
Tao Bao
8c07d3c840
Makefile: Pack e2fsdroid into otatools.zip.
...
am: bcc3109262
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
2017-01-06 20:07:19 +00:00
Lingfeng Yang
528a561d4e
Merge "Allow goldfish-setup to take wake locks"
...
am: 10f6bf093d
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
2017-01-06 17:33:14 +00:00
dcashman
dc9771e24c
Merge "Build split file_contexts."
...
am: 80e70ae04a
2017-01-06 17:29:10 +00:00
Treehugger Robot
80e70ae04a
Merge "Build split file_contexts."
2017-01-06 17:23:45 +00:00
Dan Willemsen
cb43c0f8db
Merge "TARGET_RECOVERY_UPDATER_LIBS should not be used with AB updates" am: 81648927fb
...
am: ce324c6848
2017-01-05 22:51:44 +00:00
Dan Willemsen
ce324c6848
Merge "TARGET_RECOVERY_UPDATER_LIBS should not be used with AB updates"
...
am: 81648927fb
2017-01-05 22:48:11 +00:00
Dan Willemsen
81648927fb
Merge "TARGET_RECOVERY_UPDATER_LIBS should not be used with AB updates"
2017-01-05 22:42:07 +00:00
Dan Cashman
6f1ea7101f
Split seapp_contexts into plat and nonplat components.
...
Bug: 33746381
Test: Device boots with no extra denials.
Change-Id: Ib403be429562f5e22ed4dd042fb04b0795b558db
2017-01-05 12:56:24 -08:00
dcashman
b52f040bec
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 >
2017-01-05 11:25:13 -08:00
Dan Willemsen
00cf76767f
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
2017-01-04 17:36:30 -08:00
Elliott Hughes
cd43ea88e5
Merge changes from topic 'fsconfig2-fixups' am: abf3dbe248
...
am: 2fe7f7a402
2017-01-05 00:34:23 +00:00
William Roberts
d469a347fb
fsconfig: fix pylint warning am: 4165c635b8
...
am: 3f9be0b6ae
2017-01-05 00:34:16 +00:00
William Roberts
e344c7672c
fsconfig: fix style formating with yapf am: 820421c9b5
...
am: 529b397e83
2017-01-05 00:34:10 +00:00
Elliott Hughes
2fe7f7a402
Merge changes from topic 'fsconfig2-fixups'
...
am: abf3dbe248
2017-01-05 00:31:18 +00:00
William Roberts
3f9be0b6ae
fsconfig: fix pylint warning
...
am: 4165c635b8
2017-01-05 00:31:16 +00:00
William Roberts
529b397e83
fsconfig: fix style formating with yapf
...
am: 820421c9b5
2017-01-05 00:31:10 +00:00
Elliott Hughes
abf3dbe248
Merge changes from topic 'fsconfig2-fixups'
...
* changes:
fsconfig: fix pylint warning
fsconfig: fix style formating with yapf
2017-01-05 00:26:04 +00:00
Dan Willemsen
d63d5fffcd
Merge changes from topic 'build-vts-zip' am: d0c693ff64
...
am: a50ead8336
2017-01-04 23:08:37 +00:00
Keun Soo Yim
f1125508ba
delete vts.mk (which is moved to test/vts) am: 18a316c161
...
am: ed61c29cfd
2017-01-04 23:08:31 +00:00
Keun Soo Yim
03616abb42
include VTS packaging task files am: b74649d027
...
am: 33f6d707fa
2017-01-04 23:08:25 +00:00
