Commit graph

5984 commits

Author SHA1 Message Date
Colin Cross
114db0a93f Merge "Split logtags implementations for cc and java" am: e304cc4575 am: b18d19f9ba
am: 40e8b3dc40

Change-Id: Iadaeec9973069815bb116be3b7f6e6180a8a9025
2017-12-08 16:43:42 +00:00
Colin Cross
40e8b3dc40 Merge "Split logtags implementations for cc and java" am: e304cc4575
am: b18d19f9ba

Change-Id: I56c057251d4132915b40a19b5ae7ebbff8e89b59
2017-12-08 16:32:07 +00:00
Colin Cross
b18d19f9ba Merge "Split logtags implementations for cc and java"
am: e304cc4575

Change-Id: Ic762d1037b8f4684837b27845a27d9ef7035882c
2017-12-08 16:23:44 +00:00
Colin Cross
e304cc4575 Merge "Split logtags implementations for cc and java" 2017-12-08 16:14:06 +00:00
Jeff Gaston
4c7208e77c Search for files named Blueprints only under build/blueprint am: 29e959dd7f am: bb32175b1c
am: 0d97869080

Change-Id: Ib73aa5309a2e20a5c3638afe0449e12e5fff3b07
2017-12-08 05:02:16 +00:00
Jeff Gaston
0d97869080 Search for files named Blueprints only under build/blueprint am: 29e959dd7f
am: bb32175b1c

Change-Id: Ib4ca02150e23f9d02e7816265053f9ebed85e77c
2017-12-08 03:47:22 +00:00
Jeff Gaston
bb32175b1c Search for files named Blueprints only under build/blueprint
am: 29e959dd7f

Change-Id: Ic457cf6a287267e4477a8d9e0616970920c798d1
2017-12-08 03:43:26 +00:00
Chih-hung Hsieh
29499fcf68 Merge "Remove 6 directories from WarningAllowed*Projects." am: 4b9bb14dd2 am: fcf1e5795d
am: 611a50668f

Change-Id: If75baf84695522fefce8a4fde7e1a265575e6c02
2017-12-08 01:07:45 +00:00
Nan Zhang
c6fe490827 Merge "Add HostToolPath() for Python binary" am: b973cd152e am: 51b6d4f6cf
am: 60f456729d

Change-Id: Ibf505393238076db579c33d3a33944c136d9ee9a
2017-12-08 01:07:24 +00:00
Colin Cross
4c2977f8be Merge changes from topic "soong_dexpreopt" am: 9e094ebe1d am: ccb900af00
am: d0bc0dcb68

Change-Id: Ia0d14e27fc9dada7ca6777707d21fff86d4865ca
2017-12-08 01:05:43 +00:00
Colin Cross
5beccee92c Split logtags implementations for cc and java
Logtags files in cc and java are treated fundamentally differently.
In cc, they are not used for compiling at all, but need to be passed
to Make to be combined into the global logtags list, and logtag files
are listed in a logtags property.  In java they are listed in srcs
and produce generated code that is compiled in, and so shouldn't
also need to be listed in a logtags property.

Move the logtags property to cc and export it to Make from there,
and have java extract logtags files from srcs to be exported to
Make.

Test: m checkbuild
Change-Id: I31d49289efe72db60d2f33566df771b4a3ebc8a0
2017-12-07 15:32:30 -08:00
Jeff Gaston
29e959dd7f Search for files named Blueprints only under build/blueprint
to enable other subprojects to use their own instance of
Blueprint in other directories.

Files named Android.bp are still autodetected throughout the
tree like previously.

Bug: 64363847
Test: mkdir -p subdir \
      && echo "syntax error" > Blueprints \
      && m -j nothing

Test: build/soong/scripts/diff_build_graphs.sh \
      --products=aosp_arm \
      'build/soong:work^' 'build/soong:work'

Change-Id: I8199f12b68dc1699bf44682b86169def37b53a5e
2017-12-07 13:00:51 -08:00
Chih-hung Hsieh
611a50668f Merge "Remove 6 directories from WarningAllowed*Projects." am: 4b9bb14dd2
am: fcf1e5795d

Change-Id: I4aa82aefa685c3f93c232c43db6d461fb8142797
2017-12-07 18:52:54 +00:00
Chih-hung Hsieh
fcf1e5795d Merge "Remove 6 directories from WarningAllowed*Projects."
am: 4b9bb14dd2

Change-Id: If360584877eeff3048f98a4473c8bcbd9e2764e6
2017-12-07 18:49:01 +00:00
Chih-hung Hsieh
4b9bb14dd2 Merge "Remove 6 directories from WarningAllowed*Projects." 2017-12-07 17:02:15 +00:00
Nan Zhang
60f456729d Merge "Add HostToolPath() for Python binary" am: b973cd152e
am: 51b6d4f6cf

Change-Id: If4406af343a3e294a6f3c1d95740d5c55be697a0
2017-12-07 08:53:26 +00:00
Colin Cross
d0bc0dcb68 Merge changes from topic "soong_dexpreopt" am: 9e094ebe1d
am: ccb900af00

Change-Id: I3ac2830c2ca266e2729c80c8693bb2985b22bca3
2017-12-07 08:51:15 +00:00
Nan Zhang
51b6d4f6cf Merge "Add HostToolPath() for Python binary"
am: b973cd152e

Change-Id: I07dd477a9eb465063a3f0bd3521c626381cf706f
2017-12-07 06:49:11 +00:00
Colin Cross
ccb900af00 Merge changes from topic "soong_dexpreopt"
am: 9e094ebe1d

Change-Id: I24b4147e5108c43c2c4824db1187ee53deb796df
2017-12-07 06:40:20 +00:00
Treehugger Robot
b973cd152e Merge "Add HostToolPath() for Python binary" 2017-12-07 00:43:51 +00:00
Chih-Hung Hsieh
b47ac038e8 Remove 6 directories from WarningAllowed*Projects.
Test: normal build
Change-Id: I44381a2a7994d9f74329b0516d2bb303b5866a66
2017-12-07 00:12:35 +00:00
Alan Viverette
86984a6a29 Merge "Update pom2mk to allow duplicate module names if rewritten" am: fd2005fc19 am: edc073f046
am: 3c4a75c6c3

Change-Id: Ia7e55b1ec53f1ecea50b8eba634b64b25e92e414
2017-12-06 23:40:52 +00:00
Colin Cross
9e094ebe1d Merge changes from topic "soong_dexpreopt"
* changes:
  Add more dex_preopt properties
  Run gofmt -w
2017-12-06 23:32:36 +00:00
Nan Zhang
b8bdacfd0b Add HostToolPath() for Python binary
So in the genrule, Python binary module can be used as tool.

Test: manually write a test genrule.
Change-Id: Idfd3af4c1002dd608e1bdffa203e01c802f1bf21
2017-12-06 15:13:10 -08:00
Alan Viverette
3c4a75c6c3 Merge "Update pom2mk to allow duplicate module names if rewritten" am: fd2005fc19
am: edc073f046

Change-Id: Iadf0408ef056ce488bab017ec3c5ed2ea4ec2422
2017-12-06 22:43:07 +00:00
Alan Viverette
edc073f046 Merge "Update pom2mk to allow duplicate module names if rewritten"
am: fd2005fc19

Change-Id: I7111b44e611579ff2d91110452c8f96bb00b0842
2017-12-06 22:05:45 +00:00
Treehugger Robot
fd2005fc19 Merge "Update pom2mk to allow duplicate module names if rewritten" 2017-12-06 21:39:46 +00:00
Colin Cross
1bd8780881 Add more dex_preopt properties
Move dex_preopt to dex_preopt.enabled, and add dex_preopt.app_image,
dex_preopt.profile_guided, and dex_preopt.profile.  These values will
be passed back to Make if provided to control dex preopting.

Test: m checkbuild
Change-Id: I54a4b1de697a08be20ab65d2a5dc43ce0046692d
2017-12-06 13:27:56 -08:00
Colin Cross
7a6fcbe302 Run gofmt -w
Test: none
Change-Id: I2b503e06a4ae8e72a08f6bfb64692dfd33e2b7e2
2017-12-06 13:19:14 -08:00
Tobias Thierer
8bd31ca2a2 Merge "Revert "Default to building with OpenJDK 9 -target 1.8."" am: c7efdd9b36 am: 38f7173524
am: c249101b08

Change-Id: If49432cc429fd03a218f8131c3001c0ad839ca12
2017-12-06 14:18:41 +00:00
Tobias Thierer
c249101b08 Merge "Revert "Default to building with OpenJDK 9 -target 1.8."" am: c7efdd9b36
am: 38f7173524

Change-Id: I094fac5681019d8eac1c47376dc0f51a84fbd09e
2017-12-06 14:13:25 +00:00
Tobias Thierer
38f7173524 Merge "Revert "Default to building with OpenJDK 9 -target 1.8.""
am: c7efdd9b36

Change-Id: Icdbace15dcd4cc5f337b575e98db6265fdf967f2
2017-12-06 14:09:41 +00:00
Tobias Thierer
c7efdd9b36 Merge "Revert "Default to building with OpenJDK 9 -target 1.8."" 2017-12-06 14:00:47 +00:00
Tobias Thierer
db10b13533 Merge "Build with OpenJDK 9 -target 1.8 by default except for errorprone." am: cf8d83de82 am: 51512a1848
am: bbc4897b9e

Change-Id: Ib9b80d89fc488ddf7c3d380aa944b1bcc070fe7c
2017-12-06 11:22:03 +00:00
Tobias Thierer
bbc4897b9e Merge "Build with OpenJDK 9 -target 1.8 by default except for errorprone." am: cf8d83de82
am: 51512a1848

Change-Id: I5fc60e8f2347c11147d053dc971d85f2fd6630ae
2017-12-06 11:16:21 +00:00
Tobias Thierer
51512a1848 Merge "Build with OpenJDK 9 -target 1.8 by default except for errorprone."
am: cf8d83de82

Change-Id: Ibe7792469a125f78ef98240f63f2d08047d0e4f1
2017-12-06 11:09:46 +00:00
Tobias Thierer
cf8d83de82 Merge "Build with OpenJDK 9 -target 1.8 by default except for errorprone." 2017-12-06 11:05:31 +00:00
Colin Cross
a489390d5e Split java_binary modules into common and binary variants am: 6b4a32d771 am: 21fafc6298
am: 957ba7455c

Change-Id: I00f8b4ce743ea60a078395293cb3fff0e30fb8ad
2017-12-06 04:32:34 +00:00
Colin Cross
6d790918de Make (Source|Output)Path.Join("foo").Rel() return "foo" am: 0db5568612 am: a244a33418
am: 510005cb28

Change-Id: I5f15d7e5948935d0d09abc2ae2b5a82788c9aa09
2017-12-06 04:32:30 +00:00
Colin Cross
957ba7455c Split java_binary modules into common and binary variants am: 6b4a32d771
am: 21fafc6298

Change-Id: I18b7cabfbf41035e0dc11aae6057eefdf80adc11
2017-12-06 04:30:02 +00:00
Colin Cross
510005cb28 Make (Source|Output)Path.Join("foo").Rel() return "foo" am: 0db5568612
am: a244a33418

Change-Id: I4c73891604cfe99b39ed93b613922f7bc5b5f4b3
2017-12-06 04:29:59 +00:00
Colin Cross
21fafc6298 Split java_binary modules into common and binary variants
am: 6b4a32d771

Change-Id: I6da3e0b26b39e079769dbaed65903416f9fa1ebb
2017-12-06 04:27:01 +00:00
Colin Cross
a244a33418 Make (Source|Output)Path.Join("foo").Rel() return "foo"
am: 0db5568612

Change-Id: I6a19550ef017532b2623491938ff000a0e31ac29
2017-12-06 04:26:59 +00:00
Colin Cross
f6683a5e8a Add java_genrules to use jars as inputs and outputs am: 5425090a4f am: ac07312f15
am: 69d06f8c9b

Change-Id: Ia1a6e40816d6f9ed50243213e1969668e6759e93
2017-12-06 04:18:32 +00:00
Colin Cross
9dea654334 Make TestModule.Output print a list of all outputs on error am: 9cf27db425 am: 799ed60b06
am: b1e8caba31

Change-Id: I025adfc4aabe955e3fbfca51c4198e262549b960
2017-12-06 04:18:28 +00:00
Colin Cross
6b4a32d771 Split java_binary modules into common and binary variants
Add a common_first multilib type and use it for java.Binary
so that the java part is compiled as a "common" arch type
but the wrapper script is installed as a "linux_glibc" arch
type.  This allows java_binary to be used as a tool dependency
for a genrule.

Bug: 68397812
Test: TestJavaBinary
Change-Id: I809060839ce8878300da3fb76426ceb1ea6b0e8e
2017-12-06 04:16:21 +00:00
Colin Cross
0db5568612 Make (Source|Output)Path.Join("foo").Rel() return "foo"
This allows TestModule.Output("foo") to be used to find
a file called "foo" that was installed using ctx.InstallFile.

Test: soong tests
Change-Id: I04833c9ee8ac5baa6b6afd35715d1191c1622a78
2017-12-06 04:16:00 +00:00
Colin Cross
69d06f8c9b Add java_genrules to use jars as inputs and outputs am: 5425090a4f
am: ac07312f15

Change-Id: I6832e9c9df0e05c1199aa02da7f97f562d880453
2017-12-06 04:04:00 +00:00
Colin Cross
b1e8caba31 Make TestModule.Output print a list of all outputs on error am: 9cf27db425
am: 799ed60b06

Change-Id: I6c1d89049b517493b8780f05b96b1e2a7e8dec1c
2017-12-06 04:03:57 +00:00
Colin Cross
ac07312f15 Add java_genrules to use jars as inputs and outputs
am: 5425090a4f

Change-Id: I0b6f3b8f04bb5ced5df7b9a985ed5298e8ba2e1e
2017-12-06 04:01:28 +00:00