build

Fork

Merge remote-tracking branch 'x86/marshmallow-x86' into cm-13.0-x86

Merge remote-tracking branch 'cm/cm-13.0' into cm-13.0-x86

Conflicts:
core/tasks/kernel.mk

Android 6.0.1 release 74
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlgczp8ACgkQ6K0/gZqxDng16gCeLFPcrEJHrivU9vF/vEvHGlvO
gD0An2RKkb45zjrPDtB+638CaOfsO/kr
=fbqE
-----END PGP SIGNATURE-----

Merge tag 'android-6.0.1_r74' into marshmallow-x86

Android 6.0.1 release 74

Updating Security String to 2016-12-01

CYNGNOS-3312
mnc-dev
b/32249855

Change-Id: I0ff4dccb4e307e35fb9fcc6b1e0267f5476a5898

build: repopick: Avoid failing on commits lookup

* Some projects with multiple merges and
discountinuous histories could trigger
an error here when the HEAD~{?} does
not exist, hence avoid this by ignoring
the commit and continue the search

Change-Id: Ice28c87d1bf8897da52236b637bbb0c5d349f848

build: repopick: Support squashed commits for Change-Id detection

* Commits are identified by their last Change-Id,
but the parser only considers the first one found

* Reverse the list to find the last Change-Id
and avoid multiple repopick attempts on the same commit

RM-290

Change-Id: Ie0204245a47799f8ead21148e0b4e9356cf271eb

build: repopick: Support projects with less than 10 commits

* Verify that the project has at least 10 commits to verify,
if not check only the amount of existing commits

RM-290

Change-Id: Ic95212510d8f5b980c9a94af8d5ac1e0dfd94b3e

repopick: handle revisions with slashes

RM-290

Change-Id: I6f7891a52fb1538e88f5a68dd28ef1c603ee7067

repopick: don't re-pick duplicate changes

check the last 10 commits to HEAD for a dupe change id.

RM-290

Change-Id: Icfbf8b4eae165cf84ef4a82f54f792e9c9acd67b

repopick: try to use remote's default revision

* If the project doesn't have a revision specified, try
to see if it's remote has one specified before falling back
to the global default.

RM-290

Change-Id: I05129413b154e5d08d0fa9ef0ce853631b7e1562

Revert "qcom: Select Sony display/media variants for Sony devices"

1. The Sony kernel is no longer BF64-based.
2. There is no reason for Sony devices to set
the BOARD_USES_QCOM_HARDWARE flag, since they
are meant to be using AOSP code + select patches.

Revert for now until a better solution is decided upon.

This reverts commit be202afa17314f84ce69ee33a6936ca9abbf499b.

Change-Id: I94749d116340e9eb4a2fcc88a2b4514719e2279d

kernel: Auto-set prefix based on KERNEL_ARCH

Change-Id: I5c83e7de97b75ece9a1306cb20b058d9fd30e288

Android 6.0.1 release 74
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlgczp8ACgkQ6K0/gZqxDng16gCeLFPcrEJHrivU9vF/vEvHGlvO
gD0An2RKkb45zjrPDtB+638CaOfsO/kr
=fbqE
-----END PGP SIGNATURE-----

Merge tag 'android-6.0.1_r74' into HEAD

CYNGNOS-3303

Android 6.0.1 release 74

Change-Id: Ie96480de0df00e2d4c7d298f53e4f102aad5c823

build: qcom_target: Enable BOARD_USES_ADRENO

Newer QCOM HALs use this flag for libc2dcolorconvert,
examples being msm8937 and msm8996 media HALs.

Change-Id: I28e8a42b58b4f5f71126df7ad97c377724da5bab

releasetools: Rebuild recovery when signing target images

When signing a build, the recovery can be built twice, once when signing
and again when adding the image to target files.

This is usally not a problem for deterministic signatures but a custom
signing method might include a time-based component which affects
checksums of the generated images. This means that the recovery patches
(i.e. install-recovery) will fail to checksum.

This patch makes adding images to target files, when invoked from
sign_target_files_apks, always rebuild the recovery patch with the newly
generated images so that the checksums are consistent irrespective of
potential time components.

Change-Id: I575c69dc96a6d4d69b3ea9d037f5f13c97afa87e

envsetup: Fix cafremote/aospremote for projects with non-standard paths

* Fix -caf and -caf-<platform> projects
* Fix AOSP HALs that are synced in "/default" subfolder

Change-Id: I33cc344a3234de6698676c32035622acbec03dd1

build: Support a fallback to java 8 if java 7 is not found

* In the case of a host installed only with java 8,
the build starts correctly but on use of JAVA_HOME
binaries, the java references are missing

* Allow the java 7 to be tested and try to use java 8

Change-Id: Ie50892edb54feb8608a0ef80a1c2a8667703e8ee

MOB31K

Android 6.0.1 Release 72 (M4B30X)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlfz3SMACgkQ6K0/gZqxDngZiQCfVSnpdsyg/5PRBFDQjZnecQgx
kRIAmQEkiKbgszXHUT81DjLJHCcINHkV
=nj1R
-----END PGP SIGNATURE-----

Merge tag 'android-6.0.1_r72' into HEAD

Android 6.0.1 Release 72 (M4B30X)

Change-Id: Ida42e8942cf7ed3d69ac6cdf9fc70a0098c3b259

MOB31J

Use sensible default locations for Java

Use sensible default locations for Java based on
the EXPERIMENTAL_USE_JAVA8 flag.

Bug: 25786468
Change-Id: I7ec035b5329785efc41b3f971d5e3ae202293576

Revert "envsetup: Always look up JAVA_HOME path"

This breaks, if we have both jdk7 and jdk8 installed on same machine.

This reverts commit bc9ae3d5c21915c165b2b2cb41d07e1573814254.

Change-Id: Id0482d130d5306e797adfeeaeb2efbd1e25aa3ee

MOB31I

Updating Security String to 2016-11-05 on mnc-dev
b/31618336

Change-Id: I3c9459553fdc89cacdf74d5e5801871b7192bc51
(cherry picked from commit dcfd738833ea0c6d271b45d50a652191e6c345f0)

Updating Security String to 2016-11-01 on mnc-dev
b/31618336

Change-Id: I18b3a0d690ab238fcd3cafa65b873ce7432c9c25
(cherry picked from commit 62b28398ba157b65a4825bea59806c060503500c)

Merge remote-tracking branch 'x86/marshmallow-x86' into cm-13.0-x86

Merge remote-tracking branch 'cm/cm-13.0' into cm-13.0-x86

Android 6.0.1 release 66
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlfO7hMACgkQ6K0/gZqxDnjSNwCcCl1/rVsflWx5IO7TFlAG5KuF
+VIAnRILBaXGvqGP5Lf+2cJpcUSML+Zj
=X6Gc
-----END PGP SIGNATURE-----

Merge tag 'android-6.0.1_r66' into HEAD

Android 6.0.1 release 66

# gpg: Signature made Tue 06 Sep 2016 09:25:55 AM PDT using DSA key ID 9AB10E78
# gpg: Can't check signature: public key not found

kernel.mk: refine extra modules building rules

Android 6.0.1 release 66
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlfO7hMACgkQ6K0/gZqxDnjSNwCcCl1/rVsflWx5IO7TFlAG5KuF
+VIAnRILBaXGvqGP5Lf+2cJpcUSML+Zj
=X6Gc
-----END PGP SIGNATURE-----

Merge tag 'android-6.0.1_r66' into marshmallow-x86

Android 6.0.1 release 66