Commit Graph

38788 Commits

Author SHA1 Message Date
Suren Baghdasaryan 81a7690eb9 Add makefile to define PRODUCT_SHIPPING_API_LEVEL for O release
For Android O release PRODUCT_SHIPPING_API_LEVEL is set to 26.

Change-Id: Ie1d5af375f2db95850fc5395d6a0c775dbfa046d
Merged-In: Ie1d5af375f2db95850fc5395d6a0c775dbfa046d
(cherry picked from commit f3251ac73b)
2017-07-19 19:52:20 +00:00
Adam Seaton 8d56fc91b1 [DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 2017-07-19 18:34:25 +00:00
Adam Seaton 044c8a807d [DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 2017-07-19 18:32:35 +00:00
Adam Seaton 4061effbfe [DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 2017-07-19 18:31:28 +00:00
Adam Seaton 3da103445b [DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 2017-07-19 18:30:15 +00:00
Adam Seaton 32f388f655 Updating Security String to 2017-09-05 Bug:63846344 2017-07-19 10:42:03 -07:00
Adam Seaton f1c17f17ff Updating Security String to 2017-09-01 Bug:63846344 2017-07-19 10:41:05 -07:00
Hung-ying Tyan 58c1b0426f Fix potential build break
When BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED is enabled, the build system
may attempt to create a symlink in TARGET_ROOT_OUT before TARGET_ROOT_OUT
is created. Also make the symbolic link depend on
INSTALLED_DEFAULT_PROP_TARGET so that the symbolic link is properly created
when only bootimage is made.

Bug: 63645797
Test: on non-A/B device, make installclean && make bootimag and then verify
      that the symbolic link exists at $(TARGET_ROOT_OUT)/default.prop
Change-Id: Id12916b465ff052e2594b79f28274be20ca53af7
Merged-In: I1a9a2ba49c8252afc13ced3dea71253afbd3091e
2017-07-19 22:42:05 +08:00
Tobias Thierer bce2e113b4 Merge "Make 'make docs' work on OpenJDK 9 toolchain." am: 8003d944a1 am: 32b8d637dc
am: 675d7d56e8

Change-Id: Iaccc55cb744edb3375173ea11ee040bb8c220f61
2017-07-19 10:06:30 +00:00
Tobias Thierer 675d7d56e8 Merge "Make 'make docs' work on OpenJDK 9 toolchain." am: 8003d944a1
am: 32b8d637dc

Change-Id: I337488a0d6d75f8f6635c57c916b6b337ff35f65
2017-07-19 10:01:00 +00:00
Tobias Thierer 32b8d637dc Merge "Make 'make docs' work on OpenJDK 9 toolchain."
am: 8003d944a1

Change-Id: Ib15f74276865c690631e709d002920cc2a63494c
2017-07-19 09:55:30 +00:00
Tobias Thierer 8003d944a1 Merge "Make 'make docs' work on OpenJDK 9 toolchain." 2017-07-19 09:49:33 +00:00
Steven Moreland 07d26d46d0 Merge "Remove JNI_H_INCLUDE from make." am: cc96704ad2 am: 2d05df376d
am: f88b6bd7d8

Change-Id: Idd3421a6e4c23186fe689f57bd252a7276b84799
2017-07-19 01:46:32 +00:00
Steven Moreland f88b6bd7d8 Merge "Remove JNI_H_INCLUDE from make." am: cc96704ad2
am: 2d05df376d

Change-Id: I26ee312c390514a55e03628bfb6d6496588feba7
2017-07-19 01:44:32 +00:00
Steven Moreland 2d05df376d Merge "Remove JNI_H_INCLUDE from make."
am: cc96704ad2

Change-Id: I91ff6ba31fb53960f00398777f1f213dbcda10a8
2017-07-19 01:40:32 +00:00
Ivan Lozano d86676e30a Merge "Allow integer_overflow sanitizer path exclusion." am: ad9dde8a86 am: 815c1f5941
am: 7e18525ef7

Change-Id: Ie34681ed0c12c77cd45f7b7ebb5bc636a9dd4d9f
2017-07-19 01:34:32 +00:00
Treehugger Robot cc96704ad2 Merge "Remove JNI_H_INCLUDE from make." 2017-07-19 01:33:50 +00:00
Ivan Lozano 7e18525ef7 Merge "Allow integer_overflow sanitizer path exclusion." am: ad9dde8a86
am: 815c1f5941

Change-Id: Ica0a1e973f7cc6794866d6317ddff39fa72edc9a
2017-07-19 01:19:36 +00:00
Ivan Lozano 815c1f5941 Merge "Allow integer_overflow sanitizer path exclusion."
am: ad9dde8a86

Change-Id: Ib1dad032780d7c3ac36b69a3350bd1b07f9a1358
2017-07-19 01:14:40 +00:00
Ivan Lozano ad9dde8a86 Merge "Allow integer_overflow sanitizer path exclusion." 2017-07-19 01:06:28 +00:00
Ivan Lozano 9a82bfdc68 Allow integer_overflow sanitizer path exclusion.
Add support for excluding paths from having integer_overflow applied to
them when using SANITIZE_TARGET=integer_overflow via an
INTEGER_OVERFLOW_EXCLUDE_PATHS make and product variable. This covers
the make side of the change.

Bug: 30969751
Test: Build with SANITIZE_TARGET=integer_overflow
SANITIZE_TARGET_DIAG=integer_overflow
INTEGER_OVERFLOW_EXCLUDE_PATHS=<path> and confirmed this was no
longer being applied to binaries in that path.

Change-Id: I24e328257bc5a7962024c8676a1e23d7d70a8666
2017-07-18 15:14:22 -07:00
Steven Moreland 5d3b159bfb Remove JNI_H_INCLUDE from make.
It's now specified and exported from Soong.

Bug: 63762847
Test: make libraries find their headers

Change-Id: Ica5afe7465d90230628f3a924e929df38d25cdd9
2017-07-18 14:44:21 -07:00
Tobias Thierer 78d2983566 Drop obsolete javac -extdirs commandline arg.
The extension directory defaults to lib/ext and does not
exist by default. Setting it to the empty string de facto
disables this obsolete feature.

AOSP is moving to a hermetic toolchain so this argument
will stop working soon. Further, OpenJDK 9 javac no longer
supports this command line argument when compiling for
-source 1.9 -target 1.9.

This command line argument has been around since the
earliest versions of Android, but is now obsolete.
This CL drops it.

Bug: 63746471
Test: Treehugger
Change-Id: Ia0214c1b192e3ffda10772d777557a81ce346c03
2017-07-18 16:17:15 +01:00
Tobias Thierer 0b05860556 Make 'make docs' work on OpenJDK 9 toolchain.
OpenJDK 9's javadoc tool doesn't support the -bootclasspath
command line option, even with -source 1.8.

Instead, under OpenJDK 9, javadoc needs to be passed a
--patch-module argument to tell it the location of the
classes patching packages from java.* modules.

The source files in libcore/{dalvik,libart,luni,ojluni} and
external/icu/android_icu4j that go into PRIVATE_BOOTCLASSPATH
patch packages from the modules java.base, java.desktop,
java.logging, java.prefs, java.sql, jdk.net, and
jdk.unsupported. However, this CL takes the simpler approach
of placing them all in java.base, which appears to work for
the purposes of the javadoc run.

Test: Ran the following both on OpenJDK 8 toolchain and on
      OpenJDK 9 (with EXPERIMENTAL_USE_OPENJDK9=true):
      rm -rf out/target/common/docs/ && make docs
Test: Compared (via meld) the contents of out/target/common/docs
      for the two toolchains (there were some differences, see bug).
Bug: 62049770

Change-Id: If3dd927477ca32dab7ffb528350de872e1017184
2017-07-18 16:03:35 +01:00
Colin Cross f113b854b1 Merge "Revert "Use dx.jar directly"" am: c7e3e962f8 am: 4cea760106
am: 3f273622f4

Change-Id: Iea8d21663dfdbd490c3aad69e405c5b6d014cf97
2017-07-18 07:25:36 +00:00
Colin Cross 3f273622f4 Merge "Revert "Use dx.jar directly"" am: c7e3e962f8
am: 4cea760106

Change-Id: Ifc9f3c171a8798968d07d7a3a87bff43c24048e4
2017-07-18 07:20:06 +00:00
Colin Cross 4cea760106 Merge "Revert "Use dx.jar directly""
am: c7e3e962f8

Change-Id: Icd5402f7cc789224753537c070a91cbf6267ee66
2017-07-18 07:14:26 +00:00
Treehugger Robot c7e3e962f8 Merge "Revert "Use dx.jar directly"" 2017-07-18 07:08:19 +00:00
Colin Cross e44e75aa89 Revert "Use dx.jar directly"
This reverts commit e37a3c959a.

Reason for revert: breaks art test runner

Change-Id: Ice0cd3020ddec7f31eb789867a45f047a75a05d0
2017-07-18 05:22:59 +00:00
Lucas Dupin fd2b1807ca Removed overlay from target
Lock screen colors won't be handled by overlays anymore.

Test: make
Bug: 63751714
Change-Id: Ia4767906cadae6b88b022e549ca099175a0e4017
2017-07-17 17:48:52 -07:00
Colin Cross 5a6cc2bda2 Merge "Use dx.jar directly" am: c68434c971 am: 4828fcad41
am: 5cf757bb85

Change-Id: I1c2b1f760b34b76fb63ac0ad7816680a7dc9d3a0
2017-07-17 20:53:12 +00:00
Jeff Gaston a72da88c31 Merge "Update to latest jacoco usage" am: 483fae7430 am: 6264b662f3
am: 7ce0d9c1e7

Change-Id: Id57cc47edc61a7e30dc4fcf4f113ee9ce85a4b7f
2017-07-17 20:52:40 +00:00
Colin Cross 5cf757bb85 Merge "Use dx.jar directly" am: c68434c971
am: 4828fcad41

Change-Id: I0e65499eaf42aef400be07868e40454cd1c2d5ac
2017-07-17 20:49:10 +00:00
Jeff Gaston 7ce0d9c1e7 Merge "Update to latest jacoco usage" am: 483fae7430
am: 6264b662f3

Change-Id: Icd22319fb34575925c140e619b5f099fa68b0ab0
2017-07-17 20:48:40 +00:00
Colin Cross 4828fcad41 Merge "Use dx.jar directly"
am: c68434c971

Change-Id: Ief2c88d3ba0e93c7eb7bb9db0ac2b0a0b886bcea
2017-07-17 20:45:31 +00:00
Jeff Gaston 6264b662f3 Merge "Update to latest jacoco usage"
am: 483fae7430

Change-Id: Ibc94d5ba6db7690441825dd655b6cb26d989b78d
2017-07-17 20:44:10 +00:00
Colin Cross c68434c971 Merge "Use dx.jar directly" 2017-07-17 20:40:13 +00:00
Jeff Gaston 483fae7430 Merge "Update to latest jacoco usage" 2017-07-17 20:36:39 +00:00
Roshan Pius db0c3a570b treble_common.mk: Add wifi 1.1 package
am: ec35a22d2c

Change-Id: I23d907e900394e152842ab9f737b5a3ca4751c9f
2017-07-17 20:14:16 +00:00
Roshan Pius ec35a22d2c treble_common.mk: Add wifi 1.1 package
Bug: 63129484
Test: Compiles
Change-Id: Id254722a98dbd25c7016d0902c60151b6573d335
2017-07-17 11:13:17 -07:00
Bowgo Tsai 5cf6551455 Merge "custom_images: support verity fec (forward error correction)" am: abf553c9d3 am: bd91ac7740
am: 9a797706b5

Change-Id: Ibdd8307b5cc72007d76929ca8c4db1ce20f33f15
2017-07-15 00:06:34 +00:00
Bowgo Tsai 9a797706b5 Merge "custom_images: support verity fec (forward error correction)" am: abf553c9d3
am: bd91ac7740

Change-Id: I26cd1570d7cba2704339b60f00fa09ddd689611a
2017-07-15 00:02:03 +00:00
Bowgo Tsai bd91ac7740 Merge "custom_images: support verity fec (forward error correction)"
am: abf553c9d3

Change-Id: I4b6e678859538ac91fc2548fc7195677660af37c
2017-07-14 23:58:45 +00:00
Treehugger Robot abf553c9d3 Merge "custom_images: support verity fec (forward error correction)" 2017-07-14 23:51:47 +00:00
Tianjie Xu a4caab580c Merge "Generate brotli compressed {}.new.dat for full OTA" am: 1b28eca1a1 am: a07a04c737
am: 4b53a17756

Change-Id: If03919b9012f4a693e895b02a0c148eeb0a4da5e
2017-07-14 23:34:39 +00:00
Tianjie Xu 4b53a17756 Merge "Generate brotli compressed {}.new.dat for full OTA" am: 1b28eca1a1
am: a07a04c737

Change-Id: I5f2b92791a759def118c6aa70a3e0777a9e8da85
2017-07-14 23:30:32 +00:00
Tianjie Xu a07a04c737 Merge "Generate brotli compressed {}.new.dat for full OTA"
am: 1b28eca1a1

Change-Id: I3474e8efb634513fbc4876e5c272cf56b3443e12
2017-07-14 23:27:21 +00:00
Tianjie Xu 1b28eca1a1 Merge "Generate brotli compressed {}.new.dat for full OTA" 2017-07-14 23:21:54 +00:00
Colin Cross dcd3182250 Merge "Fix LOCAL_JAR_PROCESSOR dependency" am: 126e625fed am: 06f8dec6e0
am: 453fcba264

Change-Id: If63096b530ba19c62db7afd95f4d9620cc5fccfd
2017-07-14 23:17:30 +00:00
Colin Cross 453fcba264 Merge "Fix LOCAL_JAR_PROCESSOR dependency" am: 126e625fed
am: 06f8dec6e0

Change-Id: I348fda356863ef77e166782a666233239c1bde32
2017-07-14 23:13:31 +00:00