Commit Graph

38144 Commits

Author SHA1 Message Date
Bowgo Tsai c1ccae5009 Merge "Use make functions to convert a text to lower case" am: cd46f1012e am: 5a7d87afce
am: 98e356910f

Change-Id: I4b2676842f25f4bc4e59c8be307892f22e53de95
2017-06-21 02:23:58 +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
SzuWei Lin e7a5506e1f Merge "Add audio.a2dp.default to generic system image" into oc-dr1-dev
am: 4e08677575

Change-Id: I45aa7f7055dd4fe874daa2b1c2c8f8f317fe2f5a
2017-06-21 02:06:57 +00:00
TreeHugger Robot 4e08677575 Merge "Add audio.a2dp.default to generic system image" into oc-dr1-dev 2017-06-21 01:57:53 +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 d728b292b1 Merge "LOCAL_PROPRIETARY_MODULE implies LOCAL_USE_VNDK" am: 3952eef8ce am: 7dbc8e08ce
am: ba5a198625

Change-Id: Iaa40b19c94c425b74a93d64c33bc5aa06f8c2690
2017-06-21 00:53:55 +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
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 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
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
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