Commit graph

13741 commits

Author SHA1 Message Date
Alexey Polyudov
19e0320ccb build: aux: Fix link type checking for AUX builds
AUX build environent is volatile and is only instantiated in
a context of AUX-aware module.
link-type checking is happening outside such context, and
is not able to correctly determine AUX build dependencies.

1. Save enough of context in LINK_TYPE variable;
   Use AUX-<variant-name> instead of AUX
2. Load correct set of AUX meta build vars before
   building link_type rules

Bug: 62060489
Test: make auxiliary

build no longer tries to access "/STATIC_LIBRARIES" path

Change-Id: I9764d4a0740da1c55a6f8429398872fc4362942c
(cherry picked from commit 55ebe631b4)
2017-08-04 12:45:02 -07:00
Ian Pedowitz
f28bf722c2 Making a comment a bit more explicit
Bug: 64364822
Test: N/A comment only
Change-Id: I4ef65aef4521326ac48539ad27422f881cc3e883
2017-08-03 17:38:26 -07:00
TreeHugger Robot
e6883303c1 Merge "Revert "Revert "emulator: create qemu images for system,vendor""" into oc-mr1-dev 2017-08-02 20:04:13 +00:00
Yifan Hong
c718d8300b Merge "Vendor modules in make also have __ANDROID_VNDK__ defined." into oc-mr1-dev 2017-08-02 19:56:17 +00:00
Yifan Hong
1287e59f15 Vendor modules in make also have __ANDROID_VNDK__ defined.
Bug: 64277220
Test: BOARD_VNDK_VERSION m -j
Change-Id: Ia9811ea526d0878b539c8c3da9e82e6bf33fe8e8
Merged-In: Ia9811ea526d0878b539c8c3da9e82e6bf33fe8e8
2017-08-01 18:54:26 -07:00
TreeHugger Robot
1987fd6f2b Merge "Don't add .vendor suffix for vendor-only modules" into oc-mr1-dev 2017-08-01 23:13:04 +00:00
Bo Hu
bc88ff69cf Revert "Revert "emulator: create qemu images for system,vendor""
This reverts commit 9b99ddc8a5.
and add syste-qemu.img to the dependency list of sdk target

BUG: 64235252

Test: build sdk target successfully

(cherry picked from commit f0d50bbef0)

Change-Id: I813233c7c3f06eb1eca18aad5ea890a55814eb1b
2017-08-01 14:34:15 -07:00
TreeHugger Robot
0914778538 Merge "oc-mr1-dev is OC-MR1, don't allow building beyond it" into oc-mr1-dev 2017-08-01 19:13:15 +00:00
TreeHugger Robot
69d01b4fff Merge "add legacy-android-test java library to PDK platform.zip" into oc-mr1-dev 2017-07-31 23:12:49 +00:00
Ian Pedowitz
22c06e7c8e oc-mr1-dev is OC-MR1, don't allow building beyond it
Bug: 63544673
Test: Can't lunch marlin-userdebug-PPR1
$ lunch marlin-userdebug-PPR1
build/core/version_defaults.mk:55: Invalid TARGET_PLATFORM_VERSION 'PPR1', must be one of
build/core/version_defaults.mk:56: *** OPM1.  Stop.

Change-Id: I116b0cebb353600277876eabccf41e7dda736151
Merged-In: I2d9019af8c4e24e34c743be85d4e0ff224de9d17
2017-07-28 11:12:19 -07:00
Keun-young Park
37ae422c6f add legacy-android-test java library to PDK platform.zip
- Partners building java test using legacy test API needs it.

bug: 64121067
Test: make platform-java and check if library is in platform.zip
Change-Id: If831f8cc89a386ccb51f46935667057efb3cdf91
2017-07-27 21:27:16 +00:00
Jiyong Park
1a5c2dcdc8 Don't add .vendor suffix for vendor-only modules
Soong now adds .vendor suffix only for modules having both core and
vendor variants. Furthermore, names listed in LOCAL_SHARED_LIBRARIES
are correct (= have .vendor suffix when the dependent lib has variants).
Therefore, make does not need to force add .vendor suffix when parsing
modules from soong.

Bug: 37480243
Test: BOARD_VNDK_VERSION=current m -j <name> is successful, where <name>
is one of the vendor-only libraries in Soong. (i.e.
android.hardware.renderscript@1.0-impl)
Test: m -j does not break anything

Merged-In: Id8d0d01313c63496a10de4cd3ddb9f75180efef6
Change-Id: Id8d0d01313c63496a10de4cd3ddb9f75180efef6
(cherry picked from commit a9c4c71756)
2017-07-27 09:47:55 +09: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

Change-Id: Iea69629779d87a7a6ae74216076f1093f13931b0
2017-07-20 21:10:44 +00:00
Adam Seaton
c7d9294cd9 Merge changes I7c8a25a2,Ifb32d061 into oc-dev
am: 683c44c812

Change-Id: Ifd90edf581b976684da3a5b9fa2a6dc3ac7102da
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

Change-Id: Ib1186289e955e0b6f35285a192b2e02d8996f4ee
2017-07-19 23:08:25 +00:00
Colin Cross
f2da657628 Merge "Revert "Use java prebuilts"" am: 4d69df5191 am: f4e78ccf25
am: 96018b3d10

Change-Id: Ib54b8c0fbb95179bff97abe028d133da3528380f
2017-07-19 22:58:23 +00:00
Colin Cross
96018b3d10 Merge "Revert "Use java prebuilts"" am: 4d69df5191
am: f4e78ccf25

Change-Id: I1b0bfaa059f68e09c115662ca9f850213305b8f0
2017-07-19 22:55:23 +00:00
Colin Cross
f4e78ccf25 Merge "Revert "Use java prebuilts""
am: 4d69df5191

Change-Id: I978bf3d25e0be2a2a6b40c5b396821cc2a8d9365
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.

Change-Id: I7a99fd6c53d35a2a674f2d60b113a727f3c453ce
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

Change-Id: Iea40d864193eead68603aac150a5e02d0060728d
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

Change-Id: I61313e8009c964868cf4984a7f86811748e98819
2017-07-19 22:19:03 +00:00
Colin Cross
7d7f4cd7bb Merge "Use java prebuilts" am: 26e1b6d6c2
am: fcbaa25380

Change-Id: I27e44fa8d649092327b3543f440fae65b36c054c
2017-07-19 22:16:07 +00:00
Colin Cross
fcbaa25380 Merge "Use java prebuilts"
am: 26e1b6d6c2

Change-Id: If761856f9fd509d2c5694844b6bb10966717e0b1
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

Change-Id: I58a4c89f9f564c633b1d1f8ee31f5b06b16fdc6b
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

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
c0ee08020a Merge "Remove JNI_H_INCLUDE from make." am: cc96704ad2 am: 2d05df376d am: f88b6bd7d8
am: 07d26d46d0

Change-Id: I09cf9fa8fc080ec486d801fb143e5782e16f4fc4
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

Change-Id: Ic23f9dcef1a3c97a67c98f3af4fb636b0c825628
2017-07-19 01:50:35 +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
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

Change-Id: I6c01dcc44a931685b81c91cd5cbee15fd7cfa3ca
2017-07-18 07:31:33 +00: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