Commit Graph

38040 Commits

Author SHA1 Message Date
Yifan Hong 4b7cbf8395 Merge changes from topic "kernel_config_arch"
* changes:
  fwk comp mat: add arch specific kernel requirements
  fwk comp mat: use a for loop for supported kernel versions
2017-08-29 18:25:17 +00:00
Yifan Hong 63e264d142 fwk comp mat: add arch specific kernel requirements
Test: m system_compatibility_matrix.xml -j
Bug: 64124223
Change-Id: Ieda3ea43e5d3b7d393461bd54b311b58af443f7c
Merged-In: Ieda3ea43e5d3b7d393461bd54b311b58af443f7c
2017-08-28 17:32:59 -07:00
Yifan Hong a508b30df5 fwk comp mat: use a for loop for supported kernel versions
Test: m system_compatibility_matrix.xml -j

Bug: 64124223
Change-Id: Ife95bfb5b7103239e116df1ae844cc3a643b4c28
Merged-In: Ife95bfb5b7103239e116df1ae844cc3a643b4c28
2017-08-28 17:32:59 -07:00
Tao Bao 7a1ed9edef Merge "Remove file_contexts.bin from non-A/B OTA package." 2017-08-25 23:07:47 +00:00
Tao Bao ac7b7db12c Remove file_contexts.bin from non-A/B OTA package.
This entry only exists in non-A/B full OTA path. However, this file has
never been loaded by recovery - recovery was only reading the one from
the recovery image (which also has been removed by a recent change in
[1]).

[1]: commit e35926e1aff2e6b9b54656bd59c8178e295a1b7e in
platform/bootable/recovery.

Bug: 63538434
Test: `m dist` on angler. file_contexts.bin is gone from full OTA
      package. Sideloading the generated full OTA on angler.
Change-Id: Iec2e2d36599fa1ed499516a3e74f06cd36ade494
2017-08-25 14:14:53 -07:00
Treehugger Robot 6417aa89e4 Merge "Add shortcut to atest after envsetup.sh is sourced." 2017-08-25 18:44:34 +00:00
Treehugger Robot e09809a32d Merge "Support signing custom_images with AVB" 2017-08-25 07:49:37 +00:00
Bowgo Tsai 480dc7c19d Support signing custom_images with AVB
Current AVB signing for custom images is enabled by either of the
following build variables:
  CUSTOM_IMAGE_AVB_HASH_ENABLE := true
  CUSTOM_IMAGE_AVB_HASHTREE_ENABLE := true

A previous change to support chain partition replaced avb_signing_args
with avb_key_path and avb_algorithm. This change updates the
corresponding change for custom_images.

To sign a custom_image as a chain partition, it needs:
  CUSTOM_IMAGE_AVB_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
  CUSTOM_IMAGE_AVB_ALGORITHM := SHA256_RSA2048
  CUSTOM_IMAGE_AVB_ROLLBACK_INDEX := 1

Note that it doesn't support include metadata of custom images into
vbmeta.img. Because custom_images is designed to build multiple files
(e.g., custom1.img, custom2.img, custom3.img, etc) and a device can only
use/mount one of them. The vbmeta.img needs to be generated per each
combination.

Bug:36701014
Test: sign custom image with AVB HASH descriptor (non-chain)
Test: sign custom image with AVB HASH descriptor as chain partition
Test: sign custom image with AVB HASHTREE descriptor (non-chain)
Test: sign custom image with AVB HASHTREE descriptor as chain partition
Change-Id: I492e2ce768e7caec22228b776b2c13a2d37a5b89
2017-08-25 13:28:57 +08:00
Isaac Chen 9a888ebb51 Merge "Revert "Revert "Build support for 32-bit armv8-a""" 2017-08-25 01:55:56 +00:00
Treehugger Robot 9bab2f5fa2 Merge changes from topic "libvintf_cp"
* changes:
  Add <kernel> entry to fwk compat mat.
  Pass FRAMEWORK_VBMETA_VERSION to assemble_vintf
  Accept multiple input files for device manifest.
2017-08-24 19:41:11 +00:00
Zach Riggle 0d2a75510c Merge "Enhance coverage options to include those needed by Honggfuzz for coverage-driven fuzzing" 2017-08-24 19:26:14 +00:00
Yifan Hong 1aecc84239 Add <kernel> entry to fwk compat mat.
Test: builds and verify that system/compatibility_matrix.xml
      has configs filled.
Test: `vintf | tail` on marlin shows that fwk compat mat
      is compatible with runtime info.

Bug: 38324908
Change-Id: I8a35ea582fea1faa083c409ec58813c3ac82dc9c
Merged-In: I8a35ea582fea1faa083c409ec58813c3ac82dc9c
2017-08-24 11:28:04 -07:00
Bowgo Tsai eb7b438994 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
Merged-In: Iacc0a2687fb39600ad6b8e9cfbfe5c1a3b90b40b
2017-08-24 11:28:04 -07:00
Yifan Hong dae462bdd1 Accept multiple input files for device manifest.
Test: test with DEVICE_MANIFEST_FILE variable split
      into multiple files

Bug: 38217107
Change-Id: I1146898e4ccf0e8bac7d8541032f160476dbc148
Merged-In: I1146898e4ccf0e8bac7d8541032f160476dbc148
2017-08-24 11:28:02 -07:00
Treehugger Robot 714f406a8a Merge "Set Uml if TARGET_USER_MODE_LINUX is true" 2017-08-24 01:14:36 +00:00
Dmitry Shmidt 82d05aaf13 Set Uml if TARGET_USER_MODE_LINUX is true
Bug: 64985489
Test: Manual

Change-Id: Ic472fadcf64eb04e592b6f14570f7650bcd4f2e9
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2017-08-23 15:53:28 -07:00
Treehugger Robot d6c7681d85 Merge "embedded.mk: move dependencies to sepolicy" 2017-08-23 21:31:31 +00:00
Simran Basi 424b876778 Add shortcut to atest after envsetup.sh is sourced.
Bug: None
Test: On master, atest points to atest in tradefed.
Change-Id: Iad6e48a12c4180f77b483cadd4c316820ede87cd
2017-08-23 12:05:36 -07:00
Isaac Chen f5af850a29 Revert "Revert "Build support for 32-bit armv8-a""
This reverts commit 7de79cbeaf.

Fixed CTS build issue by adding -march=armv7-a in cts/tests/tests/os/jni/Android.mk since the library built here needs/uses instruction (swp) obsolete in ARMv8.

Bug: 64964151
Test: lunch aosp_arm64-userdebug; make -j cts
      lunch aosp_x86-userdebug; make -j cts
      lunch aosp_sailfish-userdebug; make -j cts
      lunch aosp_bullhead-userdebug; make -j cts

Change-Id: Ic3a121600da8e2a9a2d5176b9680cd18ce457959
2017-08-23 10:58:57 +00:00
Narayan Kamath 665015ad17 Merge "core: Fix typo in build rule." 2017-08-23 09:40:12 +00:00
Jeff Vander Stoep f4941eb4a7 embedded.mk: move dependencies to sepolicy
Some selinux build packages are defined in embedded.mk,
others are defined in system/sepolicy/Android.mk. Move all
to sepolicy as a dependency of the phony package selinux_policy
which is defined in embedded.mk.

Test: build Marlin (Treble) and Angler (non-Treble)
Merged-In: I734c2909354349d146c6f78beb74bd990d9af30d
Change-Id: I734c2909354349d146c6f78beb74bd990d9af30d
2017-08-23 05:26:32 +00:00
Treehugger Robot acb4ace77d Merge "Split CleanSpec processing out of main Kati run" 2017-08-23 01:53:59 +00:00
Zach Riggle be0811f46c Enhance coverage options to include those needed by Honggfuzz for coverage-driven fuzzing
Test: make m
Bug: 64903541
Change-Id: Ibb7eb126b6e68c03d0336606ec540a62a8e903d4
2017-08-22 18:01:46 -04:00
Dan Willemsen 514d49979c Split CleanSpec processing out of main Kati run
Bug: 35970961
Test: m clean; m nothing; m nothing
Test: Add CleanSpec.mk line, see it executing
Change-Id: Ied59ac9dbcbeec00e1ada8271b1f66cae33edb8d
2017-08-22 13:08:24 -07:00
Narayan Kamath d18e609790 core: Fix typo in build rule.
This doesn't appear to cause any issues that i'm aware of. This typo
was discovered because I made the same typo in a grep statement.

Test: make
Change-Id: I433e065c9ace15ab134f31c07e524a7555a8c0c1
2017-08-22 16:32:02 +01:00
Tobias Thierer 0d35b9fba3 Merge "Revert "Build support for 32-bit armv8-a""
am: 1da1c6d056

Change-Id: I7a5ae22c984ffe8781998b5ae8e20aeb7516fac1
2017-08-22 10:36:35 +00:00
Tobias Thierer 1da1c6d056 Merge "Revert "Build support for 32-bit armv8-a"" 2017-08-22 10:30:29 +00:00
Tobias Thierer 7de79cbeaf Revert "Build support for 32-bit armv8-a"
This reverts commit 0daa78eef4.

Reason for revert: Broke the build for some targets (including marlin and angler).

$ make cts
build/core/combo/TARGET_linux-arm.mk:43: kryo is armv8-a.
build/core/combo/TARGET_linux-arm.mk:45: TARGET_2ND_ARCH_VARIANT, armv7-a-neon, ignored! Use armv8-a instead.
[...]
cts/tests/tests/os/jni/android_os_cts_CpuInstructions.cpp:88:20: error: instruction requires: armv7 or earlier
    asm volatile ( "swp r0, r0, [%0]" : "+r"(ptr) : : "r0" );
                   ^
<inline asm>:1:2: note: instantiated into assembly here
        swp r0, r0, [r1]
        ^

Change-Id: I65a91ed5a4461eca6646df13642a87a5c37d6c85
2017-08-21 15:03:16 +00:00
Isaac Chen ef1e443e14 Merge "Build support for 32-bit armv8-a"
am: 70fe80491c

Change-Id: I6b4291a893ff42eca1933b8783e342855f22917f
2017-08-19 06:16:49 +00:00
Isaac Chen 70fe80491c Merge "Build support for 32-bit armv8-a" 2017-08-19 06:10:56 +00:00
Jeff Gaston b339102f67 Merge "Revert "Revert "Use the Finder's results for faster searching"""
am: 30928b0c6f

Change-Id: I8571745e8e37b87e5762438aff589f3132a3a428
2017-08-18 19:29:44 +00:00
Jeff Gaston 30928b0c6f Merge "Revert "Revert "Use the Finder's results for faster searching""" 2017-08-18 19:21:38 +00:00
Jiyong Park a0f2b2a286 Merge "cxx_stl_setup is not executed for modules from soong"
am: 9b18ed094c

Change-Id: I08bfd781403ed0b7dd68de2e1045f1fa194bc8f5
2017-08-18 07:16:54 +00:00
Treehugger Robot 9b18ed094c Merge "cxx_stl_setup is not executed for modules from soong" 2017-08-18 07:11:41 +00:00
Jiyong Park 425d489cb9 cxx_stl_setup is not executed for modules from soong
cxx_stl_setup is adding libunwind_llvm to the dependency even for
modules from soong. However, since this dependency was already handled
in soong, those modules don't need to go through it again.

Bug: 64815735
Test: BOARD_VNDK_VERSION=current mma -j (under /hardware/libhardware)

Change-Id: Id6e2547c752ec831aa56a14c0bf4db0a55d51243
2017-08-18 13:46:04 +09:00
Jeff Gaston d05050ee9c Revert "Revert "Use the Finder's results for faster searching""
This reverts commit 6f2aea5636.

Reason for revert: Fix went in ( I70b08023b94b5789dc8394651bbac4c49c82787f ); trying again to use this

Change-Id: I0f58c21a7312dda01980d338401e756f610fe3b4
2017-08-18 02:46:39 +00:00
Dan Albert 21751a0a67 Merge "Use the min sdk version from soong."
am: 22b45d401a

Change-Id: I3baca77b2774eb93168f6b888f08e8f0e56a1a10
2017-08-18 02:44:33 +00:00
Treehugger Robot 22b45d401a Merge "Use the min sdk version from soong." 2017-08-18 02:34:36 +00:00
Dan Albert 105e4fe0a6 Use the min sdk version from soong.
Test: make checkbuild
Bug: None
Change-Id: I0306803cebf98748503b7e217db0f0f5959bf4f7
2017-08-17 16:37:49 -07:00
Colin Cross 152ac2818a Merge "Fix typo when building aar"
am: f759166bb8

Change-Id: I4f4ffef85f5f3935d157f9e216e057df95fa62dd
2017-08-17 22:33:46 +00:00
Treehugger Robot f759166bb8 Merge "Fix typo when building aar" 2017-08-17 22:22:09 +00:00
Jeff Gaston 8467fba043 Merge "Revert "Use the Finder's results for faster searching""
am: 6df0626e58

Change-Id: I93d5c8df8500a5ea99751842b3585708e23fc251
2017-08-17 20:23:35 +00:00
Jeff Gaston 6df0626e58 Merge "Revert "Use the Finder's results for faster searching"" 2017-08-17 20:15:43 +00:00
Jeff Gaston 6f2aea5636 Revert "Use the Finder's results for faster searching"
This reverts commit 4e3ea546d7.

Reason for revert: New Build Breakage: aosp-master/build_test @ 4283735

Change-Id: Icf62c628c1d0cb0b1fd4b401ae1a866f7f88c477
2017-08-17 20:13:08 +00:00
Jeff Gaston 1b1997c028 Merge "Use the Finder's results for faster searching"
am: 2d71b221cb

Change-Id: I4e78ca9eabeb8259be4a5996d53737719485d9df
2017-08-17 19:48:33 +00:00
Jeff Gaston 2d71b221cb Merge "Use the Finder's results for faster searching" 2017-08-17 19:40:56 +00:00
Colin Cross 4a5458aed1 Fix typo when building aar
I7dced6acbe621a60cd49daf17872941485602732 introduced a typo,
fix (dir $@) to $(dir $@).

Bug: 64634025
Test: m -j on affected target
Change-Id: Ic7181631630662970337c542b73cd0de6f3f995f
2017-08-17 06:44:23 +00:00
Colin Cross 604a2423b6 Merge "Sort files in directories passed to jar"
am: 966ed15a1d

Change-Id: If01ba7d294e4308a28580b157b9efdb6c860bb35
2017-08-17 01:00:13 +00:00
Treehugger Robot 966ed15a1d Merge "Sort files in directories passed to jar" 2017-08-17 00:48:37 +00:00
Colin Cross 128800f2c8 Sort files in directories passed to jar
jar -C <dir> . produces a jar containing files in filesystem order,
which can vary between builds.  Manually find and sort the list of
files, and convert them into a list of -C <dir> <file> pairs.

Fixes: 64634025
Test: m -j checkbuild
Test: m -j out/target/product/sailfish/system/framework/ext.jar, check
      that entries are sorted
Test: m -j out/target/product/generic_arm64/system/framework/ext.jar on mac
Change-Id: I7dced6acbe621a60cd49daf17872941485602732
2017-08-16 13:37:00 -07:00