Commit graph

4735 commits

Author SHA1 Message Date
Colin Cross
a23e18fef5 Merge "Propagate PRODUCT_MINIMIZE_JAVA_DEBUG_INFO to soong and use it"
am: 9117c879f3

Change-Id: I56f075ea8e58b846bb6fc950920521bda0cc6e3e
2017-11-02 00:11:34 +00:00
Treehugger Robot
d1dec3bd72 Merge "Revert "Revert "Make some common properties overridden when used in defaults modules""" 2017-11-02 00:10:39 +00:00
Colin Cross
9117c879f3 Merge "Propagate PRODUCT_MINIMIZE_JAVA_DEBUG_INFO to soong and use it" 2017-11-02 00:05:20 +00:00
Vishwath Mohan
39375fe131 Revert "Revert "Build system changes for CFI (Soong)""
am: b743e9c16a

Change-Id: If5ef30be031a486d6c7d9b8cc5f48b16c8a5f041
2017-11-01 22:56:11 +00:00
Colin Cross
7d716baedf Revert "Revert "Make some common properties overridden when used in defaults modules""
This reverts commit 5c3c768187.

This reapplies I70e45caa92f65dc6a3bc81ae33a5a8f34ad11890 along with
additional changes in other projects to match the new types.

Bug: 68337468
Test: m checkbuild
Change-Id: I2d2d876b291869f834a6468d3e2ad99148f94a15
2017-11-01 14:24:48 -07:00
Colin Cross
126a25cb3d Propagate PRODUCT_MINIMIZE_JAVA_DEBUG_INFO to soong and use it
Strip debug info in javac when PRODUCT_MINIMIZE_JAVA_DEBUG_INFO
is set.

Test: m with PRODUCT_MINIMIZE_JAVA_DEBUG_INFO=true
Change-Id: I167e742662801291c516bf1ff826486560d22147
2017-11-01 12:51:16 -07:00
Vishwath Mohan
b743e9c16a Revert "Revert "Build system changes for CFI (Soong)""
This reverts commit 33c252c2f1.

I have a fix to the crashes that this CL set was causing, and have
uploaded it as a patchset to this revert.

This also contains a partial fix that was initially submitted
separately as
https://android-review.googlesource.com/#/c/platform/build/soong/+/524295/

Bug: 30227045
Test: ./art/test/testrunner/run_build_test_target.py -j110 art-asan #no
build errors
Test: m -j50 ASAN_OPTIONS=detect_leaks=0 SANITIZE_HOST=address # no
build errors

Change-Id: I3e53549fa03413d35d9a952f04de1e7629e1f06d
2017-11-01 12:50:01 -07:00
Nicolas Geoffray
1599b72cf1 Revert "Make some common properties overridden when used in defaults modules"
am: 5c3c768187

Change-Id: Ie8467465f1315b95aebd18643430d9b8d13b5b8b
2017-11-01 11:22:02 +00:00
Nicolas Geoffray
5c3c768187 Revert "Make some common properties overridden when used in defaults modules"
Bug: 68337468

Breaks HOST_PREFER_32BIT=true

This reverts commit 617016a6f2.

Change-Id: Ifb20f41cdf93dbfd73a3aac5b055e595e334350b
2017-11-01 09:32:53 +00:00
Colin Cross
72248331c9 Make some common properties overridden when used in defaults modules
am: 617016a6f2

Change-Id: I1bada408176f3d47d33c755acb3a6bd0b2cf56c6
2017-11-01 07:08:54 +00:00
Colin Cross
617016a6f2 Make some common properties overridden when used in defaults modules
Switch commonProperties to *string and *bool so that defining them
in a module correctly overrides instead of appends to values set
in defaults modules.

Bug: 68337468
Test: m checkbuild
Change-Id: I70e45caa92f65dc6a3bc81ae33a5a8f34ad11890
2017-11-01 05:28:36 +00:00
Colin Cross
6cde5be35e Merge "Import AAPT-related product variables from make"
am: 76530ec6f7

Change-Id: Ibd105709f4ffe6202d7dc21b7c9f784e10348074
2017-10-31 23:43:56 +00:00
Treehugger Robot
76530ec6f7 Merge "Import AAPT-related product variables from make" 2017-10-31 23:39:24 +00:00
Orion Hodson
db9c663d66 Revert "Build system changes for CFI (Soong)"
am: 33c252c2f1

Change-Id: I01dfb1e365772ea0879a8187a9fc15680ea69f07
2017-10-31 22:09:09 +00:00
Orion Hodson
062d42f4e9 Revert "Hide mutated variant in non-make builds."
am: da11d7422f

Change-Id: Ia3e8568ab7f9a501a28077fb224694778bd93450
2017-10-31 22:09:06 +00:00
Orion Hodson
33c252c2f1 Revert "Build system changes for CFI (Soong)"
This reverts commit d4b484b070.

Rationale: second 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: I38ab5284c614d6ee68e7359219bd75c7d50131be
2017-10-31 21:01:00 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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