Commit Graph

37834 Commits

Author SHA1 Message Date
Huan Ren 874ee28b68 Merge "Add android.hardware.power service+impl and power.ranchu" into oc-dev
am: 76946c6ab6

Change-Id: I2a87da8ab334e8fa7a2076677dc27bc75a09dbff
2017-06-23 19:43:01 +00:00
Huan Ren 76946c6ab6 Merge "Add android.hardware.power service+impl and power.ranchu" into oc-dev 2017-06-23 18:33:16 +00:00
Andreas Gampe ac1a012d21 Merge "Build: Use ART phony packages in runtime_libart" am: 47b734db57
am: 2d3b1ca45a

Change-Id: I28d9d8369f374e7b20461a4e931e70aafe3a10eb
2017-06-23 02:01:57 +00:00
Andreas Gampe 2d3b1ca45a Merge "Build: Use ART phony packages in runtime_libart"
am: 47b734db57

Change-Id: Ibad6205131c8c3d562eb1f3d3eff3a6b8916a432
2017-06-23 01:57:26 +00:00
Treehugger Robot 47b734db57 Merge "Build: Use ART phony packages in runtime_libart" 2017-06-23 01:47:33 +00:00
Colin Cross b12d4b7ac2 Get java config from soong
Soong will export java config variables.

Test: builds
Change-Id: If185543f8f36a30e7632946c16351d44f012bd6a
2017-06-22 17:21:05 -07:00
Andreas Gampe ae4916b0ad Build: Use ART phony packages in runtime_libart
Move definition of necessary packages for ART to art/Android.mk.
Use the phony packages defined there in runtime_libart.mk.

Bug: 62087184
Test: m
Test: Device boots
Change-Id: Iae6e5bba2184b098820783dc5e9f6b5f2a9836e9
2017-06-22 15:35:14 -07:00
Tianjie Xu 35f6f99056 Merge "Remove the obsolete location check for install-recovery.sh" am: 8fb65a5d63
am: ea5dad9010

Change-Id: I26e314431a87732a486566d2702106d28d323d92
2017-06-22 18:27:49 +00:00
Tianjie Xu e0bda97ea1 Merge "Verify the contents in install-recovery.sh" am: 924c1c0598
am: 01c463e406

Change-Id: Ie8177614c855e3f554184d570b2f98b29aefc8c6
2017-06-22 18:27:39 +00:00
Tianjie Xu ea5dad9010 Merge "Remove the obsolete location check for install-recovery.sh"
am: 8fb65a5d63

Change-Id: Ibc02c20dcd47232fe31f2b543e3a3ae996fdbb33
2017-06-22 18:24:13 +00:00
Tianjie Xu 01c463e406 Merge "Verify the contents in install-recovery.sh"
am: 924c1c0598

Change-Id: Ie623c82d544a0c5ee7659826ffe7e394d1fed312
2017-06-22 18:24:06 +00:00
Tianjie Xu 8fb65a5d63 Merge "Remove the obsolete location check for install-recovery.sh" 2017-06-22 18:12:44 +00:00
Tianjie Xu 924c1c0598 Merge "Verify the contents in install-recovery.sh" 2017-06-22 18:12:44 +00:00
Jiyong Park 3487a6127d Merge "Add LOCAL_OVERRIDES_MODULES" am: f1610d82f9
am: 9089f867d4

Change-Id: I3966676c72a0bb734da8c71765fc900fcfe85eb9
2017-06-22 04:56:12 +00:00
Jiyong Park 9089f867d4 Merge "Add LOCAL_OVERRIDES_MODULES"
am: f1610d82f9

Change-Id: I5af8bf3eb789574aa804403de4d946552c9b9fbd
2017-06-22 04:52:39 +00:00
Treehugger Robot f1610d82f9 Merge "Add LOCAL_OVERRIDES_MODULES" 2017-06-22 04:49:41 +00:00
Chih-hung Hsieh 877a7a43d2 Merge "Add OWNERS in build/make" am: d79ce64555
am: 9af11fce7a

Change-Id: I44e3689a9280de474055ec4f109278ef2ff7d8cf
2017-06-22 04:34:38 +00:00
Chih-hung Hsieh 9af11fce7a Merge "Add OWNERS in build/make"
am: d79ce64555

Change-Id: Ic4bfd5c9d8756055faa6781772d93bca801e114d
2017-06-22 04:31:07 +00:00
Chih-hung Hsieh d79ce64555 Merge "Add OWNERS in build/make" 2017-06-22 04:27:13 +00:00
Chris Fries abd4388b4c Merge "Makefile: Add avbtool to INTERNAL_USERIMAGES_DEPS" am: ccac0f861b
am: ba0be93555

Change-Id: I1b6a9b8f05d10738267a51da65bd404242885e6c
2017-06-21 23:16:31 +00:00
Chris Fries ba0be93555 Merge "Makefile: Add avbtool to INTERNAL_USERIMAGES_DEPS"
am: ccac0f861b

Change-Id: I9e8c86f81543efd95b90f2804ab58a6f8edec695
2017-06-21 23:13:43 +00:00
Chih-Hung Hsieh 044fc0c4a4 Add OWNERS in build/make
* Owners are selected from top CL approvals or owners.
  They will be suggested to review/approve future CLs.
* OWNERS files are recognized by the new find-owners plugin, see .md files in
  https://gerrit.googlesource.com/plugins/find-owners/+/master/src/main/resources/Documentation/

Test: build/make/tools/checkowners.py -c -v OWNERS
Change-Id: Ibe6765e5448c471ca413413e3d052507ccee4ea6
2017-06-21 16:09:56 -07:00
Treehugger Robot ccac0f861b Merge "Makefile: Add avbtool to INTERNAL_USERIMAGES_DEPS" 2017-06-21 23:06:19 +00:00
Chris Fries df0387ddab Makefile: Add avbtool to INTERNAL_USERIMAGES_DEPS
.. in order to let the system_other image use it.

Bug: 33203383 Can't build target on mac
Change-Id: Iac2faf0ebdcc933675afbec2301d5d455aa33501
2017-06-21 16:19:35 -05:00
Colin Cross 38e8c8bc8c Merge "Add make sync target" am: 564ce0fa53
am: 5d848ba50a

Change-Id: I384460e7373aec904a4779d8af1648f20c004ff8
2017-06-21 03:00:47 +00:00
Dan Willemsen b2f7189479 Merge "Support custom my_copy_pairs in package-modules.mk" am: 5b91bd4ccb
am: 616764b247

Change-Id: I288d04b2e69c7f231f25905edcff19b31c6cf499
2017-06-21 03:00:30 +00:00
Colin Cross 5d848ba50a Merge "Add make sync target"
am: 564ce0fa53

Change-Id: I88271ab1c71ce4c1fe9e7110bd8cf3861a4d28f6
2017-06-21 02:54:49 +00:00
Dan Willemsen 616764b247 Merge "Support custom my_copy_pairs in package-modules.mk"
am: 5b91bd4ccb

Change-Id: I87afb199ec7504ca0c927332a641f93587a8480e
2017-06-21 02:54:31 +00:00
SzuWei Lin ef8e26b220 Add audio.a2dp.default to generic system image
am: fbac1195e9

Change-Id: I0a5f13ec32cfac2caa5dbb8e979fb0dffa54be5e
2017-06-21 02:48:32 +00:00
Treehugger Robot 564ce0fa53 Merge "Add make sync target" 2017-06-21 02:42:28 +00:00
Treehugger Robot 5b91bd4ccb Merge "Support custom my_copy_pairs in package-modules.mk" 2017-06-21 02:36:14 +00:00
Bowgo Tsai 98e356910f Merge "Use make functions to convert a text to lower case" am: cd46f1012e
am: 5a7d87afce

Change-Id: I5da050178795dce0333b74ca91a7c18968ea5bd7
2017-06-21 02:18:31 +00:00
Bowgo Tsai 5a7d87afce Merge "Use make functions to convert a text to lower case"
am: cd46f1012e

Change-Id: I737210f72379b1c77e8568556a1185bbc0c6bb16
2017-06-21 02:12:58 +00:00
Treehugger Robot cd46f1012e Merge "Use make functions to convert a text to lower case" 2017-06-21 01:56:08 +00:00
Yifan Hong ba5a198625 Merge "LOCAL_PROPRIETARY_MODULE implies LOCAL_USE_VNDK" am: 3952eef8ce
am: 7dbc8e08ce

Change-Id: I99525848d5e12269351d18e237ea1e3f82967420
2017-06-21 00:49:25 +00:00
Yifan Hong 7dbc8e08ce Merge "LOCAL_PROPRIETARY_MODULE implies LOCAL_USE_VNDK"
am: 3952eef8ce

Change-Id: I651ac922ea336c79880a3727cab621bb7167d20d
2017-06-21 00:44:54 +00:00
Treehugger Robot 3952eef8ce Merge "LOCAL_PROPRIETARY_MODULE implies LOCAL_USE_VNDK" 2017-06-21 00:33:24 +00:00
Tianjie Xu 9c384d2ca5 Verify the contents in install-recovery.sh
Check the SHA1 of recovery.img and boot.img embedded in the
install-recovery.sh.

Bug: 35411009
Test: validation script detects mismatch for both full recovery and
recovery-from-boot.
Change-Id: I5f07a869d9fa17fad26a22ef9ca3ecb06b1b28e3
2017-06-20 17:28:35 -07:00
Colin Cross 91a52277b0 Add make sync target
make sync will build everything necessary to adb sync system
and vendor, without wasting time rebuilding system.img and
vendor.img.

Test: m -j sync
Change-Id: I91c0012eed6d58a338393cc375056a30e2a24b09
2017-06-20 16:57:52 -07:00
Tianjie Xu 78de9f173d Remove the obsolete location check for install-recovery.sh
The script has been moved to /system/bin since L.

Bug: 35411009
Test: Generate a exact same OTA for bullhead.
Change-Id: Iaecb86e3dabc5b659605837bb06f16d20fa80334
2017-06-20 16:52:54 -07:00
Dan Willemsen f354b178b1 Support custom my_copy_pairs in package-modules.mk
To support extra files in package-modules.mk, allow the user to set
my_copy_pairs to a list of src:dest pairs that will be copied into the
zip file.

Test: build-aosp_arm.ninja is identical before/after
Test: codesearch says that these variables aren't otherwise used
Test: set my_copy_pairs, ensure that they exist in the zip.
Change-Id: Ia80cd136db8ad37a71010baf0552621b281c8bc3
2017-06-20 16:00:48 -07:00
Yifan Hong 3ca68183bb LOCAL_PROPRIETARY_MODULE implies LOCAL_USE_VNDK
Test: m -j -k BOARD_VNDK_VERSION=true

Bug: 37342627

Change-Id: I6bb878eeb2a7b2cb4392fd60bc397e35ad51a6e2
Merged-In: I6bb878eeb2a7b2cb4392fd60bc397e35ad51a6e2
2017-06-20 15:42:37 -07:00
SzuWei Lin fbac1195e9 Add audio.a2dp.default to generic system image
audio.a2dp.default is a system module. Generic system image includes
audio.a2dp.default to support A2DP if board has the capability.

Bug: 62649731
Test: build and check the file existance in system image
Merged-In: Iac4821b3daf993da9fc309b7b105db98ee4b89ce
Change-Id: I0d2194c4145927b21df5858a3787f8c210f2794c
(cherry picked from commit fe3191727b)
2017-06-20 17:54:07 +08:00
Bowgo Tsai e615afd6d0 Use make functions to convert a text to lower case
We cannot cache the result of ($shell ...) and we have to run these on
every build even if we don't have to re-read the makefiles. Replace it
with make functions $(substr $(substr ... )).

Bug: 38399657
Test: `make` pass, flash images from $OUT and boot device with chain partitions
Change-Id: I6d4ff8e487931ba25008a2a881401a8951d4049e
2017-06-20 17:44:00 +08:00
Bowgo Tsai abbba2c832 Merge "AVB: support chain partition signing" am: 0effed4b94
am: dcad0945ab

Change-Id: I5bc9f2dcc94b2db846d9956c0def6b3c9910b2c5
2017-06-20 07:07:33 +00:00
Bowgo Tsai dcad0945ab Merge "AVB: support chain partition signing"
am: 0effed4b94

Change-Id: Ic1383d4250563fdad15b37dae5f6aa2173099f57
2017-06-20 07:05:04 +00:00
Treehugger Robot 0effed4b94 Merge "AVB: support chain partition signing" 2017-06-20 06:57:34 +00:00
Dan Willemsen 0596384adb Mark oc-dev-plus-aosp OPR1 as REL
It contains all of oc-dev, which has OPR1 marked as REL, so we should be
using API 26 instead of 'O'.

Test: Check PLATFORM_VERSION_CODENAME / PLATFORM_SDK_VERSION
Change-Id: I0e8f3b42b8ac60422f0a8b044de45ba03b0bcfcf
Merged-In: I036cc43c1f2aa5317ae1131dc31a1f96caa5081f
2017-06-16 15:02:51 -07:00
TreeHugger Robot caa917ae3d Merge "core: Move core.oat bootjar definitions into envsetup.mk" into oc-dev-plus-aosp 2017-06-16 03:21:30 +00:00
Igor Murashkin 8748f92627 Merge "core: Move core.oat bootjar definitions into envsetup.mk" am: 6cb7688e85
am: 692309c9f5  -s ours

Change-Id: I70259e9774c27532e6603a36ab474f3b939c42b1
2017-06-16 03:08:35 +00:00