Commit graph

37698 commits

Author SHA1 Message Date
SzuWei Lin
ef8e26b220 Add audio.a2dp.default to generic system image
am: fbac1195e9

Change-Id: I0a5f13ec32cfac2caa5dbb8e979fb0dffa54be5e
2017-06-21 02:48:32 +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
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
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
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
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
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
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
Paul Duffin
54747a7f09 Add junit/textui/** to the proguard filter
Fixes build breakage caused by having duplicate versions of
a class in the application and in the API. This workaround will
be removed once junit classes have been removed from the API.

Bug: 30188076
Test: make Browser2 ANDROID_FORCE_JACK_ENABLED=disabled
Change-Id: I9a9031d3ef6d82f35413b229d588a605f9ed39dc
2017-06-15 08:42:23 +01:00
Yoshisato Yanagisawa
7b691489a8 Merge "Set JAVAC_WRAPPER if USE_GOMA is set." am: aa09aa819f
am: cc2ca23b1e

Change-Id: Ie7288bc85507008efeed8bf5a3b42ceb2392062b
2017-06-15 07:38:39 +00:00
Yoshisato Yanagisawa
cc2ca23b1e Merge "Set JAVAC_WRAPPER if USE_GOMA is set."
am: aa09aa819f

Change-Id: I01f0900fff9e4fb0b1acc09e605a9a0814189a93
2017-06-15 07:35:38 +00:00
Treehugger Robot
aa09aa819f Merge "Set JAVAC_WRAPPER if USE_GOMA is set." 2017-06-15 07:28:26 +00:00
Igor Murashkin
9c57325093 Merge "core: Move core.oat bootjar definitions into core/config" am: 5e1aa20225
am: db52463bb3

Change-Id: I7fe90df0a8dae2fb5aa9f0dbcfc21a77b2700a87
2017-06-15 03:16:07 +00:00
Igor Murashkin
db52463bb3 Merge "core: Move core.oat bootjar definitions into core/config"
am: 5e1aa20225

Change-Id: Iede6a5ad12024e083accede4757a4be33d678aee
2017-06-15 03:10:06 +00:00
Igor Murashkin
5e1aa20225 Merge "core: Move core.oat bootjar definitions into core/config" 2017-06-15 03:06:12 +00:00
Igor Murashkin
8c50798243 core: Move core.oat bootjar definitions into core/config
TARGET_CORE_JARS and HOST_CORE_JARS define the minimal
bootclasspath jars necessary to run with dalvikvm/art.

Also refactor PRODUCT_BOOT_JARS to reuse TARGET_CORE_JARS.

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

Bug: 36902714
Test: make -j32 && make -j32 build-art-host build-art-target
Change-Id: I620e28be41047a1d501d7f144fe415ee4a0af36f
2017-06-14 10:02:09 -07:00
Paul Duffin
f170ad5f55 Merge "Added android.test.mock to PRODUCT_PACKAGES" am: 87b69b97f3
am: b349e09a18

Change-Id: I242537e012490770a7a3bbdd235dc6016984804b
2017-06-14 11:14:43 +00:00
Paul Duffin
b349e09a18 Merge "Added android.test.mock to PRODUCT_PACKAGES"
am: 87b69b97f3

Change-Id: I59df6966eba2aa4a12bfb4081cd6b6a75c313210
2017-06-14 11:12:43 +00:00
Paul Duffin
87b69b97f3 Merge "Added android.test.mock to PRODUCT_PACKAGES" 2017-06-14 11:06:22 +00:00
SzuWei Lin
47400c5e34 Merge "Add more libs into generic AOSP system image" into oc-dev
am: 57fb2214ab

Change-Id: If56dc8c2a6417b527c243af0151b428677f16f55
2017-06-14 09:10:04 +00:00
TreeHugger Robot
57fb2214ab Merge "Add more libs into generic AOSP system image" into oc-dev 2017-06-14 09:06:45 +00:00
Isaac Chen
ea97912057 Merge "Fix audio policy configuration for generic targets" into oc-dev
am: 34d8c95fd7

Change-Id: I1d5a39cec809f91477e09c8545c6d1173152ea0f
2017-06-14 08:22:36 +00:00
TreeHugger Robot
34d8c95fd7 Merge "Fix audio policy configuration for generic targets" into oc-dev 2017-06-14 08:17:10 +00:00
Yoshisato Yanagisawa
4f3e5685fc Set JAVAC_WRAPPER if USE_GOMA is set.
Now, people can also use goma for building javac.  Let me make it by
default.

Test: USE_GOMA=true m -j4
Bug: 62334576
Change-Id: I941ce42dc0f9cbd0dcc00e6fd19368c3af11695f
2017-06-14 07:57:54 +00:00