Commit Graph

5304 Commits

Author SHA1 Message Date
Orion Hodson da11d7422f Revert "Hide mutated variant in non-make builds."
This reverts commit 6147c6972a.

Rationale: first in group of commits that left aosp_x86_64 not
building. (See https://android-build.googleplex.com/builds/
submitted/4426589/aosp_x86_64-eng/latest/logs/build_error.log)

Bug: 30227045
Test: builds
Change-Id: I632869d13d09b43e2040da187d7ced4f05c332de
2017-10-31 20:47:44 +00:00
Yohann Roussel 2e19cd8959 Always use installed version of d8-compat-dx
Also adapt to the renaming of d8 to d8-compat-dx.

Test: USE_D8=true m -j16 PRODUCT-aosp_arm64-eng showcommands core-oj
Change-Id: Ic7aaa6a5da34a6a5706c20f53922a83cb1de1100
2017-10-31 13:29:07 -07:00
Jeff Gaston d8ac559dc9 Merge "Make $(depfile) work with sbox" am: a6253ea0bd
am: 4bd860aea1

Change-Id: Ia0e3559c3ba644a48da5c1bc9ca720e10a5bc85b
2017-10-31 20:14:30 +00:00
Jeff Gaston 4bd860aea1 Merge "Make $(depfile) work with sbox"
am: a6253ea0bd

Change-Id: I55716df9c308f81ac86b6251e3ca4b83f1d69a18
2017-10-31 20:12:00 +00:00
Treehugger Robot a6253ea0bd Merge "Make $(depfile) work with sbox" 2017-10-31 20:03:37 +00:00
Vishwath Mohan 2f84c65d3b Hide mutated variant in non-make builds. am: 6147c6972a
am: 34cb708379

Change-Id: I1235736fdadc1a0b8eb648b7a21f7501a3580c98
2017-10-31 12:05:28 +00:00
Vishwath Mohan 34cb708379 Hide mutated variant in non-make builds.
am: 6147c6972a

Change-Id: I2e3745e56f7a3f2df58cb68bb1fc1674fec82415
2017-10-31 11:59:55 +00:00
Vishwath Mohan 6147c6972a Hide mutated variant in non-make builds.
This CL hides (using Module.Properties.PreventInstall) either the
sanitized or stock variant for non-make embedded builds (based on
whether a sanitizer is enabled or not) so we don't have duplicate
rules for installing the same target.

Bug: 30227045
Test: OUT_DIR=out build/soong/scripts/build-ndk-prebuilts.sh # no
longer generates a duplicate build error.

Change-Id: I0b2dbb0afd5d426b32da67f951e2a4f9fbb3f3b9
2017-10-30 20:33:41 -07:00
Vishwath Mohan 7a8a392974 Merge "Build system changes for CFI (Soong)" am: 9ee01976fe
am: 33af0d78bf

Change-Id: Iedb56b6a995bc41ed4002ac1fb139ee92ab8c6e7
2017-10-31 01:56:07 +00:00
Vishwath Mohan 33af0d78bf Merge "Build system changes for CFI (Soong)"
am: 9ee01976fe

Change-Id: I9f716e29e5b93577e36f58f852690967d5efe702
2017-10-31 01:51:02 +00:00
Vishwath Mohan 9ee01976fe Merge "Build system changes for CFI (Soong)" 2017-10-31 01:42:16 +00:00
Jeff Gaston 02a684b8b2 Make $(depfile) work with sbox
Most notably, the sandbox depfile path should be passed into the tool.

Bug: 68336760
Test: m -j checkbuild

Change-Id: I22f944a3f57d613fda26de0ea777a915cafcd020
2017-10-30 17:49:29 -07:00
Colin Cross face4e4563 Import AAPT-related product variables from make
Test: m checkbuild
Change-Id: I22113c17d240ff26652cea7df801a183343faebd
2017-10-30 17:36:41 -07:00
Stephen Hines a3b8634ce3 Switch to clang-4393122. am: 0ed7d24f7a
am: bc7ab77eb9

Change-Id: Ieccb2af4e4f9f0d46fd6d69bb9bfa429834c4c0c
2017-10-30 19:57:15 +00:00
Stephen Hines bc7ab77eb9 Switch to clang-4393122.
am: 0ed7d24f7a

Change-Id: I9792f96d02044430629ea08e23b5d1cc3e5938f8
2017-10-30 19:46:15 +00:00
Stephen Hines 0ed7d24f7a Switch to clang-4393122.
Bug: http://b/62580008
Bug: http://b/68236239
Bug: http://b/68236396
Test: https://goto.google.com/clang-4393122-testing
Change-Id: Ib6bcf93e356172aad2a762b730a6f93916a5d845
2017-10-30 16:00:44 +00:00
Vishwath Mohan d4b484b070 Build system changes for CFI (Soong)
This CL makes multiples changes in preparation for platform-wide CFI.

(a) Adds a second -version-script=... to the command line
when building components that use a version script. This ensures that
__cfi_check is also exported, and allows CFI to be enabled for these
components.

(b) Adds both topdown and bottom up mutators for CFI to help propagate
dependencies correctly for components that may need CFI disabled.

(c) Fixes an issue with the mutators to correctly apply settings to
both generated variants

(d) Fixes issues when components have more than a single visibility
flag.

Bug: 30227045
Test: SANITIZE_TARGET=cfi m -j40 # dependencies are correctly built
                                 # with/without CFI

Change-Id: I44793cc03bcbcdaa957cc49c7240b87d7c9db327
2017-10-30 01:42:31 -07:00
Alex Light 94e63f3572 Merge "Allow java_host_binary to be used with genrule." am: 047a24ac5c
am: 901abbc79d

Change-Id: I3d8307d4680c1656bce4d9581633feb4996f9903
2017-10-28 00:18:24 +00:00
Alex Light 901abbc79d Merge "Allow java_host_binary to be used with genrule."
am: 047a24ac5c

Change-Id: I461dffdb266403547a1b60204790215461478daa
2017-10-28 00:13:41 +00:00
Treehugger Robot 047a24ac5c Merge "Allow java_host_binary to be used with genrule." 2017-10-28 00:01:53 +00:00
Steven Moreland 82364aa966 Merge "ModuleFactoryAdapter -> ModuleFactoryAdaptor" am: 7e768301b9
am: 4c9efd2ab2

Change-Id: Id85539df1c78089567955ba579bf7412f82a5a85
2017-10-27 23:33:48 +00:00
Steven Moreland 4c9efd2ab2 Merge "ModuleFactoryAdapter -> ModuleFactoryAdaptor"
am: 7e768301b9

Change-Id: If5a4d17136ba5eedb0ada903acb285c3d9e4814f
2017-10-27 23:27:46 +00:00
Treehugger Robot 7e768301b9 Merge "ModuleFactoryAdapter -> ModuleFactoryAdaptor" 2017-10-27 23:20:31 +00:00
Alex Light 2423717a0f Allow java_host_binary to be used with genrule.
This is done by implementing the HostToolPath interface for java
Binary objects.

Currently, in order for a java_binary_host to be used in this way the
java_host_binary must include:
    compile_multilib: "first"

Otherwise the genrule is unable to find the correct variant.

Test: ./build_test.bash
Test: Manual

Bug: 68397812

Change-Id: I6849488dc13fa8c383df69d00f62ad815ec17876
2017-10-27 22:07:48 +00:00
Alan Leung f1d4145e0a Merge "Use D8 by default" am: 5bab222432
am: f863d380c9

Change-Id: I741434cc57bf6b4ad590f30f38f411adbcaf8d8c
2017-10-27 21:48:43 +00:00
Steven Moreland b1448e4e0b ModuleFactoryAdapter -> ModuleFactoryAdaptor
Fixes type

Test: none
Change-Id: If1a85537243390a0e0d65b8911767288e00538c2
2017-10-27 14:46:47 -07:00
Alan Leung f863d380c9 Merge "Use D8 by default"
am: 5bab222432

Change-Id: Ic1fb8159ac74c40ba468d7208b11c80cc32b351a
2017-10-27 21:34:37 +00:00
Alan Leung 5bab222432 Merge "Use D8 by default" 2017-10-27 21:15:48 +00:00
Jayant Chowdhary a744ff6711 Merge "Make clang libTooling tools ignore all lto flags." am: bdb04acd57
am: 4b26316680

Change-Id: Id24547f1a2e90c860350251519b7e65375e2ff45
2017-10-27 20:58:39 +00:00
Jayant Chowdhary 4b26316680 Merge "Make clang libTooling tools ignore all lto flags."
am: bdb04acd57

Change-Id: I9d8305df2d155965ecae8ca62ba9cb344523d9f4
2017-10-27 20:51:35 +00:00
Treehugger Robot bdb04acd57 Merge "Make clang libTooling tools ignore all lto flags." 2017-10-27 20:42:19 +00:00
Alan Leung 899f3742b8 Use D8 by default
The min-sdk-version issue is solved.

Same goes for the ART layout gtests failure found on the art host bots.

Bug: 67569208
Test: m checkbuild / tests
Change-Id: I88c7f5e9ea5c5c5d1b13404ba5db1479f9f7f2f7
2017-10-27 11:51:01 -07:00
Dan Albert 7998e52156 Merge "Add support for packaging static libs in the NDK." am: 3ae6d30804
am: 33196e13c3

Change-Id: Ia50d74754dc632df56873451b5a8124937313efc
2017-10-27 18:33:01 +00:00
Jayant Chowdhary 20f5d137ed Make clang libTooling tools ignore all lto flags.
LLVM r275480 does not recognize flto flags, suppress the option in clang
libTooling tools for now.

Bug: 62839002

Test: mma

Change-Id: Ia9d80b46320e551a93dbff780405d8ff8ad73f35
2017-10-27 11:29:52 -07:00
Dan Albert 33196e13c3 Merge "Add support for packaging static libs in the NDK."
am: 3ae6d30804

Change-Id: If09a5caeaaa1c34c21949f2f016ff392c23685ed
2017-10-27 18:28:55 +00:00
Treehugger Robot 3ae6d30804 Merge "Add support for packaging static libs in the NDK." 2017-10-27 18:20:31 +00:00
Dan Albert f563d25578 Add support for packaging static libs in the NDK.
Adding `static_ndk_lib: true` to a module installs the static library
to the NDK sysroot.

Test: Set property for libc.a, make ndk
Test: Set property for libc.a, scripts/build-ndk-prebuilts.sh
Bug: https://github.com/android-ndk/ndk/issues/272
Change-Id: Ib368a25705f2adb7129dac207c1b727d4ccc1eb2
2017-10-26 12:19:29 -07:00
Colin Cross b9885293bd Fix kotlin -classpath argument am: 715d7110f7
am: 6255422ccf

Change-Id: I8f816b635cee437f2ac9964bd7ddc74643cb1354
2017-10-26 14:56:11 +00:00
Colin Cross 6255422ccf Fix kotlin -classpath argument
am: 715d7110f7

Change-Id: Ie82cc059fca023a89ec5de994a8243fefabeef28
2017-10-26 14:53:41 +00:00
Colin Cross 715d7110f7 Fix kotlin -classpath argument
kotlinc expects -classpath, not --classpath.

Also add a test that uses only .kt files to exercise the code when
there are no java sources.

Test: java_test.go
Change-Id: Ifa5a007b460b40ea2188d0907570fbdca6c48da7
2017-10-26 14:47:40 +00:00
Dan Willemsen 9d2cb72bb8 Merge "Switch instruction_set to *string" am: b563989f97
am: 4f487cdd96

Change-Id: I2166fe7263ab8b083988c68ba810503a0f9f6a11
2017-10-26 07:05:18 +00:00
Dan Willemsen 4f487cdd96 Merge "Switch instruction_set to *string"
am: b563989f97

Change-Id: Ide1e22b8e574c4ab5a54f33180a9041ca2a42657
2017-10-26 07:01:47 +00:00
Treehugger Robot b563989f97 Merge "Switch instruction_set to *string" 2017-10-26 06:56:35 +00:00
Colin Cross 73a7c7d983 Fix source jars am: 8eadbf0aaf
am: a55c967ac5

Change-Id: I4a67d17ce04c3187b8bc9802a3d7fafbc1bdb3f4
2017-10-26 01:20:58 +00:00
Colin Cross a55c967ac5 Fix source jars
am: 8eadbf0aaf

Change-Id: If9a22699adf39954c6716ccf0ffe39a9a69df75a
2017-10-26 01:07:17 +00:00
Colin Cross 8eadbf0aaf Fix source jars
Source jars were not working as designed because javac will only
compile files from the -sourcepath if there are references to them
starting from files on the command line.  Switch to extracting
the source jars into a directory and passing a list of the files
to javac.

Test: m checkbuild
Change-Id: I9f7d824f8538d081b2f5ad64ae3cbfd0e96213af
2017-10-26 01:00:46 +00:00
Nan Zhang ad858ea8c6 Use prebuilt turbine jar for unbundled javac builds. am: 9a36418089
am: b17b4758f9

Change-Id: I78bf2d6348870c6667329fe225ac36b7b3ca681e
2017-10-25 22:54:20 +00:00
Nan Zhang b17b4758f9 Use prebuilt turbine jar for unbundled javac builds.
am: 9a36418089

Change-Id: I30a3fb0960f2775a6bc0cf6742a2c5d27b0f03cd
2017-10-25 22:45:05 +00:00
Dan Willemsen 5922f3cb6e Switch instruction_set to *string
So that the contents gets replaced when prepended/appended instead of
merged.

Test: Set instruction_set in a cc_defaults, and in a module.
Change-Id: I0f2c789231d89efa1ab053f9dc118cd19f11b0e6
2017-10-25 15:20:50 -07:00
Nan Zhang 9a36418089 Use prebuilt turbine jar for unbundled javac builds.
Test: m -j
Change-Id: If2ab85f8591fe7ab275a1d4fefdd80d871f2c36d
2017-10-25 11:11:37 -07:00