Commit Graph

5631 Commits

Author SHA1 Message Date
Colin Cross
535e2cf4e1 Support installable prebuilt jars
Some host modules need to be installed.  Add an installable property.

Test: m checkbuild
Change-Id: Ifd023213ff66e81aa77ba1741c75837a1dd88d1d
2017-10-20 20:14:47 -07:00
Colin Cross
2ebc476646 Use prebuilts/sdk/*current until Soong can generate stubs
The android_*stubs_current modules don't yet exist, so fall back to
the prebuilt jars for now.

Test: m checkbuild
Change-Id: Iabd32b30954b3f4a6d9a779fde52a032b684807e
2017-10-20 20:14:22 -07:00
Colin Cross
461bd1aae7 Add sdk_version property to imported jars
Test: m checkbuild
Change-Id: I83dd6ad157c7a5918747ce8c9be05c1e1e22d710
2017-10-20 20:14:22 -07:00
Nan Zhang
fa06460d6e Support Turbine in Soong. am: ed19fc3e2c am: 5aae858f1a am: 9324fdd0a7
am: 1ba9ca7b90

Change-Id: I0ea776d2fd3daeb61bcf304c442bf8b54b8df3ec
2017-10-21 01:45:38 +00:00
Nan Zhang
1ba9ca7b90 Support Turbine in Soong. am: ed19fc3e2c am: 5aae858f1a
am: 9324fdd0a7

Change-Id: I3edfd497798be5f6ba4a53b1d0e6b1ef121a84e2
2017-10-21 01:38:19 +00:00
Nan Zhang
9324fdd0a7 Support Turbine in Soong. am: ed19fc3e2c
am: 5aae858f1a

Change-Id: If96f8d44062cc6bc149323d56668be6a0a2d9234
2017-10-21 01:32:56 +00:00
Nan Zhang
5aae858f1a Support Turbine in Soong.
am: ed19fc3e2c

Change-Id: Iea8d7acbda36a22bdc961417f84cd4db88249279
2017-10-21 01:28:49 +00:00
Nan Zhang
ed19fc3e2c Support Turbine in Soong.
If sdk jars(android_stubs_current, etc) are compiled using soong java
modules, we have to filter them when running Java build with Turbine.

TODO: provide more unit-tests.

Test: m clean && m -j32; go test java_test

Change-Id: Iad7c241b0e8b0ca760950733f513124b56c84564
2017-10-20 16:26:18 -07:00
Alan Leung
a486fc0db6 Merge "Add D8 support" am: 9e07394fd0 am: e71e037a04 am: 0072d62353
am: 071962055b

Change-Id: Ic45ca2abae55f7809a2597167c4a72c21b0c8b69
2017-10-20 19:17:10 +00:00
Alan Leung
071962055b Merge "Add D8 support" am: 9e07394fd0 am: e71e037a04
am: 0072d62353

Change-Id: If7a3858ae645f3b1e6879a627c38bc0314c20786
2017-10-20 19:13:10 +00:00
Alan Leung
0072d62353 Merge "Add D8 support" am: 9e07394fd0
am: e71e037a04

Change-Id: If98e74bf002c1dc208fd070e972baae95a535176
2017-10-20 19:09:01 +00:00
Alan Leung
e71e037a04 Merge "Add D8 support"
am: 9e07394fd0

Change-Id: I4cfcabf3f281b3d24a14eeaff67d5713d97a017e
2017-10-20 19:04:50 +00:00
Alan Leung
9e07394fd0 Merge "Add D8 support" 2017-10-20 18:59:22 +00:00
Yabin Cui
f6e7f03f88 Merge "Support tsan in Android.bp." am: ef784b537e am: 3e6e44e0e3 am: a02b5e6be2
am: 5936252d8d

Change-Id: Ib9b6226b53c4ec6d69de4934c40479390f424ee7
2017-10-20 18:21:58 +00:00
Yabin Cui
5936252d8d Merge "Support tsan in Android.bp." am: ef784b537e am: 3e6e44e0e3
am: a02b5e6be2

Change-Id: I345d29efaf392c82ed6cadc045ae2f70879cd691
2017-10-20 18:12:19 +00:00
Yabin Cui
a02b5e6be2 Merge "Support tsan in Android.bp." am: ef784b537e
am: 3e6e44e0e3

Change-Id: I87990259067c337094707e7282ee3afc23523dd1
2017-10-20 18:08:39 +00:00
Yabin Cui
3e6e44e0e3 Merge "Support tsan in Android.bp."
am: ef784b537e

Change-Id: I6d92281bf394416f33977cc004371594c9cf6e89
2017-10-20 18:04:34 +00:00
Yabin Cui
ef784b537e Merge "Support tsan in Android.bp." 2017-10-20 17:56:00 +00:00
Jiyong Park
0d2a24117b Merge "Add two more vendor-specific properties" am: fa9ff8441a am: 34f79d0edd am: 5cc211852a
am: 671505b62d

Change-Id: I68d56ce7a48c0e4e2e3ac8e7ca63d5a26001c8b4
2017-10-20 02:37:31 +00:00
Jiyong Park
671505b62d Merge "Add two more vendor-specific properties" am: fa9ff8441a am: 34f79d0edd
am: 5cc211852a

Change-Id: Ib56d742764f90820e2a385b26eb687478bebca55
2017-10-20 01:43:09 +00:00
Jiyong Park
5cc211852a Merge "Add two more vendor-specific properties" am: fa9ff8441a
am: 34f79d0edd

Change-Id: I968ae8e2f2cc72af8f6131cb9d829105c7441631
2017-10-20 01:18:26 +00:00
Jiyong Park
34f79d0edd Merge "Add two more vendor-specific properties"
am: fa9ff8441a

Change-Id: Ifbd44067250d660957644937b61f30fef6a421cd
2017-10-20 01:10:32 +00:00
Treehugger Robot
fa9ff8441a Merge "Add two more vendor-specific properties" 2017-10-20 01:02:18 +00:00
Colin Cross
05f31032cd Merge "Add property to prevent dex preopting" am: 38cd9a4ec7 am: 481fe49254 am: 1ae35f3a00
am: f553b857b9

Change-Id: Ia1bd86ef2e5a53b31bb1f87d9b2255bd66b7f89c
2017-10-19 23:55:08 +00:00
Colin Cross
4f1afd2273 Merge changes If00e16bd,Id5b2ec3f am: 16792167ad am: 8de6ca542e am: 873b249648
am: 0354cfef2f

Change-Id: I8ef21045361d6dcac00e89c61588b17bee75caea
2017-10-19 23:54:39 +00:00
Jeff Gaston
c0ecdaee10 Merge "Prevent androidmk crash on art/tools/ahat/Android.mk" am: 5c617cc6d1 am: a7c5d2fe8b am: 74da17a73a
am: 6c2c726eb9

Change-Id: I7ad6aa102a9a9b5da67962443bb0958e5df6a25f
2017-10-19 23:54:16 +00:00
Colin Cross
f553b857b9 Merge "Add property to prevent dex preopting" am: 38cd9a4ec7 am: 481fe49254
am: 1ae35f3a00

Change-Id: I5ddf961f3ba23e4ce76ad9a378e4e338eddbca05
2017-10-19 23:33:10 +00:00
Colin Cross
0354cfef2f Merge changes If00e16bd,Id5b2ec3f am: 16792167ad am: 8de6ca542e
am: 873b249648

Change-Id: I6a910cc1f16609ca7ea21167e30fd6c8c8c9fd42
2017-10-19 23:32:40 +00:00
Jeff Gaston
6c2c726eb9 Merge "Prevent androidmk crash on art/tools/ahat/Android.mk" am: 5c617cc6d1 am: a7c5d2fe8b
am: 74da17a73a

Change-Id: I33165c94df396acb4a1248a458ec2c841b33de89
2017-10-19 23:32:14 +00:00
Alan Leung
1d476fcbeb Add D8 support
Bug: 67754178
Test: m -j32 checkbuild && USE_D8=true m -j32 checkbuild

Change-Id: If63afc10ceb5e753bbb7f195bb8a895eaef10775
2017-10-19 16:27:42 -07:00
Colin Cross
1ae35f3a00 Merge "Add property to prevent dex preopting" am: 38cd9a4ec7
am: 481fe49254

Change-Id: I1375099a3393667e1942cc7384dbc3b1cb0651fd
2017-10-19 23:21:46 +00:00
Colin Cross
873b249648 Merge changes If00e16bd,Id5b2ec3f am: 16792167ad
am: 8de6ca542e

Change-Id: I288edac9d399ea76a624ae16d3e57fe5690abfb6
2017-10-19 23:21:21 +00:00
Jeff Gaston
74da17a73a Merge "Prevent androidmk crash on art/tools/ahat/Android.mk" am: 5c617cc6d1
am: a7c5d2fe8b

Change-Id: Ib68a7a56a5800bca0c1cae0c1bc3ee55d36b02ad
2017-10-19 23:20:49 +00:00
Colin Cross
481fe49254 Merge "Add property to prevent dex preopting"
am: 38cd9a4ec7

Change-Id: I646bb402a703e45206b9a8720285847571b16cc0
2017-10-19 23:16:30 +00:00
Colin Cross
8de6ca542e Merge changes If00e16bd,Id5b2ec3f
am: 16792167ad

Change-Id: Ibf9c879fc33ee0db6d0a754785ec84de522821c2
2017-10-19 23:16:10 +00:00
Jeff Gaston
a7c5d2fe8b Merge "Prevent androidmk crash on art/tools/ahat/Android.mk"
am: 5c617cc6d1

Change-Id: I0f9888b622c80183087972936476f9818198c2de
2017-10-19 23:15:40 +00:00
Colin Cross
38cd9a4ec7 Merge "Add property to prevent dex preopting" 2017-10-19 23:01:02 +00:00
Yabin Cui
6be405ef69 Support tsan in Android.bp.
Bug: http://b/25392375
Test: build a unit test with tsan.

Change-Id: Ifbd30e41e3a9558a8f106750c2a08778db5d5c81
2017-10-19 15:53:02 -07:00
Treehugger Robot
16792167ad Merge changes If00e16bd,Id5b2ec3f
* changes:
  Move all jar intermediates to subdirs
  Use full relative paths to get module outputs in tests
2017-10-19 22:37:26 +00:00
Treehugger Robot
5c617cc6d1 Merge "Prevent androidmk crash on art/tools/ahat/Android.mk" 2017-10-19 22:16:09 +00:00
Colin Cross
a22116e2d9 Add property to prevent dex preopting
Add dex_preopt property and pass it through to make as
LOCAL_DEX_PREOPT.

Test: m checkbuild
Change-Id: I6f19d097d1769068b7e4093f011574c540c137f3
2017-10-19 14:26:32 -07:00
Colin Cross
1ee2317555 Move all jar intermediates to subdirs
Make all the jar intermediates called modulename.jar, and put each
in a subdir for the tool that generated it.  This will simplify
using the jars as inputs to genrules and resources.

Test: java_test.go
Change-Id: If00e16bd7df5a4ba24ebc4b68c9ccf2cfda49544
2017-10-19 20:45:11 +00:00
Colin Cross
702e0f8ab0 Use full relative paths to get module outputs in tests
Make Rel() on ModuleOutPath and ModuleGenPath return the path
relative to the module out and module gen directories respectively,
and make TestingModule.Output() match against the full relative
path to the module.

Test: java_test.go still passes
Change-Id: Id5b2ec3fdef41d4169b943e68d032fc64a2b6f92
2017-10-19 20:44:11 +00:00
Jeff Gaston
af7d3ef81d Prevent androidmk crash on art/tools/ahat/Android.mk
Because a directive can exist within a rule's recipe,
there may not exist an ordering of nodes such that
nodes[i].End() <= nodes[i+1].Start()

This disables that assertion.

Test: androidmk art/tools/ahat/Android.mk
Bug: 67906386

Change-Id: I84ea6ebdbc01c1600b1fa188463aae56270f0135
2017-10-19 13:22:56 -07:00
Jeff Gaston
44db6d8dad split soong_zip into a library and a binary am: 11b5c51d4e am: b0a5b0d331 am: e867c0834d
am: 7fb4e10f09

Change-Id: Ib433bec577366656dec530f7ec8d6d3068b0ad5d
2017-10-19 18:56:05 +00:00
Jeff Gaston
7fb4e10f09 split soong_zip into a library and a binary am: 11b5c51d4e am: b0a5b0d331
am: e867c0834d

Change-Id: I438bed0cc8d507a3d7a3b3b7638ea737ee008fba
2017-10-19 18:45:13 +00:00
Jeff Gaston
e867c0834d split soong_zip into a library and a binary am: 11b5c51d4e
am: b0a5b0d331

Change-Id: I6f2b2fc2d2752ee60015477ef168dd6860f4369b
2017-10-19 18:36:57 +00:00
Jeff Gaston
b0a5b0d331 split soong_zip into a library and a binary
am: 11b5c51d4e

Change-Id: Idfd3be84260cd6873a41acb5cbb61eea5a660566
2017-10-19 18:34:54 +00:00
Jeff Gaston
11b5c51d4e split soong_zip into a library and a binary
to make it faster/easier to invoke from other Go programs
(such as multiproduct_kati)

Bug: 67478260
Test: m -j
Change-Id: Idd2671a44290550197c88f53dd11a6dd39c85cc5
2017-10-19 18:18:04 +00:00
Jiyong Park
d08b697828 Allow macro definition with space
cflags: ["-DMACRO=\" definition \""] should not be rejected.

Bug: 66914194
Test: TestCompilerFlags in cc_test.go

Change-Id: I7f96505a83898616415ef1fb7e13596b56a063f3
2017-10-19 22:39:32 +09:00