Bo Hu
bc88ff69cf
Revert "Revert "emulator: create qemu images for system,vendor""
...
This reverts commit 9b99ddc8a5f0d50bbef0
2017-08-01 14:34:15 -07:00
Jiyong Park
eb2e568df2
Apks are again allowed to use vendor libs as before
...
When BOARD_VNDK_VERSION is set, native libs that were labeled as
native:platform are now divided into native:platform and native:vendor
sets depending on their install locations. In order to keep the existing
apks to use all the libraries that they have been using, native:vendor
is also added to the allowed types for apks.
However, in the future when we have vendor SDK and enforce all vendor
apks to use the vendor SDK, we will disallow native:vendor to
app:platform and native:vendor will be allowed only to those vendor apks
(probably labeled as app:vendor).
Bug: 33241851
Test: BOARD_VNDK_VERSION=current m <a vendor lib using vendor jni>
(e.g. ModemDiagnosticSystem in internal master)
Change-Id: I6ad0967ab17f07be9657b58c20fa9b96bd1a342b
Merged-In: I6ad0967ab17f07be9657b58c20fa9b96bd1a342b
2017-07-26 10:59:57 -07:00
Ian Pedowitz
0f61372f57
DO NOT MERGE Setting build_id to OC-MR1 for oc-mr1-dev
...
Bug: 63544673
Test: lunching a target shows 'BUILD_ID=OC-MR1'
Change-Id: I0cb3cf6fa27a92a173e40945ad701ccf29bd4d0e
2017-07-24 19:20:32 -07:00
Adam Seaton
a8772230d1
Merge changes I7c8a25a2,Ifb32d061 into oc-dev am: 683c44c812
...
am: c7d9294cd9
2017-07-20 21:10:44 +00:00
Adam Seaton
c7d9294cd9
Merge changes I7c8a25a2,Ifb32d061 into oc-dev
...
am: 683c44c812
2017-07-20 20:57:46 +00:00
Colin Cross
443529098c
Merge "Merge "Revert "Use java prebuilts"" am: 4d69df5191 am: f4e78ccf25 am: 96018b3d10" into oc-dr1-dev-plus-aosp
...
am: 00f21a2360
2017-07-19 23:08:25 +00:00
Colin Cross
f2da657628
Merge "Revert "Use java prebuilts"" am: 4d69df5191 am: f4e78ccf25
...
am: 96018b3d10
2017-07-19 22:58:23 +00:00
Colin Cross
96018b3d10
Merge "Revert "Use java prebuilts"" am: 4d69df5191
...
am: f4e78ccf25
2017-07-19 22:55:23 +00:00
Colin Cross
f4e78ccf25
Merge "Revert "Use java prebuilts""
...
am: 4d69df5191
2017-07-19 22:52:21 +00:00
Colin Cross
4d69df5191
Merge "Revert "Use java prebuilts""
2017-07-19 22:44:12 +00:00
Colin Cross
02112900cc
Revert "Use java prebuilts"
...
This reverts commit 1931750940
2017-07-19 22:42:46 +00:00
Colin Cross
0141bf4008
Merge "Merge "Merge "Use java prebuilts" am: 26e1b6d6c2 am: fcbaa25380" into oc-dev-plus-aosp am: 7b38914e4e" into oc-dr1-dev-plus-aosp
...
am: d2d0e31200
2017-07-19 22:24:35 +00:00
Colin Cross
1a05e52e6d
Merge "Merge "Use java prebuilts" am: 26e1b6d6c2 am: fcbaa25380" into oc-dev-plus-aosp
...
am: 7b38914e4e
2017-07-19 22:19:03 +00:00
Colin Cross
7d7f4cd7bb
Merge "Use java prebuilts" am: 26e1b6d6c2
...
am: fcbaa25380
2017-07-19 22:16:07 +00:00
Colin Cross
fcbaa25380
Merge "Use java prebuilts"
...
am: 26e1b6d6c2
2017-07-19 22:13:09 +00:00
Colin Cross
26e1b6d6c2
Merge "Use java prebuilts"
2017-07-19 22:08:48 +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
Tobias Thierer
5a00891df9
Merge "Make 'make docs' work on OpenJDK 9 toolchain." am: 8003d944a1 am: 32b8d637dc am: 675d7d56e8
...
am: bce2e113b4
2017-07-19 10:11:59 +00:00
Tobias Thierer
bce2e113b4
Merge "Make 'make docs' work on OpenJDK 9 toolchain." am: 8003d944a1 am: 32b8d637dc
...
am: 675d7d56e8
2017-07-19 10:06:30 +00:00
Tobias Thierer
675d7d56e8
Merge "Make 'make docs' work on OpenJDK 9 toolchain." am: 8003d944a1
...
am: 32b8d637dc
2017-07-19 10:01:00 +00:00
Tobias Thierer
32b8d637dc
Merge "Make 'make docs' work on OpenJDK 9 toolchain."
...
am: 8003d944a1
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
c0ee08020a
Merge "Remove JNI_H_INCLUDE from make." am: cc96704ad2 am: 2d05df376d am: f88b6bd7d8
...
am: 07d26d46d0
2017-07-19 01:51:33 +00:00
Ivan Lozano
3d055100c9
Merge "Allow integer_overflow sanitizer path exclusion." am: ad9dde8a86 am: 815c1f5941 am: 7e18525ef7
...
am: d86676e30a
2017-07-19 01:50:35 +00:00
Steven Moreland
07d26d46d0
Merge "Remove JNI_H_INCLUDE from make." am: cc96704ad2 am: 2d05df376d
...
am: f88b6bd7d8
2017-07-19 01:46:32 +00:00
Steven Moreland
f88b6bd7d8
Merge "Remove JNI_H_INCLUDE from make." am: cc96704ad2
...
am: 2d05df376d
2017-07-19 01:44:32 +00:00
Steven Moreland
2d05df376d
Merge "Remove JNI_H_INCLUDE from make."
...
am: cc96704ad2
2017-07-19 01:40:32 +00:00
Ivan Lozano
d86676e30a
Merge "Allow integer_overflow sanitizer path exclusion." am: ad9dde8a86 am: 815c1f5941
...
am: 7e18525ef7
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
2017-07-19 01:19:36 +00:00
Ivan Lozano
815c1f5941
Merge "Allow integer_overflow sanitizer path exclusion."
...
am: ad9dde8a86
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
90ac222290
Merge "Revert "Use dx.jar directly"" am: c7e3e962f8 am: 4cea760106 am: 3f273622f4
...
am: f113b854b1
2017-07-18 07:31:33 +00:00
Colin Cross
f113b854b1
Merge "Revert "Use dx.jar directly"" am: c7e3e962f8 am: 4cea760106
...
am: 3f273622f4
2017-07-18 07:25:36 +00:00
Colin Cross
3f273622f4
Merge "Revert "Use dx.jar directly"" am: c7e3e962f8
...
am: 4cea760106
2017-07-18 07:20:06 +00:00
Colin Cross
4cea760106
Merge "Revert "Use dx.jar directly""
...
am: c7e3e962f8
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
2017-07-18 05:22:59 +00:00
Colin Cross
5ac450547f
Merge "Use dx.jar directly" am: c68434c971 am: 4828fcad41 am: 5cf757bb85
...
am: 5a6cc2bda2
2017-07-17 20:58:00 +00:00
Jeff Gaston
c1d097ccab
Merge "Update to latest jacoco usage" am: 483fae7430 am: 6264b662f3 am: 7ce0d9c1e7
...
am: a72da88c31
2017-07-17 20:55:14 +00:00
Colin Cross
5a6cc2bda2
Merge "Use dx.jar directly" am: c68434c971 am: 4828fcad41
...
am: 5cf757bb85
2017-07-17 20:53:12 +00:00
Jeff Gaston
a72da88c31
Merge "Update to latest jacoco usage" am: 483fae7430 am: 6264b662f3
...
am: 7ce0d9c1e7
2017-07-17 20:52:40 +00:00
Colin Cross
5cf757bb85
Merge "Use dx.jar directly" am: c68434c971
...
am: 4828fcad41
2017-07-17 20:49:10 +00:00
Jeff Gaston
7ce0d9c1e7
Merge "Update to latest jacoco usage" am: 483fae7430
...
am: 6264b662f3
2017-07-17 20:48:40 +00:00
Colin Cross
4828fcad41
Merge "Use dx.jar directly"
...
am: c68434c971
2017-07-17 20:45:31 +00:00
Jeff Gaston
6264b662f3
Merge "Update to latest jacoco usage"
...
am: 483fae7430
2017-07-17 20:44:10 +00:00
