Commit Graph

37834 Commits

Author SHA1 Message Date
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 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
SzuWei Lin 56d68a5192 Add more libs into generic AOSP system image
Includes:
- more HIDL interfaces
- explicitly specify all LL-NDK and SP-NDK (currently only
  libandroid_net is missing)
- add liblzma and libyuv

Bug: 38339299
Test: build aosp_arm64_ab and pass
Change-Id: Ic67d47990cf6b4ab51e1b74f0fed85e60ce3a817
2017-06-14 14:57:15 +08:00
Tao Bao 5edb6ee6fd Merge "Allow sign_target_files_apks.py to create zip64 signed TF.zip." am: 9baf675285
am: 7d5f8ec704

Change-Id: I23d08c4a7b3311afafa857e4efb5a982f8cf0f25
2017-06-14 05:49:58 +00:00
Tao Bao 7d5f8ec704 Merge "Allow sign_target_files_apks.py to create zip64 signed TF.zip."
am: 9baf675285

Change-Id: Ic7a9f8735ded10d36d2a97d7b3118bc0ae6f6456
2017-06-14 05:44:56 +00:00
Treehugger Robot 9baf675285 Merge "Allow sign_target_files_apks.py to create zip64 signed TF.zip." 2017-06-14 05:36:51 +00:00
Hung-ying Tyan ed4a4a5ada Merge "Revert "Revert "Move /default.prop to /system/etc/prop.default""" into oc-dev
am: d9657ef5be  -s ours

Change-Id: Id76f0a2076cca32a6090342a16dddfed070e82de
2017-06-14 02:29:36 +00:00
Bowgo Tsai e408b4ceb2 Merge "Align size of vbmeta image to 4k boundary" am: 6b126fb7bc
am: e7151a57aa

Change-Id: I0a4dbbe18574e1c2037b185c7e3794033da2c974
2017-06-14 02:14:41 +00:00
Hung-ying Tyan d9657ef5be Merge "Revert "Revert "Move /default.prop to /system/etc/prop.default""" into oc-dev 2017-06-14 02:13:51 +00:00
Bowgo Tsai e7151a57aa Merge "Align size of vbmeta image to 4k boundary"
am: 6b126fb7bc

Change-Id: Ibf96152b0b1650e33e5d300c05001e84a8253330
2017-06-14 02:10:41 +00:00
Treehugger Robot 6b126fb7bc Merge "Align size of vbmeta image to 4k boundary" 2017-06-14 02:01:45 +00:00
SzuWei Lin a24fcf6abc Merge "Normalize building generic system image with treble-common.mk" into oc-dev-plus-aosp 2017-06-14 01:58:27 +00:00
Tianjie Xu f5fd565275 Merge "Fix duplicate 'META/care_map.txt' when calling add_img_to_target_files" am: 463c25f890
am: fa0542dced

Change-Id: Ia1d5b0b478f700b4df8ebbf9db10d4035d394792
2017-06-14 00:34:06 +00:00
Tianjie Xu fa0542dced Merge "Fix duplicate 'META/care_map.txt' when calling add_img_to_target_files"
am: 463c25f890

Change-Id: I926f8cb59b82310f0ace991ac62eacdf47369d3a
2017-06-14 00:31:04 +00:00
Tianjie Xu 463c25f890 Merge "Fix duplicate 'META/care_map.txt' when calling add_img_to_target_files" 2017-06-14 00:19:59 +00:00
Tao Bao 2b8f489e30 Allow sign_target_files_apks.py to create zip64 signed TF.zip.
We should only disallow zip64 for the image and OTA zips (because we
don't have zip64 support in libziparchive yet). But target_files zips
are fine to use zip64 with host tools (and we already do that in
add_img_to_target_files.py).

This CL also sets the default compression method to DEFLATED when
creating the signed TF.zip.

Test: sign_target_files.apks.py signing a large TF.zip passes.
Change-Id: I8043739860604134fa1166e920c95c28797bbcc1
2017-06-13 13:01:23 -07:00
Dolly Dhariwal 45e02909d4 Merge "Updating the BUILD_ID to OC for oc-dev branch." into oc-dev
am: 6652dd9005

Change-Id: Ibad29c6af59fbf3c53cad5351563a6521f0c29a8
2017-06-13 19:52:46 +00:00