Commit Graph

768 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Colin Cross
73a365f983 Merge changes I31ea4954,Ia02f8160,I5cfea62e,If484e9eb am: 78d5ea8e9b
am: 10b24dba79

Change-Id: I331a9835e5ed731f0424e4624a15635f2c367c7c
2018-03-07 22:45:34 +00:00
Colin Cross
7874138a8a Allow soong java libraries to include exported resources and proguard flags
Test: m checkbuild
Change-Id: Ia02f816084d0eb1c0e0f20e1ecd57aaf3778874c
2018-03-07 09:48:33 -08:00
Alan Viverette
53f6b2a80b Move Support Library dependencies to their own var with resolution
Bug: 73250914
Test: make checkbuild
Change-Id: Ibdbe2fd140133202b266ca4f233c4d42292fa3df
2018-03-01 16:12:31 +00:00
Nan Zhang
08dc62dd09 Merge "Export Make config vars to Soong to support Droiddoc" am: 5d7ec6bdf8 am: 7edfe29e8f
am: b335c4a4f3

Change-Id: I9ebf18cf05571c4d5cf31c41fb5f60114a375480
2018-02-22 23:25:08 +00:00
Treehugger Robot
5d7ec6bdf8 Merge "Export Make config vars to Soong to support Droiddoc" 2018-02-22 22:11:07 +00:00
hansson
1b7700340c Merge "Add support for LOCAL_PRIVATE_PLATFORM_APIS." am: 3c76d02668 am: ab8f5d74f2
am: 1f903cce0c

Change-Id: I6558665d9488b462fd00ad89a570817f0a03c23d
2018-02-22 12:03:30 +00:00
Anton Hansson
7ff32d2734 Add support for LOCAL_PRIVATE_PLATFORM_APIS.
The only enforcement right now is that modules don't specify both
LOCAL_SDK_VERSION and LOCAL_PRIVATE_PLATFORM_APIS, but a warning
can be turned on by setting the JAVA_SDK_ENFORCEMENT_WARNING variable.

Bug: 73535841
Test: make w/ and wo/ flag.
Change-Id: I3cc720bf060e2bc789e10884ff888d527b91cb50
2018-02-21 18:10:59 +00:00
Jeff Gaston
d2ba724f7f Add rule to enable running Jetifier within Make against Java modules
The only case where we expect to actually enable this behavior is for
modules that are just an unpacking of a prebuilt, because those are
the only cases for which we can't conveniently just change the source

Bug: 72552006
Test: ./build/soong/scripts/diff_build_graphs.sh \
      --products=aosp_arm 'build/make:work^' \
      'build/make:work'
Test: cherry-pick the following patch that depends on this one and
      the rest of that patch's topic, and then do `m -j jeffapp`

Change-Id: I62e231900d6d87673ddf19c7fc2686fef2828590
2018-02-20 22:25:23 +00:00
Nan Zhang
cf9d50302a Export Make config vars to Soong to support Droiddoc
export Android.mk config vars to Soong, and export stubs.jar to Make
after compiling Droiddoc from Soong.

Bug: b/70351683
Test: Convert libcore docs Android.mk to Soong manually.

Change-Id: I749b4b3e1e50abce8a757130987c18d7135a3859
2018-02-15 16:10:21 -08:00
Simran Basi
004a0a65d3 Merge "LOCAL_HOST_REQUIRED_MODULES support" am: 9ffbc10126 am: 79a2a1e889
am: 605ab4554a

Change-Id: I8fbe0440de103f1d2c539a39aabd5cad92fb717c
2018-02-07 02:43:01 +00:00
Treehugger Robot
9ffbc10126 Merge "LOCAL_HOST_REQUIRED_MODULES support" 2018-02-07 01:57:18 +00:00
Simran Basi
893098b06c LOCAL_HOST_REQUIRED_MODULES support
Allows target modules to directly request host modules they
require to be built and installed as well.

Bug: 72761631
Test: Added LOCAL_HOST_REQUIRED_MODULES to a target apk test and
      the host module was built.

Change-Id: I5aca11b3ba8b54676f068d337f1c9ba0e0b01997
2018-02-06 14:18:45 -08:00
James Lemieux
e61ffeb90b Merge "Clear local robolectric testing variables" am: 08ba09ed7f am: 815658efe9
am: 1e321d46a6

Change-Id: I9336f4ad9f47b437acaf09757a7820a7c23ff75f
2018-02-06 17:09:41 +00:00
James Lemieux
bb426739ce Clear local robolectric testing variables
This prevents them from mistakenly bleeding between test targets.

Bug: 72384841
Test: make Run_TeleService_robotests
Change-Id: Ie2c047be1450420f8e27b8b45e9416e96b477b45
2018-02-05 15:39:18 -08:00
Jaekyun Seok
d1b1d594a5 Merge "Support /product partition" am: 8fe7f9bfa2 am: 039e0991d5
am: f430ea5ebf

Change-Id: I91381c19408afc350ba7cecf2ca6daf0881f9abd
2018-01-25 04:16:57 +00:00
Jaekyun Seok
b7735d8105 Support /product partition
This CL adds the following build flags to support building product partition
from Android build system.
- BOARD_AVB_PRODUCT_ADD_HASHTREE_FOOTER_ARGS
- BOARD_AVB_PRODUCT_KEY_PATH
- BOARD_AVB_PRODUCT_ALGORITHM
- BOARD_AVB_PRODUCT_ROLLBACK_INDEX_LOCATION
- BOARD_PREBUILT_PRODUCTIMAGE
- BOARD_PRODUCTIMAGE_EXTFS_INODE_COUNT
- BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE
- BOARD_PRODUCTIMAGE_PARTITION_SIZE
- BOARD_PRODUCTIMAGE_SQUASHFS_BLOCK_SIZE
- BOARD_PRODUCTIMAGE_SQUASHFS_COMPRESSOR
- BOARD_PRODUCTIMAGE_SQUASHFS_COMPRESSOR_OPT
- BOARD_PRODUCTIMAGE_SQUASHFS_DISABLE_4K_ALIGN
- BOARD_USES_PRODUCTIMAGE
- LOCAL_PRODUCT_MODULE
- PRODUCT_FOOTER_ARGS
- PRODUCT_PRODUCT_BASE_FS_PATH
- PRODUCT_PRODUCT_VERITY_PARTITION
- TARGET_COPY_OUT_PRODUCT
- TARGET_OUT_PRODUCT*

And PRODUCT_PRODUCT_PROPERTIES is added to save product-specific
properties in /product/build.prop.

Bug: 64195575
Test: succeeded building product.img with BOARD_PRODUCTIMAGE_PARTITION_SIZE,
BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE and PRODUCT_PRODUCT_VERITY_PARTITION.

Change-Id: I774e6a38003734421591e51bed103802ff84f432
2018-01-25 09:33:58 +09:00
Tobias Thierer
1d160f630c Merge "Experimental feature: LOCAL_PATCH_MODULE option in .mk files." am: 4bb18a8a2e am: 38d784f152
am: 33130f97e3

Change-Id: Idb30848c98b01a4fec8c6afdaac56899fb0f8d5f
2018-01-22 11:48:35 +00:00
Tobias Thierer
4bb18a8a2e Merge "Experimental feature: LOCAL_PATCH_MODULE option in .mk files." 2018-01-22 11:34:18 +00:00
Dan Shi
eed57fcaab Merge "Add a flag to disable auto-generating test configs." am: 6704727b69 am: d100261cfb
am: d89ae3b0b9

Change-Id: Ibb97b6d6e3fdce1fec0cb89a9c75018d386ed2ab
2018-01-11 23:55:19 +00:00
Dan Shi
2035abfb8d Add a flag to disable auto-generating test configs.
Bug: 71714007
Test: m -j <module for *ts suite>
m -j NotificationStressTests
confirm NotificationStressTests.config generated

Change-Id: I372a227a07633ab8d335a8435baf5dd6081bb27e
2018-01-11 11:22:52 -08:00
Tobias Thierer
f795dcb767 Experimental feature: LOCAL_PATCH_MODULE option in .mk files.
Specifying this option causes the make target's sources
and classpath dependencies to be patched into the specified
module via --patch-module (if the build toolchain implements
the module system, ie. when targeting 1.9). This allows tests
to compile that have classes in packages under test.

Currently, only java.base is on the module path (everything
else is on the classpath), and only when using -target 1.9
(ie. EXPERIMENTAL_USE_OPENJDK9=true).

Bug: 71699916
Test: Treehugger
Test: Checked that I was able to compile some ojluni & icu
      test sources that had classes in (libcore) packages
      under test.

Change-Id: I044fb9d904754ed281f574ab3dd52235cf0d7fec
2018-01-11 01:13:13 +00:00
Colin Cross
c5a8c2ac83 Merge changes from topic "soong_r8" am: 8798bb70da am: c9f5afb07e
am: 08cf35feb9

Change-Id: I73a70ec6303b7210947e832ec3f767d33fa6bba2
2018-01-04 00:27:19 +00:00
Colin Cross
57d291ecca Merge "Remove LOCAL_PROGUARD_ENABLED := nosystem" am: 2c2cb33830 am: d61a376ec4
am: b9f8265d08

Change-Id: Ifcc17a929f3218fe4052e648d8677ba9e5d471f3
2018-01-03 22:35:57 +00:00
Colin Cross
5e0986cb51 Add R8 support to Soong.
Move R8_COMPAT_PROGUARD definition to Soong.
Copy the proguard_dictionary file so that the find
command that builds proguard_dict.zip can find it.

Test: m checkbuild
Change-Id: I28b2fce26ccb6225be0bd71802a43fe63df85daa
2018-01-03 14:21:35 -08:00
Colin Cross
e616f34431 Remove LOCAL_PROGUARD_ENABLED := nosystem
None of the system options are controversial, and there are no
longer any users of nosystem, so remove it.

Test: m checkbuild
Change-Id: Id1b946d83688d266ca2942c02c97e8b404c3755b
2018-01-02 13:18:04 -08:00
Zach Riggle
80b7659db7 Merge "Add support for honggfuzz to BUILD_FUZZ_TEST" 2017-12-28 19:07:36 +00:00
Dan Willemsen
1d64623105 Export proguard flags from static android libraries and aar prebuilts
Test: m Contacts, classes-proguard.jar has same contents
Test: rm -rf out; tapas Contacts; m
Change-Id: Id7a92fb2c44913bccbfcbeae127355b4de588e4d
Merged-In: Id7a92fb2c44913bccbfcbeae127355b4de588e4d
(cherry picked from commit 1417c177ac)
2017-12-28 17:22:19 +00:00
Zach Riggle
6319deed41 Add support for honggfuzz to BUILD_FUZZ_TEST
Change-Id: I38f70d1a57649635be95c59187da05ba22fcf687
2017-12-27 22:08:27 +00:00
Colin Cross
d19ebde198 Merge "Export app implementation and header jars" am: 1ea9c644c8 am: e0beddc068
am: 6a825da3d9

Change-Id: I537f3db41b807b65d912050c205202378efd5c7e
2017-12-16 00:21:56 +00:00
Colin Cross
75a698b394 Export app implementation and header jars
Also fix a missing dependency on the jacoco-report-classes.jar

Test: m checkbuild
Change-Id: I67e924051e1029a409b82f2220811a27d5401db9
2017-12-15 13:41:24 -08:00
Dan Shi
d5424cfa3d Merge "Add build script to generate TF test XML file with filters" am: 0765d53239 am: 515896c436
am: da1ba69776

Change-Id: I63aaeaede31b47a285173e4a48959600062ed226
2017-12-07 04:01:42 +00:00
Dan Shi
515896c436 Merge "Add build script to generate TF test XML file with filters"
am: 0765d53239

Change-Id: I8ef4cee13232182a01c1bdc0da6afaf9ddd49e01
2017-12-07 03:49:57 +00:00
Xin Li
5f03da0404 Merge "DO NOT MERGE: Merge Oreo MR1 into master" 2017-12-06 23:18:30 +00:00
Treehugger Robot
0765d53239 Merge "Add build script to generate TF test XML file with filters" 2017-12-06 22:51:43 +00:00
Colin Cross
e3eb03a537 Merge "Add support for RRO in soong app prebuilts" am: cd127ac860 am: 94b0dd3236
am: ab47fd0947

Change-Id: I897daa947223323981bf9b11436c6bd106f02081
2017-12-01 22:21:13 +00:00
Colin Cross
94b0dd3236 Merge "Add support for RRO in soong app prebuilts"
am: cd127ac860

Change-Id: I935b2f35e3642f2c8a4bf6f4e0b7ea8882df0bbc
2017-12-01 22:11:18 +00:00
Colin Cross
8c5ef24107 Add support for RRO in soong app prebuilts
Let soong pass overlay directories that were not used because
of enforced RROs and use the make rules to convert them to
the auto generated RRO package.

Bug: 69917341
Test: m checkbuild
Change-Id: I9db37e0bf65c19cef91428477713e3d7f1941b83
2017-11-30 20:22:12 -08:00
Colin Cross
90a25c97e0 Merge "Add support for jacoco in soong" am: 9798690282 am: 863dcf07d4
am: f58de03da6

Change-Id: I75e1aaa5080a7ccb2d8c8ff5cac9c6f4a7147e2f
2017-11-28 21:32:58 +00:00
Colin Cross
863dcf07d4 Merge "Add support for jacoco in soong"
am: 9798690282

Change-Id: I47534d7346e637aff019b10bfc395254c618d29c
2017-11-28 21:18:48 +00:00
Colin Cross
ee1d40d9f2 Merge "Add LOCAL_SRCJARS to clear_vars.mk" am: edd5f3810f am: 7ae502ff64
am: c6bbdc86dc

Change-Id: I2723a01758445c63d4ce77281d3d6efeb63c5523
2017-11-28 19:52:19 +00:00
Colin Cross
7ae502ff64 Merge "Add LOCAL_SRCJARS to clear_vars.mk"
am: edd5f3810f

Change-Id: I894b5d2f2ac84eef65e6fdcf22c968317d4072b2
2017-11-28 19:45:40 +00:00
Colin Cross
3fec81d978 Add support for jacoco in soong
Use jacoco values exported from soong and copy
jacoco-report-classes.jar to where the jacoco-report-classes-all.jar
rule can find it.

Bug: 69629238
Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true SKIP_BOOT_JARS_CHECK=true WITH_DEXPREOPT=false
Change-Id: If05381f415fb52a575746b8be0bfcd03d55b2153
2017-11-24 20:23:36 -08:00