Adam Seaton
d3f3583872
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 8d56fc91b1
am: 4b61de46b5
am: 73c3609c53
am: 08425ba495
...
am: 5aaced88b8
-s ours
Change-Id: I60f2772a3c751a6c4bc5fd352ede97bf1b77445b
2017-07-19 21:18:42 +00:00
Adam Seaton
f405e6fa54
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe
am: e29d61d582
am: 775c752f51
-s ours am: 6399f470f6
-s ours am: 4a126acfa7
am: 4c9adca135
-s ours am: b8d42f935a
am: effbf4f539
am: 131dfae90d
am: 0d6f9c4f2a
-s ours am: f15d15e7c7
am: 06e3c7dc42
...
am: ab1c4fb3c4
Change-Id: I7d429cb68e4076c312fb2f8f4e61f3f2b48f5023
2017-07-19 21:15:43 +00:00
Adam Seaton
3630da3bdd
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe
am: e29d61d582
am: 775c752f51
-s ours am: 6399f470f6
-s ours am: 4a126acfa7
am: 4c9adca135
-s ours am: b8d42f935a
am: effbf4f539
am: 131dfae90d
am: 0d6f9c4f2a
-s ours am: f15d15e7c7
am: 06e3c7dc42
...
am: ab1c4fb3c4
-s ours
Change-Id: Id32add2c8c54747e22e8ef96d3484fc1bd91ed61
2017-07-19 21:15:41 +00:00
Adam Seaton
5aaced88b8
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 8d56fc91b1
am: 4b61de46b5
am: 73c3609c53
...
am: 08425ba495
Change-Id: I0784c9350d75cfd341e38415707bbf6276f09555
2017-07-19 21:15:41 +00:00
Adam Seaton
3bf3f53e5e
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 8d56fc91b1
am: 4b61de46b5
am: 73c3609c53
-s ours
...
am: 1447fa794a
-s ours
Change-Id: Iee80135e5f9577cb8dd45ba11e7eff0a4f886e11
2017-07-19 21:15:40 +00:00
Adam Seaton
ab1c4fb3c4
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe
am: e29d61d582
am: 775c752f51
-s ours am: 6399f470f6
-s ours am: 4a126acfa7
am: 4c9adca135
-s ours am: b8d42f935a
am: effbf4f539
am: 131dfae90d
am: 0d6f9c4f2a
-s ours am: f15d15e7c7
...
am: 06e3c7dc42
Change-Id: I766d9e551e81801f4293af24f11b4da3a2802120
2017-07-19 21:13:16 +00:00
Adam Seaton
08425ba495
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 8d56fc91b1
am: 4b61de46b5
...
am: 73c3609c53
Change-Id: I9319957d255084424c82fa759521285786b6a852
2017-07-19 21:13:11 +00:00
Adam Seaton
1447fa794a
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 8d56fc91b1
am: 4b61de46b5
...
am: 73c3609c53
-s ours
Change-Id: I0a2c0db6add00718249fc09ed448df50d5a2190d
2017-07-19 21:13:10 +00:00
Adam Seaton
06e3c7dc42
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe
am: e29d61d582
am: 775c752f51
-s ours am: 6399f470f6
-s ours am: 4a126acfa7
am: 4c9adca135
-s ours am: b8d42f935a
am: effbf4f539
am: 131dfae90d
am: 0d6f9c4f2a
-s ours
...
am: f15d15e7c7
Change-Id: I0a95c17158d2b5539e98f1b2e7581ff9318c63dd
2017-07-19 21:10:13 +00:00
Adam Seaton
73c3609c53
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 8d56fc91b1
...
am: 4b61de46b5
Change-Id: I5ed82fd3618083cc78ff115905f922b327851461
2017-07-19 21:10:12 +00:00
Adam Seaton
4b61de46b5
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344
...
am: 8d56fc91b1
Change-Id: I835be7d5a11d617daec35067ac269a2d1919d958
2017-07-19 21:07:10 +00:00
Adam Seaton
f15d15e7c7
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe
am: e29d61d582
am: 775c752f51
-s ours am: 6399f470f6
-s ours am: 4a126acfa7
am: 4c9adca135
-s ours am: b8d42f935a
am: effbf4f539
am: 131dfae90d
...
am: 0d6f9c4f2a
-s ours
Change-Id: Ic4866b3c883aae5d107241b473d50135fc9597a7
2017-07-19 21:07:08 +00:00
Adam Seaton
0d6f9c4f2a
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe
am: e29d61d582
am: 775c752f51
-s ours am: 6399f470f6
-s ours am: 4a126acfa7
am: 4c9adca135
-s ours am: b8d42f935a
am: effbf4f539
...
am: 131dfae90d
Change-Id: I6a2181a090e456120f11813309115c7cbeedfa48
2017-07-19 21:04:41 +00:00
Adam Seaton
131dfae90d
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe
am: e29d61d582
am: 775c752f51
-s ours am: 6399f470f6
-s ours am: 4a126acfa7
am: 4c9adca135
-s ours am: b8d42f935a
...
am: effbf4f539
Change-Id: I4710a94c8758dd9f2ec1dcd8a06a51ba1ba85158
2017-07-19 21:02:10 +00:00
Adam Seaton
effbf4f539
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe
am: e29d61d582
am: 775c752f51
-s ours am: 6399f470f6
-s ours am: 4a126acfa7
am: 4c9adca135
-s ours
...
am: b8d42f935a
Change-Id: Id7f8f21fd719ad39b22216c8e99bf28629ac3cb0
2017-07-19 20:59:40 +00:00
Adam Seaton
b8d42f935a
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe
am: e29d61d582
am: 775c752f51
-s ours am: 6399f470f6
-s ours am: 4a126acfa7
...
am: 4c9adca135
-s ours
Change-Id: I6c6632af2dc711301523e86637c4cbc6007a91ba
2017-07-19 20:56:39 +00:00
Adam Seaton
4c9adca135
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe
am: e29d61d582
am: 775c752f51
-s ours am: 6399f470f6
-s ours
...
am: 4a126acfa7
Change-Id: Ic286a81fe536561739207c73178a44f7042b8430
2017-07-19 20:54:08 +00:00
Adam Seaton
4a126acfa7
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe
am: e29d61d582
am: 775c752f51
-s ours
...
am: 6399f470f6
-s ours
Change-Id: Ife92877c9c37bd55f37a448a40a6d05e82c62781
2017-07-19 20:52:08 +00:00
Adam Seaton
6399f470f6
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe
am: e29d61d582
...
am: 775c752f51
-s ours
Change-Id: I593b3d0da3b49fc527745dc1d0c7f7eaca32f6ab
2017-07-19 20:49:38 +00:00
Adam Seaton
775c752f51
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe
...
am: e29d61d582
Change-Id: Iebee7e9792304a0ea1e6f2fa59629a4c39526faa
2017-07-19 20:47:13 +00:00
Suren Baghdasaryan
033c79c4fa
Add makefile to define PRODUCT_SHIPPING_API_LEVEL for O release
...
am: 81a7690eb9
Change-Id: I578a54bbd403493d4ffa40c43189d443f0ef119b
2017-07-19 20:44:14 +00:00
Adam Seaton
e29d61d582
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344
...
am: 4061effbfe
Change-Id: Icd9f342e33fb61ac569132d3480d127a5e970b16
2017-07-19 20:44:08 +00:00
Adam Seaton
18be908442
[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344
2017-07-19 20:36:48 +00:00
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
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
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
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
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
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
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
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
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