Commit graph

37820 commits

Author SHA1 Message Date
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
TreeHugger Robot
6652dd9005 Merge "Updating the BUILD_ID to OC for oc-dev branch." into oc-dev 2017-06-13 19:43:02 +00:00
Tianjie Xu
9ac4cb0984 Fix duplicate 'META/care_map.txt' when calling add_img_to_target_files
In case the system/vendor image is updated for an A/B target file, we'll
delay the write of META/care_map.txt. Specifically, we'll run "zip -d"
to remove the old entry and then zip in the new one from tmp dir.

Bug: 62345693
Test: Run add_img_to_target_files.py on sailfish target files, and
care_map.txt is updated.

Change-Id: Id2f9997aac50c0740e6944d0d0d43d98f5fc6c29
2017-06-13 11:20:29 -07:00
Jeff Vander Stoep
0b3fc37d7e Build split file_contexts for recovery
am: 4ff042c4aa

Change-Id: If9ff1b6b2ed152333eeb92a83d9bdbbacc431ed2
2017-06-13 17:59:05 +00:00
Jeff Vander Stoep
4ff042c4aa Build split file_contexts for recovery
Bug: 62564629
Test: build and flash marlin. Successfully switch between regular
    and recovery modes

Change-Id: I67ae2f59ca1868cfe777de0d4f0c4e3c2d99329d
2017-06-13 15:39:29 +00:00
Dan Willemsen
2bd2a9d630 Merge "Apply ALLOW_MISSING_DEPENDENCIES to droiddoc template dir" am: cb07cb1aa7
am: cf8ac2a820

Change-Id: Ieef27917a409ff8682cb2159341876480b099d4b
2017-06-13 15:29:55 +00:00
Dan Willemsen
cf8ac2a820 Merge "Apply ALLOW_MISSING_DEPENDENCIES to droiddoc template dir"
am: cb07cb1aa7

Change-Id: I984922749f69dad7bb04052655d14ad62316cd8d
2017-06-13 15:25:54 +00:00
Dan Willemsen
cb07cb1aa7 Merge "Apply ALLOW_MISSING_DEPENDENCIES to droiddoc template dir" 2017-06-13 15:18:57 +00:00
Hung-ying Tyan
a6b68e72b1 Revert "Revert "Move /default.prop to /system/etc/prop.default""
This reverts commit 88c9dddd0f.

Bug: 37815285
Bug: 62525809
Test: Tested with ag/2400523 and ag/2400524. Booted pixel phones,
      checked the location of prop.default, verified the symlink,
      checked a few properties via adb shell and manually tested
      a few apps (Camera, Maps etc).
      sign_target_files_apks.py was tested with:
      sign_target_files_apks -o -e DynamiteLoader.apk= -e DynamiteModulesA.apk= \
        -e DynamiteModulesB.apk= -e DynamiteModulesC.apk= -e DynamiteModulesD.apk= \
        -e GoogleCertificates.apk= out/dist/*-target_files-*.zip signed-target_files.zip
      Booted to recovery and ran 'adb sideload' successfully.

Change-Id: I2ddf287f42360d1a7c7a22f08e7b9e203e7e603a
2017-06-13 21:18:04 +08:00
Bowgo Tsai
3e599ead66 AVB: support chain partition signing
Current build system will include AVB metadata from each partition and
store them into /vbmeta partiton when BOARD_AVB_ENABLE is set, which makes
each partition tightly-coupled.

Add the support for 'chain partition':
  - The vbmeta of each partition is stored on the same partition itself.
  - The public key used to verify each partition is stored in /vbmeta.

For example, the following build variables are required to enable chain
partition for system partition:
  - BOARD_AVB_SYSTEM_KEY_PATH := path/to/system_private_key
  - BOARD_AVB_SYSTEM_ALGORITHM := SHA512_RSA8192
  - BOARD_AVB_SYSTEM_ROLLBACK_INDEX := 1
  - BOARD_AVB_SYSTEM_ROLLBACK_INDEX_LOCATION := 2

The corresponding settings will be added into META/misc_info.txt for
build_image.py and/or add_img_to_target_files.py:
  - avb_system_key_path=path/to/system_private_key
  - avb_system_algorithm=SHA512_RSA8192
  - avb_system_add_hashtree_footer_args=--rollback_index 1
  - avb_system_rollback_index_location=2

To enable chain partition for other partitions, just replace SYSTEM with
BOOT, VENDOR and/or DTBO in the build variables.

Also switch from  `avbtool make_vbmeta_image --setup_rootfs_from_kernel system.img ...`
to `avbtool add_hashtree_footer --image system.img --setup_as_rootfs_from_kernel...`
when BOARD_BUILD_SYSTEM_ROOT_IMAGE is true. This works for both chained
and no-chained:
  - chained: `avbtool add_hashtree_footer --setup_as_rootfs_from_kernel` will
    add dm-verity kernel cmdline descriptor to system.img
  - no-chained: `avbtool make_vbmeta_image --include_descriptors_from_image
    system.img` will include the kernel cmdline descriptor from system.img into
    vbmeta.img

Bug: 38399657
Test: `make` pass, flash images from $OUT and boot device without chain partitions
Test: `make` pass, flash images from $OUT and boot device with chain partitions
Test: `make dist` pass, flash images from TF.zip and boot device without chain partitions
Test: `make dist` pass, flash images from TF.zip and boot device with chain partitions
Test: follow the same steps in
      https://android-review.googlesource.com/#/c/407572/

Change-Id: I344f79290743d7d47b5e7441b3a21df812a69099
2017-06-13 17:45:10 +08:00
Dolly Dhariwal
14a9d76026 Updating the BUILD_ID to OC for oc-dev branch.
Bug: None
Test: Build and flashed AIO device
Change-Id: I0c87c33b8fb6cbaf71cdb90ce86097bfb31f4137
Merged-In: I53047dbc0b89c2b3afe5d2af3c0532968f60b893
2017-06-13 06:24:35 +00:00
Bowgo Tsai
7cd30041e9 Align size of vbmeta image to 4k boundary
Adding option "--padding_size 4096" when making vbmeta.img.

Bug: 38454093
Test: build vbmeta.img and check it's being padded.
Change-Id: Id3ba6bf9998755bae75ec8b272ceccf59f4b8666
2017-06-13 11:31:06 +08:00
Dan Willemsen
6402873d49 Apply ALLOW_MISSING_DEPENDENCIES to droiddoc template dir
Some of our minimal branches don't have the necessary droiddoc
templates, so don't cause a FindEmulator warning when the template dir
is missing and ALLOW_MISSING_DEPENDENCIES is set. The warnings will soon
be errors.

When the template directory is missing, ensure that the command doesn't
succeed by adding the directory into the dependency list. Passing a
missing directory doesn't cause an error otherwise, it just wouldn't use
the template.

Test: build-aosp_arm64.ninja is identical before and after this change
Test: Move away build/tools/droiddoc/templates-sdk; m -j libcore-docs
Change-Id: I122f3916b6ab348a5a98dcf2520992eda3655e26
2017-06-12 19:31:50 -07:00
Tao Bao
fb13a3b9f4 Merge "Revert "Move /default.prop to /system/etc/prop.default"" into oc-dev
am: d4b25e481e  -s ours

Change-Id: I11773c0b8ed6727b0b225635f590337ec04dd06f
2017-06-12 19:57:16 +00:00
Tao Bao
d4b25e481e Merge "Revert "Move /default.prop to /system/etc/prop.default"" into oc-dev 2017-06-12 19:39:54 +00:00