Commit graph

38243 commits

Author SHA1 Message Date
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
84cbe4353c 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:54 -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
8e51a42f90 Merge "Remove unnecessary items in treble_common.mk" into oc-dr1-dev
am: c7232cc5d5

Change-Id: I5e4f45335343b7e63db587ad6f9bfaa5c5eabad1
2017-06-20 17:11:14 +00:00
TreeHugger Robot
c7232cc5d5 Merge "Remove unnecessary items in treble_common.mk" into oc-dr1-dev 2017-06-20 17:06:42 +00:00
Lucas Dupin
2fb2b6f9cc Require sysui overlay
am: a426a60a6b

Change-Id: I036d14bc112f73d9372a0f2df56850f161bea98d
2017-06-20 16:58:23 +00:00
Bowgo Tsai
15fd373e3c Pass FRAMEWORK_VBMETA_VERSION to assemble_vintf
Note that this depends on a change in avbtool:
  https://android-review.googlesource.com/#/c/406374/

Bug: 38325029
Test: builds system.img, checks $OUT/system/compatibility_matrix.xml
      contains correct vbmeta-version
Change-Id: Iacc0a2687fb39600ad6b8e9cfbfe5c1a3b90b40b
2017-06-20 18:25:36 +08: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
f184e3a35b Merge "AVB: support chain partition signing" am: 0effed4b94 am: dcad0945ab
am: abbba2c832

Change-Id: I0ffdd31bad14c42afddf8180bf7d1e5e8a0f841d
2017-06-20 07:10:04 +00: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
SzuWei Lin
fe3191727b 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
Change-Id: Iac4821b3daf993da9fc309b7b105db98ee4b89ce
2017-06-19 17:59:20 +08:00
SzuWei Lin
cbd421fd0e Remove unnecessary items in treble_common.mk
Bug: 62360563
Test: Build and check files are still exist in system image
Change-Id: Ie787969d072c5b89d377a2c0b01706764185d6a5
2017-06-19 17:58:30 +08:00
SzuWei Lin
af505d5f2f Add wificond to Android makefiles
wificond is part of the framework, and shouldn't be modified by
vendor. The patch adds wificond to PRODUCT_PACKAGES list of
Android makefile, and removes it from treble_common.mk.

Bug: 62646878
Test: Build and check the file existance in system image
Change-Id: I92f2b64c1912ed5106a72a56e831bc989a70979e
2017-06-19 16:06:11 +08:00
Lucas Dupin
a426a60a6b Require sysui overlay
All builds should include the 2 systemui themes

Bug: 62346335
Change-Id: Iacfe3c7494f81ee05118a6f782a96c96ce901bb3
2017-06-18 18:49:45 -07:00
Dan Willemsen
996bb6dbe2 Mark oc-dev-plus-aosp OPR1 as REL
am: 0596384adb  -s ours

Change-Id: I82eb30022addf70c4a99a0ec5b9a4fa7f0a9497c
2017-06-16 23:05:14 +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
Igor Murashkin
5f5daa504e Merge "core: Move core.oat bootjar definitions into envsetup.mk" into oc-dev-plus-aosp
am: caa917ae3d

Change-Id: I312c7e60ef87dc2f400c992754e4093edfe300ee
2017-06-16 03:28:02 +00: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
91806b12e7 Merge "core: Move core.oat bootjar definitions into envsetup.mk" am: 6cb7688e85 am: 692309c9f5 -s ours
am: 8748f92627

Change-Id: Ib83f76f8597cd9f858c8c7d7658917abbbfeb08b
2017-06-16 03:12:05 +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
Igor Murashkin
cda3d10e56 core: Move core.oat bootjar definitions into envsetup.mk
TARGET_CORE_JARS and HOST_CORE_JARS define the minimal bootclasspath jars necessary to run
with dalvikvm/art.

Also refactor PRODUCT_BOOT_JARS in core-tiny.mk and core-minimal.mk to reuse TARGET_CORE_JARS.
The above variables can be used from scripts with get_build_var from envsetup.sh

  $> get_build_var TARGET_CORE_JARS
  <prints list of core jars>

(These changes are required to figure out what --bootclasspath_entry to pass to desugar).

Bug: 36902714
Test: make -j32 build-art-host build-art-target
Test: lunch aosp_angler-userdebug && make -j32
Test: make -j32 PRODUCT-sdk_google_aw_x86-sdk
Change-Id: If12569719343bfbba20c1cda9a5302ab541dbfc6
(cherry picked from commit f33a96c07f)
2017-06-16 03:08:33 +00:00
Igor Murashkin
692309c9f5 Merge "core: Move core.oat bootjar definitions into envsetup.mk"
am: 6cb7688e85

Change-Id: I1a5ce06a6c6fed382b970ed13c495232b30b22a5
2017-06-16 02:21:33 +00:00
Treehugger Robot
6cb7688e85 Merge "core: Move core.oat bootjar definitions into envsetup.mk" 2017-06-16 02:06:02 +00:00
Igor Murashkin
9d4639c8c2 core: Move core.oat bootjar definitions into envsetup.mk
TARGET_CORE_JARS and HOST_CORE_JARS define the minimal
bootclasspath jars necessary to run with dalvikvm/art.

Also refactor PRODUCT_BOOT_JARS in core-tiny.mk and core-minimal.mk
to reuse TARGET_CORE_JARS.

The above variables can be used from scripts with get_build_var
from envsetup.sh

  $> get_build_var TARGET_CORE_JARS
  <prints list of core jars>

(These changes are required to figure out what --bootclasspath_entry
to pass to desugar).

Bug: 36902714
Test: make -j32 build-art-host build-art-target
Test: lunch aosp_angler-userdebug && make -j32
Test: make -j32 PRODUCT-sdk_google_aw_x86-sdk
Merged-In: If12569719343bfbba20c1cda9a5302ab541dbfc6
Change-Id: If12569719343bfbba20c1cda9a5302ab541dbfc6
2017-06-16 00:54:47 +00:00
Lingfeng Yang
d2fc242c34 Add android.hardware.power service+impl and power.ranchu
Bug: 37302997
Bug: 37863919

Change-Id: Ifc79b3498c48cf4b8ff5db433064a3bf9edc041b
(cherry picked from commit bc02d4274fde079d97fe18f5a0974a20757f3827)
2017-06-15 18:13:14 +00:00
Nicolas Geoffray
de9dcc1764 Merge "Add a new PRODUCT variable for forcing 'speed' preopt." into oc-dev am: 0081d76597
am: 8be30c47d7

Change-Id: Ica5b09a9e701e778cf7734d1e726af632dd9753f
2017-06-15 14:46:11 +00:00
Nicolas Geoffray
8be30c47d7 Merge "Add a new PRODUCT variable for forcing 'speed' preopt." into oc-dev
am: 0081d76597

Change-Id: I81039c2b5d1ae202e4cbca43e98322e15ab5c3e9
2017-06-15 14:42:18 +00:00
Nicolas Geoffray
9044ffd709 Merge "Add a new PRODUCT variable for forcing 'speed' preopt." into oc-dev am: 0081d76597
am: a2675bdfaf

Change-Id: I4e25daa1aaac3eed2339519db5166e0a19025a92
2017-06-15 14:32:18 +00:00
Nicolas Geoffray
a2675bdfaf Merge "Add a new PRODUCT variable for forcing 'speed' preopt." into oc-dev
am: 0081d76597

Change-Id: Ibac51d932f4c06f60824f4bce35933ee1e6fc874
2017-06-15 14:12:45 +00:00
Nicolas Geoffray
0081d76597 Merge "Add a new PRODUCT variable for forcing 'speed' preopt." into oc-dev 2017-06-15 14:06:10 +00:00
Nicolas Geoffray
cd2a171764 Merge "Add a new PRODUCT variable for forcing 'speed' preopt." am: 8c2c1ed667 am: eec5747912
am: 59514d2bae

Change-Id: I27dcc7cd5fca29fea557cb6d681ccfa570b84cb8
2017-06-15 11:51:26 +00:00
Nicolas Geoffray
59514d2bae Merge "Add a new PRODUCT variable for forcing 'speed' preopt." am: 8c2c1ed667
am: eec5747912

Change-Id: Iee5490ea2b74137612238282115478b148aed55e
2017-06-15 11:48:26 +00:00
Nicolas Geoffray
eec5747912 Merge "Add a new PRODUCT variable for forcing 'speed' preopt."
am: 8c2c1ed667

Change-Id: Iac3d09ba479035e547bdbed1bf35223e851c94f9
2017-06-15 11:44:25 +00:00
Nicolas Geoffray
c3ffeddc59 Add a new PRODUCT variable for forcing 'speed' preopt.
bug: 35872915
Test: build

(cherry picked from commit 4a0ad4ac61)

Change-Id: Idfea3c379a2b1dab30ee94a58ffe86d508f8522f
2017-06-15 12:40:15 +01:00
Nicolas Geoffray
8c2c1ed667 Merge "Add a new PRODUCT variable for forcing 'speed' preopt." 2017-06-15 11:38:24 +00:00
Mariano Giardina
a43852fcdc Merge "Revert "core: Move core.oat bootjar definitions into core/config"" am: 1e14bc3b7b am: cc33b6005f
am: 78d9b75329

Change-Id: I1bd6af643810358d4ea8426338607c6f506dad72
2017-06-15 11:15:23 +00:00
Mariano Giardina
78d9b75329 Merge "Revert "core: Move core.oat bootjar definitions into core/config"" am: 1e14bc3b7b
am: cc33b6005f

Change-Id: I2f7465d6bd723c85aa0c028e8e8268d631c13d02
2017-06-15 11:12:23 +00:00
Mariano Giardina
cc33b6005f Merge "Revert "core: Move core.oat bootjar definitions into core/config""
am: 1e14bc3b7b

Change-Id: I6d366d325fd951302c492e32248d0f6469999225
2017-06-15 11:09:24 +00:00
Mariano Giardina
1e14bc3b7b Merge "Revert "core: Move core.oat bootjar definitions into core/config"" 2017-06-15 11:01:29 +00:00
Mariano Giardina
2f137ee118 Revert "core: Move core.oat bootjar definitions into core/config"
This reverts commit 8c50798243.

Possible culprit of breakage in git_master sdk_google_aw_x86:
FAILED: out/target/product/generic_x86/dex_bootjars/system/framework/x86/boot.art 
ex2oatd E 06-15 03:56:00 47990 47990 runtime.cc:1761] Failed to return pre-allocated NoClassDefFoundError
dex2oatd F 06-15 03:56:00 47990 47990 thread.cc:3591] Check failed: new_exception != nullptr 

Testing if Treehugger passes with the rollback before submitting

https://android-build.googleplex.com/builds/submitted/4101897/sdk_google_aw_x86-sdk/latest/view/logs/build_error.log

Change-Id: Iceac31e775eaf3cd5fd9b3d2a17d3af200e35b27
2017-06-15 10:14:51 +00:00
Paul Duffin
e101faa214 Merge "Add junit/textui/** to the proguard filter" am: 3b3bffc0d0 am: 5022a346c7
am: b61544dd73

Change-Id: Ia0f9214c51370fa6160652614bc39504e237246b
2017-06-15 09:15:46 +00:00
Paul Duffin
b61544dd73 Merge "Add junit/textui/** to the proguard filter" am: 3b3bffc0d0
am: 5022a346c7

Change-Id: I5ba99c3e20a0aeee1c8a6c5bd6119a1615112cb5
2017-06-15 09:12:50 +00:00
Paul Duffin
5022a346c7 Merge "Add junit/textui/** to the proguard filter"
am: 3b3bffc0d0

Change-Id: I9b04203701bc38b7b2630ce78513c8f519d10822
2017-06-15 09:09:45 +00:00
Paul Duffin
3b3bffc0d0 Merge "Add junit/textui/** to the proguard filter" 2017-06-15 09:04:08 +00:00
Nicolas Geoffray
4a0ad4ac61 Add a new PRODUCT variable for forcing 'speed' preopt.
bug: 35872915
Test: build
Change-Id: Idfea3c379a2b1dab30ee94a58ffe86d508f8522f
2017-06-15 09:52:45 +01:00