Commit Graph

16065 Commits

Author SHA1 Message Date
Søren Gjesse
31f40492d4 Merge "Enable R8 by default (second attempt for Q)" am: d04f28db7b
am: 85ac8c6e39

Change-Id: Idd417f98756496811230fb7ee97f9193e76db00d
2018-03-19 08:01:10 +00:00
Søren Gjesse
85ac8c6e39 Merge "Enable R8 by default (second attempt for Q)"
am: d04f28db7b

Change-Id: Ib700a57f75ad3e7ce780faa0fcf74684aee59816
2018-03-19 07:51:47 +00:00
Søren Gjesse
d04f28db7b Merge "Enable R8 by default (second attempt for Q)" 2018-03-19 07:27:20 +00:00
Colin Cross
2430838b29 Merge "Update turbine command line flags" am: 1f4f67201d
am: 6951409ddb

Change-Id: I1e2c12cfec3408d214b61a5b2061df31c0243f62
2018-03-15 23:09:06 +00:00
Colin Cross
59881512af Merge "Allow compiles with only srcjars" am: f2a8007912
am: 57aa4b8f80

Change-Id: Icb321b88000c8e998f019ccbec7d1cc97d36eb78
2018-03-15 23:01:50 +00:00
Colin Cross
6951409ddb Merge "Update turbine command line flags"
am: 1f4f67201d

Change-Id: I6cf149dbd5986f030f85c1e339968ad345223217
2018-03-15 22:53:52 +00:00
Colin Cross
57aa4b8f80 Merge "Allow compiles with only srcjars"
am: f2a8007912

Change-Id: I6d5310c66cfe417007cf82a7571edbb98e358b74
2018-03-15 22:46:46 +00:00
Colin Cross
1f4f67201d Merge "Update turbine command line flags" 2018-03-15 22:39:28 +00:00
Colin Cross
0c0adb993c Allow compiles with only srcjars
Some javac and turbine compiles have no source files but sources
from srcjars.  Continue with compilation if the java source list
is empty but the srcjar source list is not.

Bug: 73885582
Test: m checkbuild
Change-Id: Ica412de2dd1b1bfc12c01c3eafca884220d42771
2018-03-15 13:07:33 -07:00
Colin Cross
6b27285619 Update turbine command line flags
The latest version of turbine requires a -- after the javac
options, and uses multiple --bootclasspath arguments instead
of a javac-style colon separated list.

Test: m javac-check
Bug: 74339924
Change-Id: I3f694ac375eab61954d4fe63c1166a18314bf75f
2018-03-15 06:04:53 +00:00
Colin Cross
a9aa74ca38 Merge changes I97ea3ff3,Ib4351a5b,I74b61809,If2653f84,I2932f9e9, ... am: 34af6a41ff
am: 3d8c0a2c9e

Change-Id: I310c37dd5ef95e94f64630194c9aed1effa4818e
2018-03-14 23:48:21 +00:00
Colin Cross
3d8c0a2c9e Merge changes I97ea3ff3,Ib4351a5b,I74b61809,If2653f84,I2932f9e9, ...
am: 34af6a41ff

Change-Id: I90487b3fed921af1571d1e87491a92e08fdd8050
2018-03-14 23:42:45 +00:00
Colin Cross
34af6a41ff Merge changes I97ea3ff3,Ib4351a5b,I74b61809,If2653f84,I2932f9e9, ...
* changes:
  Allow aapt2 rules to take zipped resource files
  Add LOCAL_SRCJARS support
  Remove unused .fs file suppport
  Remove unused file lists
  Remove sharding support from make
  Move aapt flags from java_common.mk to aapt_flags.mk
2018-03-14 23:29:49 +00:00
Adam Lesinski
9600655fac Merge "Enable apps to build with resource namespaces"
am: d3547d9d5b

Change-Id: I52e7d6c6c805123e0e0815a52854e848ea473ffe
2018-03-14 22:00:41 +00:00
Colin Cross
bc0c494d3a Allow aapt2 rules to take zipped resource files
Allow aapt2 rules to take zipped resource files similar to the
way the javac rules take srcjars.  For now, unzip the files using
extract_srcjars.sh, and then use aapt2 compile --dir.  Eventually
it could be done with aapt2 compile --zip.

Bug: 73885582
Bug: 74574557
Test: m checkbuild
Change-Id: I97ea3ff305e7a9ef2a908b4cf0bca903af62c6b1
2018-03-14 14:13:18 -07:00
Søren Gjesse
f71d68de18 Enable R8 by default (second attempt for Q)
Fixed bugs which was discovered in the last attempt.

Bug: 74508478

Test: m -j PRODUCT-taimen-userdebug
Test: m -j PRODUCT-elfin-userdebug
Test: Check that some .vdex files built have R8 generated code

(cherry picked from commit a3b796d998)

Change-Id: Ibe08137cd6db94b1fc487267e169d3f5ee598846
Merged-In: I2a8e0e5cad1d698ae73ba152e34a08a496112d7d
2018-03-14 22:09:10 +01:00
Treehugger Robot
d3547d9d5b Merge "Enable apps to build with resource namespaces" 2018-03-14 21:05:55 +00:00
Colin Cross
475475ca3a Merge "Allow locally disabling R8" am: 017a894c6e
am: 391a95da7e

Change-Id: I3c0a0d0eef90b3c824cce9c2e350714c0d00761f
2018-03-14 19:28:15 +00:00
Colin Cross
391a95da7e Merge "Allow locally disabling R8"
am: 017a894c6e

Change-Id: I8eb9e5ffaf1ca0a5de56ad92acc27490cf76c984
2018-03-14 19:21:09 +00:00
Colin Cross
11e2d55c0f Add LOCAL_SRCJARS support
Allow java modules to take jars containing .java files as an input.
For turbine, pass them directly to turbine.  For javac, extract them
to a directory and pass a list of the files to javac.

Bug: 73885582
Test: m checkbuild
Change-Id: Ib4351a5b4b165a55e5fb02ee2680466db368983a
2018-03-14 12:05:04 -07:00
Colin Cross
93d6550c53 Remove unused .fs file suppport
.fs files are obsolete.

Bug: 73885582
Test: m checkbuild
Change-Id: I74b618099333fe565c7b235994be64e6466d2da6
2018-03-14 12:05:01 -07:00
Colin Cross
c3e7074df1 Remove unused file lists
RS_FILES and AIDL_FILES were used for cleaning up the intermediate
src dir, but are no longer used after
If7529979de6fa62a651933a3a974f47b033851d6 and
I01feff7cc399ac5b88b83333a1ac86928d0a81e6.

Bug: 73885582
Test: m checkbuild
Change-Id: If2653f846b568fd2587c8e055ef820e17760f133
2018-03-14 12:04:58 -07:00
Colin Cross
5ef6e79c21 Remove sharding support from make
Sharding is not used in make any more, the large java modules
(libcore and framework) have moved to Soong.  Keeping sharding
support complicates java compiling, so remove it.

Bug: 73885582
Test: m checkbuild
Change-Id: I2932f9e96bfc8f2ebf82095b16d6c0b3c51613f0
2018-03-14 12:04:55 -07:00
Colin Cross
b6013af085 Move aapt flags from java_common.mk to aapt_flags.mk
The aapt flags were being set in java_common.mk, which is used by
various entry points.  host_dalvik_java_library.mk and
host_java_library.mk, and java_library.mk don't support aapt, only
package_internal.mk and static_java_library.mk do.  Move the aapt
flags into aapt_flags.mk, and include it from package_internal.mk
and static_java_library.mk.

Bug: 73885582
Test: no change to build-${TARGET_PRODUCT}.ninja
Change-Id: I124393846d37b9bbc941272cce4274121ac235ef
2018-03-14 12:04:35 -07:00
Adam Lesinski
960de8efcd Enable apps to build with resource namespaces
Setting LOCAL_AAPT_NAMESPACES := true enables
namespaces for an app and requires any library resources
to be fully qualified by their package.

Test: manual
Bug: 73885582
Change-Id: Ia6bfc82ee8b8d6335f8e7c2abe94ce36467a012d
Merged-In: Ia6bfc82ee8b8d6335f8e7c2abe94ce36467a012d
2018-03-14 12:04:01 -07:00
Colin Cross
5c66c2864a Allow locally disabling R8
Bug: 74746744
Test: m checkbuild
Change-Id: I5741f15821cf8de5df494ed8ad31d32a44657514
2018-03-14 17:00:23 +00:00
Julien Desprez
4e6987f9e6 Merge "Update the base autogenerated config template for instru" am: edf8fc4e51
am: f602e26e1d

Change-Id: If47ea726220844b32d4d56878f5a88d336745b52
2018-03-14 14:26:11 +00:00
Julien Desprez
f602e26e1d Merge "Update the base autogenerated config template for instru"
am: edf8fc4e51

Change-Id: I8307be4b0acebdc910762073b756fa4e442bb415
2018-03-14 14:19:35 +00:00
Martijn Coenen
16ab41d8ff Merge "Products launching with API 28 need 64-bit binder interface." into pi-dev
am: d027dfa39f

Change-Id: I259f69f1be9baeab32f45637a17f43dea3c1b728
2018-03-14 11:17:17 +00:00
Martijn Coenen
d027dfa39f Merge "Products launching with API 28 need 64-bit binder interface." into pi-dev 2018-03-14 11:05:19 +00:00
jdesprez
b8f85204a6 Update the base autogenerated config template for instru
For APCT auto-generated configuration, the template will
include the test-suite-tag that will allow it to be
picked up automatically.

Test: none
Bug: 74440293
Change-Id: Ia82e8287f212f4daec97523394517bfbbe7a86d3
2018-03-13 13:43:42 -07:00
Dan Willemsen
043098087d Merge "Remove obsolete BRILLO variable" am: a0c1cc97bd
am: 55a5475ec2

Change-Id: I3cb12da7a6c9a86e9d7d1d9f77481b5cc2030d73
2018-03-12 22:04:05 +00:00
Dan Willemsen
55a5475ec2 Merge "Remove obsolete BRILLO variable"
am: a0c1cc97bd

Change-Id: Ifa9ec91b5d3c425c1f9ed8773ccf92f8183e3449
2018-03-12 21:54:02 +00:00
Dan Willemsen
a0c1cc97bd Merge "Remove obsolete BRILLO variable" 2018-03-12 21:26:03 +00:00
Mathieu Chartier
94b0a48c8b Merge "Revert "Revert "For user and userdebug generate error if DEXPREOPT is not enabled""" into pi-dev
am: 1a50e975ae

Change-Id: I73e643ebd7e9ad4d7a1fa8c2528cb0c692c9a97b
2018-03-12 19:23:16 +00:00
Mathieu Chartier
1a50e975ae Merge "Revert "Revert "For user and userdebug generate error if DEXPREOPT is not enabled""" into pi-dev 2018-03-12 18:47:10 +00:00
Roland Levillain
8344d024f3 Merge "Revert "Remove art targets from PARSE_TIME_MAKE_GOALS"" into pi-dev 2018-03-12 12:41:53 +00:00
Dan Willemsen
19bd9b99ce Remove obsolete BRILLO variable
Test: none
Change-Id: Ia4474927709ccfa1ff76f5dda1d8aa13ef9d1004
2018-03-10 15:23:12 -08:00
Dan Willemsen
10cdd60b9f Merge "Fix xz with SANITIZE_HOST" am: b16a5b8d17
am: ad8b133476

Change-Id: Ibd3a9b4699e58fdb830a2ebed1db96b7e9802d85
2018-03-10 09:17:39 +00:00
Dan Willemsen
ad8b133476 Merge "Fix xz with SANITIZE_HOST"
am: b16a5b8d17

Change-Id: Ia87634d0e4ca8aefba556dd627bb62def9f6daa6
2018-03-10 09:11:58 +00:00
Dan Willemsen
6b3a8380cc Fix xz with SANITIZE_HOST
There isn't an Address Sanitizer prebuilt of xz, so always use the same
xz prebuilt.

Bug: 36130900
Test: SANITIZE_HOST=address m nothing; check ninja file
Test: m libc
Change-Id: Iba3599d4289ad5afb573dbec5ac8fc463668b1c6
2018-03-09 22:38:37 -08:00
Dan Willemsen
bc84ac12c7 Merge "Use xz prebuilt" am: 8e287901c3
am: 0a0181bb96

Change-Id: Ie81e1f1ee105263bce6c2ac4b132b9828b9d92c3
2018-03-10 03:12:05 +00:00
Dan Willemsen
0a0181bb96 Merge "Use xz prebuilt"
am: 8e287901c3

Change-Id: Ie63abd01335f2565581faf32f1c235b5d7f24892
2018-03-10 03:05:54 +00:00
Treehugger Robot
8e287901c3 Merge "Use xz prebuilt" 2018-03-10 03:00:29 +00:00
Mathieu Chartier
1f1335ceeb Revert "Revert "For user and userdebug generate error if DEXPREOPT is not enabled""
Fixed the failing targets.

Bug: 74209329
Test: make

This reverts commit 0ecba4b139.

Change-Id: I4f346b8107ffaf6afbd551d91574ed040372635e
2018-03-09 18:03:49 -08:00
Nan Zhang
debdbda27c Merge "Fix droiddoc variable name in clear_vars.mk" am: 6991c1a35d
am: 2bc83406a0

Change-Id: Ibb138cc393187038fd911fd3d6af3b2314cb1e27
2018-03-09 23:01:34 +00:00
Nan Zhang
2bc83406a0 Merge "Fix droiddoc variable name in clear_vars.mk"
am: 6991c1a35d

Change-Id: I5d5fc6958e65b69e35dafb47db746f7791cd836f
2018-03-09 22:55:58 +00:00
Dan Willemsen
893859573d Use xz prebuilt
Instead of whichever xz happens to be on the PATH.

Bug: 36130900
Test: m
Change-Id: Ib37d8db4e935ef8f69f3d43b5065c22d34028cf3
2018-03-09 12:56:01 -08:00
Nan Zhang
ccdecc7e02 Fix droiddoc variable name in clear_vars.mk
Test: m -j
Bug: b/70351683
Change-Id: I8cb4429a7e6bebde541a09f0328dddb937c0aced
2018-03-09 12:39:34 -08:00
Roland Levillain
e5372a1881 Revert "Remove art targets from PARSE_TIME_MAKE_GOALS"
This reverts commit 86a596c711.

Reverting as that commit breaks ART tests' results (see
b/73804944).

(cherry picked from commit 209b96e152)

Test: m test-art-host
Bug: 73804944
Bug: 26275726
Change-Id: I06af4b170d845d3e55e044c28ec22d4b3ca3dede
2018-03-09 14:33:41 +00:00