build

Fork

Merge remote-tracking branch 'x86/nougat-x86' into cm-14.1-x86

kernel.mk: avoid conflict with LineageOS's kernel.mk

We defined TARGET_PREBUILT_KERNEL to be equal to INSTALLED_KERNEL_TARGET
but LineageOS's kernel.mk would copy TARGET_PREBUILT_KERNEL to
INSTALLED_KERNEL_TARGET that results in a dependency cycle.

Adjust our definition to avoid that.

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

core: Prefix and build bison host executable if needed

This patch prefixed bison with HOST_OUT_EXECUTABLES to ensure using our
`bison` built from source. It also added bison to be a depencency of %.y
and %.yy tasks so that it will be built if needed without any manual
`mka bison`.

Change-Id: Ic207124965c704b3f350e96b58d8e1f2683c2601

[DO NOT MERGE] Update platform security string to 2017-10-05 in nyc-dev Bug:64896113
(cherry picked from commit 1517f3d2da27eae798a3ac765096251914f9b119)

Change-Id: Iaf69b105d57ab33dccde1b13be5271178269f82a

[DO NOT MERGE] Update platform security string to 2017-10-01 in nyc-dev Bug:64896113
(cherry picked from commit 73ab80dec9df8966bf660725dc1a942d9c1f324e)

Change-Id: I79c8696abc375a2c2cd77a2b12fec1558be70818

core: config: Use host bison if requested

Change-Id: I87a232838cbc49ab758ed7bf27d97c59d9928e69

Fix warning with AAPT2 and LOCAL_STATIC_ANDROID_LIBRARIES

Building with LOCAL_STATIC_ANDROID_LIBARIES and LOCAL_USE_APPT2
causes a warning:
build/core/package_internal.mk:143: Empty argument supplied to find-subdir-assets

Only call find-subdir-assets if my_res_dir is not empty.

Also improve the warning message to make it easier to find the module
that caused it.

Test: m -j
Change-Id: I9a71162c7e2ed82f64d6844baca256968ac77317

Updating Security String to 2017-09-05 Bug:63846344

(cherry picked from commit 18be90844245f3873261e4aa1072e8d83fdb33aa)

Change-Id: Ide74c0655eff5d24fcd7bf708b7e5ae5fe660d83

Android 7.1.2 Release 33 (NZH54D)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAll7mPcACgkQ6K0/gZqxDnjk0gCfcTvsXnikiI6jqyl9sednwXXu
cmQAn3572d4M1Klhi2+ByhbmmCDJwsHB
=wtcL
-----END PGP SIGNATURE-----

Merge tag 'android-7.1.2_r33' into nougat-x86

Android 7.1.2 Release 33 (NZH54D)

Android 7.1.2 Release 29 (NJH47F)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAll7iLoACgkQ6K0/gZqxDnhrMQCfXBz6vlk0WwEEzXrUEgW5z5VW
kLcAnR+9F0komiW/7rivD/BqDxON36Dc
=WczJ
-----END PGP SIGNATURE-----

Merge tag 'android-7.1.2_r29' into cm-14.1

Android 7.1.2 Release 29 (NJH47F)

# gpg: Signature made Fri 28 Jul 2017 01:55:54 PM CDT
# gpg: using DSA key E8AD3F819AB10E78
# gpg: Can't check signature: No public key

Android 7.1.2 release 27
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAllWlmAACgkQ6K0/gZqxDniovACdGNPdYEeS5Bwz4boHny0o+NjG
uEAAn1EURCB8WwRCw8UwaiE/1zTdG5eJ
=W3t+
-----END PGP SIGNATURE-----

Merge tag 'android-7.1.2_r27' into nougat-x86

Android 7.1.2 release 27

Squashed revert of TARGET_UNIFIED_DEVICE

* vendor init can be used to achieve everything done here

Revert "core: Fix unified trees with no TARGET_OTA_ASSERT_DEVICE"
This reverts commit e44fa493f87d74c20b4276ca7504bc601847d01f.

Revert "releasetools: don't attempt to read fingerprint on unified devices"
This reverts commit 787a0aa7d8787c13bf78559ae4a05650ed46da76.

Revert "buildinfo: only set ro.build.product on non-unified devices"
This reverts commit 22c034b8a7c51c713dfb2a75c6e4e20941428cad.

Revert "ota_from_target_files: Remove device dependent arguments"
This reverts commit 7c93b441bcf65a8630f8f4bb8df9537f686ea797.

Revert "Fix ro.build.product not found by ota_from_target_files in some cases"
This reverts commit 0ca5495057a6d15f6049993896c34e13cd4dd467.

Revert "Allow devices to specify certain ro. props via TARGET_UNIFIED_DEVICE"
This reverts commit 8182bc29ffc498033e25ef10f3f8499ebfe25a7e.

ota_from_target_files: Remove device dependent arguments
These device-specific arguments are defined at build time and are
necessary to generate the zip correctly. Don't use command line
arguments to specify them, but write all the needed information
in misc_info.txt when the target-files zip is generated.
ota_from_target_files will then read misc_info.txt and set
everything automatically.
Original Change-Id: Ibdbca575b76eb07b53fccfcea52a351c7e333f91
[mikeioannina]: Reapply after TARGET_UNIFIED_DEVICE removal

Change-Id: I5cb8f074c893c0e46edf507f6256cd747239d07f

Android 7.1.2 release 24
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAllWlikACgkQ6K0/gZqxDniNzgCgjlacQORRdKbf/4ZCGRipBep4
W0oAoI48RX0KwGnetHMQEInQWwz2WmRR
=ZtiH
-----END PGP SIGNATURE-----

Merge tag 'android-7.1.2_r24' into cm-14.1

Android 7.1.2 release 24

# gpg: Signature made Fri 30 Jun 2017 01:19:21 PM CDT
# gpg: using DSA key E8AD3F819AB10E78
# gpg: Can't check signature: No public key

Version bump to NZH54D

Change-Id: I154543bddc33f78513754041db900533c86b4242

Version bump to NJH47F

Change-Id: I5e1344e333421f85364602fe3ba44879d00bfd73

Disable recovery resource warning

Change-Id: I773a092f44823b095cb4176a8647acef9519b870

Make change and version bump to NZH54C

Change-Id: Ifa0976524ad1d8d5f380a276f9af55d857a889a7

[DO NOT MERGE] Updating Security String to 2017-08-05 on nyc-dev
bug:62388772
(cherry picked from commit 2b93753bc4025e92e6b6c8ed510bc9b3f8faff4d)

Change-Id: Ie2256309caa6625646f24d48c20683ae6d73827f

[DO NOT MERGE] Updating Security String to 2017-08-01 on nyc-dev
bug:62388772
(cherry picked from commit a847c0b23ce761b09148f4f8fd6c9b473a46f531)

Change-Id: I5326e59e597f477437ff9a08f65ba4dcd51be00e

Revert "Preventing default locale from being overridden because of buildinfo.sh"

* Not used by any device

This reverts commit 7ff326d8b05df431747d8d6353184ea70f44e9e4.

Change-Id: Id5ee46c189bc2271007215e2981c646a6b9982be

Revert "build: skip 'ro.product.device' using new macro "TARGET_SKIP_PRODUCT_DEVICE""

* Not used by any device, can be implemented using
PRODUCT_SYSTEM_PROPERTY_BLACKLIST instead

This reverts commit 3d918b4bb74829d23475d4bd34c8fdc71bde014f.

Change-Id: I1b48231d0a269d8a7fe08945ffebf55253ddf18f

Make change and version bump to NJH47E

Change-Id: Icfbd115a0074cc50b8d491e54837d5ef666e4e57

[DO NOT MERGE] Updating Security String to 2017-08-05 on nyc-dev
bug:62388772
(cherry picked from commit 2b93753bc4025e92e6b6c8ed510bc9b3f8faff4d)

Change-Id: I49ea676b60b1137f33f6d12b35dd4169bea5479f

[DO NOT MERGE] Updating Security String to 2017-08-01 on nyc-dev
bug:62388772
(cherry picked from commit a847c0b23ce761b09148f4f8fd6c9b473a46f531)

Change-Id: I6839865d7a9f1a455011cf701d4e8297f668fdca

Makefile: Add the missing dependency on FUTILITY.

Bug: 35467608
Test: lunch aosp_dragon-userdebug; m dist
Change-Id: If3824ac22926f3c3cc09d5b82cb0f6da4132f937

Build FUTILITY tool from futility-host.

Also pack the tool, vboot_signer.sh script and the test keys into
otatools.zip. This allows signing ryu target without a source repo.

Bug: 35467608
Test: m otatools-package and check the newly included files.
Test: Use otatools.zip to sign a ryu target.
Change-Id: I70f7b359f21a579463d5c7251daac81a97e338cc

Android 7.1.2 Release 17 (NJH47B)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlkx4fsACgkQ6K0/gZqxDnjGNQCaAhM8+s6PNTzKuowXWSTQTrzh
KI4AnjR7vyjX58i5GEImWIoU7A6DG8Pd
=/Rvf
-----END PGP SIGNATURE-----

Merge tag 'android-7.1.2_r17' into nougat-x86

Android 7.1.2 Release 17 (NJH47B)

Android 7.1.2 Release 17 (NJH47B)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlkx4fsACgkQ6K0/gZqxDnjGNQCaAhM8+s6PNTzKuowXWSTQTrzh
KI4AnjR7vyjX58i5GEImWIoU7A6DG8Pd
=/Rvf
-----END PGP SIGNATURE-----

Merge tag 'android-7.1.2_r17' into cm-14.1

Android 7.1.2 Release 17 (NJH47B)

# gpg: Signature made Fri 02 Jun 2017 05:08:59 PM CDT
# gpg: using DSA key E8AD3F819AB10E78
# gpg: Can't check signature: No public key

kernel.mk: set toolchain for 64-bit kernel