Commit Graph

5825 Commits

Author SHA1 Message Date
Colin Cross
5b6484cac0 Strip module-info.class files when combining jars am: 7b60cdd6e5
am: 8010cbf6bb

Change-Id: I0a8d30f60fb65d82e541c5695d21509329e767c8
2017-12-22 06:19:24 +00:00
Colin Cross
8010cbf6bb Strip module-info.class files when combining jars
am: 7b60cdd6e5

Change-Id: I3385a72716142df0047f7f99bf3270808e7ae7e2
2017-12-22 06:16:52 +00:00
Colin Cross
970dda8b41 Remove --no-locals -> --release translation am: c5de1b6cb2
am: 4d9b7af491

Change-Id: I2e9886d7a42624b1e2e9e6175196a1161defe1be
2017-12-22 03:31:58 +00:00
Colin Cross
4d9b7af491 Remove --no-locals -> --release translation
am: c5de1b6cb2

Change-Id: I05bdbbee3fa9e18fbc376583f4bb9f68f46acf15
2017-12-22 03:29:27 +00:00
Colin Cross
7b60cdd6e5 Strip module-info.class files when combining jars
Combining static jars from dependencies may bring in module-info.class
files, which don't make sense once multiple modules have been combined,
and sometimes confuse downstream tools like desugar.  Strip them out
like make does when combining jars.

Test: m checkbuild
Change-Id: I560c5acfcc6e1be9adf604c22cf200581f92f702
2017-12-21 14:29:56 -08:00
Colin Cross
c5de1b6cb2 Remove --no-locals -> --release translation
--no-locals is never used any more, remove the translation.

Bug: 70886092
Test: m checkbuild
Change-Id: Ie89aaad618c12c288d7e7bca863834cf7ee824fb
2017-12-21 13:01:49 -08:00
dimitry
9aad0743b3 Merge "Ignore 'extern "C++"' section in a version script" am: cd406fa70b
am: 7edc7a525b

Change-Id: Ie2253313eef41d4ee33353acc974fc3d80ad3c41
2017-12-21 18:32:00 +00:00
dimitry
7edc7a525b Merge "Ignore 'extern "C++"' section in a version script"
am: cd406fa70b

Change-Id: Idacb70a08fd8cfb6e12ca296d4950a74d5045a70
2017-12-21 18:30:17 +00:00
Tobias Thierer
a397910014 Merge "Make ANDROID_JAVA{8,9}_HOME available to config.mk." am: 38501a959f
am: 21421c5faa

Change-Id: Ifa60fdf97e51504d365f2a875eeba771f415bcef
2017-12-21 18:00:14 +00:00
Jiyong Park
4500bca56d Merge "Add [soc|device|product]_specific" am: 95fba1a8f8
am: 0fffd6bca4

Change-Id: I1337d8b2b9a5e1802101ecc6d6e1ba50ded8f536
2017-12-21 17:59:03 +00:00
Colin Cross
6d7c1363b2 Fix jacoco filters am: d7deceb8fa
am: 4e914d70cd

Change-Id: Id3b88c654f1c47d2c6948f727aa33611a4b3749b
2017-12-21 17:58:38 +00:00
Colin Cross
b345fad1a9 Add jacoco filter tests am: 7a3139e05d
am: c99dbcbfd8

Change-Id: If7faeaeb4b4086a99934480d8c12f9fa1161e24e
2017-12-21 17:58:34 +00:00
Treehugger Robot
cd406fa70b Merge "Ignore 'extern "C++"' section in a version script" 2017-12-21 15:13:34 +00:00
Tobias Thierer
21421c5faa Merge "Make ANDROID_JAVA{8,9}_HOME available to config.mk."
am: 38501a959f

Change-Id: I1d711bec7da9943b8a7d070587669f9353d69a8b
2017-12-21 13:40:51 +00:00
Jiyong Park
0fffd6bca4 Merge "Add [soc|device|product]_specific"
am: 95fba1a8f8

Change-Id: I0b7ec832b7bdcf53e9fabad6bbd7a97d0cb77c5a
2017-12-21 13:39:42 +00:00
Colin Cross
4e914d70cd Fix jacoco filters
am: d7deceb8fa

Change-Id: Ia6e7171a7812796d323422c17c60fa26c95a53a0
2017-12-21 13:39:18 +00:00
Colin Cross
c99dbcbfd8 Add jacoco filter tests
am: 7a3139e05d

Change-Id: I76550d9f1f5fd9a038d91190c30b81e10a8d11b6
2017-12-21 13:39:14 +00:00
Tobias Thierer
38501a959f Merge "Make ANDROID_JAVA{8,9}_HOME available to config.mk." 2017-12-21 11:46:20 +00:00
Treehugger Robot
95fba1a8f8 Merge "Add [soc|device|product]_specific" 2017-12-21 09:02:20 +00:00
Nan Zhang
1657ba2dac Merge "Add -p, -e options in merge_zips for supporting par format." am: 828001d59d
am: eec578939b

Change-Id: I1fca5e6a17bfcddf9435b159b0a26d1a1e93e683
2017-12-21 06:17:23 +00:00
Pirama Arumuga Nainar
503e4228e2 Merge "Add 'openmp' compiler property" am: 91aa9f9d54
am: 29d92cef6d

Change-Id: Ia2a1186c2b793855a8fc2a9d74f76c6ec53c9b3c
2017-12-21 06:16:43 +00:00
Dan Albert
a66fa17a89 Merge "Update the NDK ARM ABI to armv7." am: 3b528a802d
am: 526800c76c

Change-Id: Ibe37dda591cec692a7760456255ca4c304de9467
2017-12-21 06:16:02 +00:00
Colin Cross
d7deceb8fa Fix jacoco filters
Add space after -x argument for jacoco excludes.
Add .class to end of file name for jacoco includes.

Bug: 64836607
Test: jacoco_test.go
Change-Id: I4c1024755882c976f7326f7382c4f2e99a20233d
2017-12-21 04:34:46 +00:00
Colin Cross
7a3139e05d Add jacoco filter tests
Add tests for converting jacoco filters to command line arguments
to soong_zip.

Bug: 64836607
Test: jacoco_test.go
Change-Id: I969fa877e4be19bb92dcab5a796a4e4ec3fc166a
2017-12-21 04:34:26 +00:00
Nan Zhang
eec578939b Merge "Add -p, -e options in merge_zips for supporting par format."
am: 828001d59d

Change-Id: Iafbf89032534bd759592a5b2b191150f9400d7b7
2017-12-21 03:44:29 +00:00
Pirama Arumuga Nainar
29d92cef6d Merge "Add 'openmp' compiler property"
am: 91aa9f9d54

Change-Id: I6edc27d9d49d5cd347702fd70fd93f6e9afdabea
2017-12-21 03:43:55 +00:00
Dan Albert
526800c76c Merge "Update the NDK ARM ABI to armv7."
am: 3b528a802d

Change-Id: I19f0d02cc6b81dd26889e41fed412723cc026918
2017-12-21 03:43:21 +00:00
Jiyong Park
2db7692a74 Add [soc|device|product]_specific
Added three properties (soc_specific, device_specific, and
product_specific) that shows what a module is specific to.

`soc_specific: true` means that the module is specific to an SoC
(System-On-a-Chip) and thus need to be installed to vendor partition.
This has the same meaning as the old `vendor: true` setting.

`device_specific: true` means that the module is specific to the entire
hardware configuration of a device includeing the SoC and off-chip
peripherals. These modules are installed to odm partition (or /vendor/odm
when odm partition does not exist).

`product_specific: true` means that the module is specific to the
software configuration of a product such as country, network operator,
etc. These modules are installed to oem partition (or /system/oem when
oem partition does not exist). These modules are assumed to be agnostic
to hardware, so this property can't be true when either soc_specific or
device_specific is set to true.

Bug: 68187740
Test: Build. path_tests amended.
Change-Id: I44ff055d87d53b0d2676758c506060de54cbffa0
2017-12-21 12:16:29 +09:00
Treehugger Robot
828001d59d Merge "Add -p, -e options in merge_zips for supporting par format." 2017-12-21 01:27:32 +00:00
Treehugger Robot
91aa9f9d54 Merge "Add 'openmp' compiler property" 2017-12-21 00:38:45 +00:00
Treehugger Robot
3b528a802d Merge "Update the NDK ARM ABI to armv7." 2017-12-21 00:37:29 +00:00
Tobias Thierer
e59aeff5c4 Make ANDROID_JAVA{8,9}_HOME available to config.mk.
Previously, these variables were exported only by makevars.go,
but those values are not available to config.mk. This CL adds
the variable to ui/build/config.go, which also makes it
available to config.mk.

Test: Treehugger
Bug: 70862583
Bug: 70521453
Change-Id: Ib54660e4b08ab751265b30004630cf1bb8c0041b
2017-12-20 23:14:37 +00:00
Dan Albert
d3c8ca4469 Update the NDK ARM ABI to armv7.
We don't support armv5 any more, and we can't build bionic as armv5.

Test: build/soong/scripts/build-ndk-prebuilts.sh
Bug: https://github.com/android-ndk/ndk/issues/272
Change-Id: I4026d48e7d5db78f6aa4e9796da1ec9cf10021ca
2017-12-20 14:48:39 -08:00
Nan Zhang
5925b0fda4 Add -p, -e options in merge_zips for supporting par format.
Move __init__.py files population to merge_zips, and add options: -p, and
-e. Since par needs entry_point.txt to search the program entry point, so
add -e option to support it.

Test: ./merge_zips -p -e entry_point.txt out in1.zip in2.zip
Bug: 70568913
Change-Id: Ida10faf125e1b94dffc98b30240db3b90fd75b25
2017-12-20 12:57:10 -08:00
Steven Moreland
9bbc5b65e1 Merge "Remove sepolicy_split from soong." am: 57603998a6
am: 3fac38f544

Change-Id: Ib39dccdb43588b5502d828a20cef247569fc0701
2017-12-20 19:24:22 +00:00
Steven Moreland
3fac38f544 Merge "Remove sepolicy_split from soong."
am: 57603998a6

Change-Id: Ic9d2bcfc4f02216b2824bc28f6da44d91f458f68
2017-12-20 19:15:33 +00:00
Treehugger Robot
57603998a6 Merge "Remove sepolicy_split from soong." 2017-12-20 19:10:32 +00:00
Pirama Arumuga Nainar
fadb7b511a Add 'openmp' compiler property
Bug: http://b/70692399

If a module has 'openmp: true', add '-fopenmp' to CFlags during any
compile step and pass the libomp runtime to the linker during any link
step.

Test: Build samples in http://aosp/572924
Change-Id: Ic2a6410ec69aae548edaf582ee41659b0058561e
2017-12-19 23:14:19 -08:00
Pirama Arumuga Nainar
37c922d9e9 Merge "Add compile-time pathDeps as implicit dependencies" am: 6f86613420
am: 3867026195

Change-Id: Ia0e4828d899702c709e8727f14aec1b57dadd7da
2017-12-20 04:12:23 +00:00
Pirama Arumuga Nainar
3867026195 Merge "Add compile-time pathDeps as implicit dependencies"
am: 6f86613420

Change-Id: Ib78d30affbd69b6af308e159d5db56dd026e1b59
2017-12-20 04:09:48 +00:00
Treehugger Robot
6f86613420 Merge "Add compile-time pathDeps as implicit dependencies" 2017-12-20 04:05:39 +00:00
Alan Leung
d420648b7b Merge "Prep D8 default instead of CompatDX in build/soong" am: 731c8dac6d
am: 3a3fff0368

Change-Id: I129b3c48f6a019a9dbaa9be37a0d7e13b2885cca
2017-12-20 02:10:13 +00:00
Alan Leung
3a3fff0368 Merge "Prep D8 default instead of CompatDX in build/soong"
am: 731c8dac6d

Change-Id: I5aad8b886b9619ffe33441392aee6510d33b521a
2017-12-20 02:05:01 +00:00
Alan Leung
731c8dac6d Merge "Prep D8 default instead of CompatDX in build/soong" 2017-12-20 02:00:45 +00:00
Colin Cross
b61e4e6e47 Merge "Ensure -I . is the first protoc argument" am: 32bf18b10a
am: 2d1b27c08b

Change-Id: I6da9687b746d808b25287f12d9913e1c8baa50e8
2017-12-20 00:47:35 +00:00
Colin Cross
2d1b27c08b Merge "Ensure -I . is the first protoc argument"
am: 32bf18b10a

Change-Id: If870b412d8b8f8cac0d9de57b355f53cb5e6f3ae
2017-12-20 00:45:34 +00:00
Treehugger Robot
32bf18b10a Merge "Ensure -I . is the first protoc argument" 2017-12-20 00:37:30 +00:00
Chih-Hung Hsieh
2644fe6ce2 Merge "Add default -Werror to hardware/libhardware/modules" am: 750e6fab06
am: c7a4d098ae

Change-Id: Ifc672be997cc30c56699055b544baff7177178fb
2017-12-20 00:17:31 +00:00
Chih-Hung Hsieh
c7a4d098ae Merge "Add default -Werror to hardware/libhardware/modules"
am: 750e6fab06

Change-Id: I90362712d5e1d643687a36b65379a651e78e919d
2017-12-20 00:15:01 +00:00
Treehugger Robot
750e6fab06 Merge "Add default -Werror to hardware/libhardware/modules" 2017-12-20 00:08:36 +00:00