Commit Graph

5581 Commits

Author SHA1 Message Date
Alex Light dab4c1e84f Merge "Allow java_host_binary to be used with genrule." am: 047a24ac5c am: 901abbc79d
am: 94e63f3572

Change-Id: I960c48f46af29a48109c66d240fe4e76f382363a
2017-10-28 00:28:30 +00: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 2464dbf453 Merge "ModuleFactoryAdapter -> ModuleFactoryAdaptor" am: 7e768301b9 am: 4c9efd2ab2
am: 82364aa966

Change-Id: I5032e9c4dc92be3c1a3675446004dd9009539160
2017-10-27 23:38:18 +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 fd6fae6513 Merge "Use D8 by default" am: 5bab222432 am: f863d380c9
am: f1d4145e0a

Change-Id: I23c9d8b6f17a5cbe8b19e36a076de825dc23fdce
2017-10-27 22:02:41 +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 cc793be92b Merge "Make clang libTooling tools ignore all lto flags." am: bdb04acd57 am: 4b26316680
am: a744ff6711

Change-Id: I9ba560a610d5341b10e9dece263e97e175082ab9
2017-10-27 21:01:39 +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 6227619e54 Merge "Add support for packaging static libs in the NDK." am: 3ae6d30804 am: 33196e13c3
am: 7998e52156

Change-Id: I1ba9584d7d081ff1bc70a9a152aa96368f3eaf6f
2017-10-27 18:38:28 +00: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 8ac10e30bb Fix kotlin -classpath argument am: 715d7110f7 am: 6255422ccf
am: b9885293bd

Change-Id: I4a377bded38011df1d6807f2fe4a10d21b942fb0
2017-10-26 14:58:42 +00: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 208506f373 Merge "Switch instruction_set to *string" am: b563989f97 am: 4f487cdd96
am: 9d2cb72bb8

Change-Id: I43a56b7dc30ff2b1a8441efec233cbeb35109ea2
2017-10-26 07:09:23 +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 cd6f6070eb Fix source jars am: 8eadbf0aaf am: a55c967ac5
am: 73a7c7d983

Change-Id: I9899f38e5a77a2cac29517512b47a6b137519384
2017-10-26 01:35:47 +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 21b274882a Use prebuilt turbine jar for unbundled javac builds. am: 9a36418089 am: b17b4758f9
am: ad858ea8c6

Change-Id: I95d44640ed39960b602a7eded8bba554817255d7
2017-10-25 23:00:50 +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
Colin Cross 87f179b822 Merge changes If6d512ff,I3171f921 am: 49a7feb189 am: 8598fa6671
am: e8a5405f7f

Change-Id: I7cfeee714c2dec03fdbac510b8bd9ff78c74e191
2017-10-25 18:05:21 +00:00
Colin Cross e8a5405f7f Merge changes If6d512ff,I3171f921 am: 49a7feb189
am: 8598fa6671

Change-Id: Ic1bfeec522112acd7f63a17ab23e8f8c0ba2616e
2017-10-25 17:41:26 +00:00
Colin Cross 8598fa6671 Merge changes If6d512ff,I3171f921
am: 49a7feb189

Change-Id: I7bee7d40f1d49dfc196ea99407b169429ac7ffc7
2017-10-25 17:38:29 +00:00
Colin Cross 49a7feb189 Merge changes If6d512ff,I3171f921
* changes:
  Add convenience phony targets for system modules
  Don't panic in turbine with no classes
2017-10-25 17:28:25 +00:00
Jiyong Park 9e272b9f69 LLNDK can re-export headers am: 2a45412445 am: 939658c4a8
am: 4d7d02483e

Change-Id: Icfb55fd76d74752ce7a44c5d27fe213439f09ddd
2017-10-25 03:15:22 +00:00
Jiyong Park 4d7d02483e LLNDK can re-export headers am: 2a45412445
am: 939658c4a8

Change-Id: I70104b585d5a7e8ab4ac0e58953896509e813ade
2017-10-25 03:11:38 +00:00
Jiyong Park 939658c4a8 LLNDK can re-export headers
am: 2a45412445

Change-Id: I15dbe8697786ce257f6ff177ea6d4aa2ca2c262c
2017-10-25 03:07:04 +00:00
Jiyong Park 2a45412445 LLNDK can re-export headers
Added export_llndk_headers properties to llndk_library module. And a new
module type llndk_headers is added. This is to enable an LLNDK library
to reexport other LLNDK headers.

Bug: 65395259
Test: do the following
// frameworks/native/libs/arect/Android.bp
llndk_headers {
    name: "libarect_vendor_headers",
    export_include_dirs: ["include"],
}

// frameworks/native/libs/nativewindow/Android.bp
llndk_library {
    name: "libnativewindow",
    ....
    export_llndk_headers: ["libarect_vendor_headers"],
}

check that
-Iframeworks/native/libs/arect/include is in LOCAL_EXPORT_CFLAGS of
libnativewindow.vendor in out/soong/Android-<product>.mk

Change-Id: If1650414b2967f2042f4ebe2b593ed3f3ea45d3a
2017-10-25 10:30:05 +09:00