Commit Graph

14953 Commits

Author SHA1 Message Date
Matthew Maurer
186570d7fa Merge "Update to Rust 1.37.0" 2019-09-10 17:43:25 +00:00
Treehugger Robot
f59007cf23 Merge "Do not dedupe libprotobuf-cpp variants" 2019-09-10 00:30:36 +00:00
Matthew Maurer
43f697ec28 Update to Rust 1.37.0
Test: m crosvm.experimental
Bug: 140573584
Change-Id: I52d33b1ed4610536c89471e2052dea07b1b4ff8f
2019-09-09 16:17:33 -07:00
Treehugger Robot
f56e89f160 Merge "strip.sh: Fix argument to llvm-strip" 2019-09-09 22:06:56 +00:00
Yi Kong
23482a55ae Merge "Remove '-Wno-return-std-move-in-c++11' flag" 2019-09-09 18:48:23 +00:00
Yi Kong
751569192c Remove '-Wno-return-std-move-in-c++11' flag
This flag is no longer needed.

Test: presubmit
Change-Id: I9718ea1d448a6f598e6da61c3b30a0c9470d9c08
2019-09-09 18:48:15 +00:00
Vic Yang
7f438b1df3 Do not dedupe libprotobuf-cpp variants
The vendor variants of libprotobuf-cpp have their version numbers
included in their names, so the SONAME field is different.  Whitelist
the 'lite' and 'full' versions to have different core and vendor
variants.

Test: Build a device with TARGET_VNDK_USE_CORE_VARIANT set.
Change-Id: I9880a5d7172a9f35f304af8e7dcababdcbc2ca23
2019-09-09 10:54:50 -07:00
Colin Cross
6617b6d624 Merge "Use prebuilts for more tools in unbundled builds" 2019-09-09 17:21:44 +00:00
Treehugger Robot
ed329ceab1 Merge "CreateModule also inherits variableProperties." 2019-09-09 17:16:22 +00:00
Greg Kaiser
e106d8fd8c strip.sh: Fix argument to llvm-strip
We had a typo in the original checkin.  We need two hypens before
"remove-section" for llvm-strip, just like we have for strip.

Bug: 140721128
Test: Clean build of Go device
Change-Id: Ifb83dc4e6ad8f8070d9ced678f9147d6a040aee7
2019-09-09 09:55:07 -07:00
Justin Yun
1282f42ed6 Skip creating vendor variants for native_bridge modules
native_bridge modules may not have vendor variants because they are
used only for native_loader.

Bug: 140702618
Bug: 137709824
Test: lunch aosp_cf_x86_phone-userdebug && make
Change-Id: Ic9f4abff22597693e66eef520cd1101b5e8c8938
2019-09-09 09:54:03 +00:00
Inseob Kim
ee854c3226 Merge "Remove coverage variants of vndk_prebuilt_shared" 2019-09-09 09:50:34 +00:00
Inseob Kim
c9fa4a3247 Remove coverage variants of vndk_prebuilt_shared
vndk_prebuilt_shared is also one of prebuilt modules, so coverage
variants shouldn't be created.

Bug: 128524141
Test: m NATIVE_COVERAGE=true COVERAGE_PATHS=*
Change-Id: I586651c6775a6ae23dc0412ec5538eefd8e92dde
2019-09-09 10:54:05 +09:00
Justin Yun
7390ea3d79 Skip native_bridge modules when listing VNDK libs
native_bridge modules cannot be VNDK modules at the same time.

Bug: 137709824
Test: build cf_x86_64_phone
      check if llndk.libraries.*.txt has libclang_rt.asan for arm

Change-Id: I974e89b9da522e26531a576015e98dc54834282d
2019-09-08 11:34:06 +09:00
Elliott Hughes
2b9e20ef82 Merge "Use toybox md5sum instead of md5 on macOS." 2019-09-07 04:00:00 +00:00
Yi Kong
a4a8d9c115 Merge "Add back the llvm-ar P flag" 2019-09-07 03:41:42 +00:00
Steven Moreland
349cd474ef CreateModule also inherits variableProperties.
Bug: N/A
Test: manual
Change-Id: Ic5ecbeac04841d4016c0caa8710a6adae1ec2bd6
2019-09-06 18:28:58 -07:00
Ivan Lozano
de25291b6e Disable unsupported Rust targets.
Explicitly disable targets requiring unsupported toolchains when
processing Rust modules.

Bug: 140640858
Test: Darwin builds no longer breaking.
Change-Id: I8c60a2829508ae6de16bf347060818ca5c04f65e
2019-09-06 16:06:21 -07:00
Yi Kong
ee96a7956a Add back the llvm-ar P flag
The P flag is supported as of llvm r354044, add back the flag to reduce
the size of intermediate archieve files. This does not affect the final
binaries.

Test: built
Bug: 71618641
Change-Id: I017780e4dcaa31c7fbe10b5e7482db1bba83e716
2019-09-06 15:11:57 -07:00
Elliott Hughes
34b49d1402 Use toybox md5sum instead of md5 on macOS.
Test: builds locally
Change-Id: I04aa52de96e0525a44331cb0c057a8e18a95891d
2019-09-06 14:42:24 -07:00
Treehugger Robot
2895bf7182 Merge "Shard kythe invocations when javac is sharded" 2019-09-06 04:50:23 +00:00
Colin Cross
a758d6c881 Merge "Support boringssl hash injection on binaries and make it transitive" 2019-09-06 04:17:06 +00:00
Colin Cross
3b706fde7f Shard kythe invocations when javac is sharded
The kythe pipeline has trouble injesting all 6000 files of
framework.jar at once.  Shared invocations of the kythe extractor
when javac is sharded to produce multiple smaller kzip files.

Bug: 140426870
Test: no change to build.ninja
Test: m out/soong/.intermediates/frameworks/base/framework/android_common/framework0.kzip
Test: TestSharding in java_test.go
Change-Id: I867db4ef5cb1e7f3ce8359a46aac2c00ed8a8912
2019-09-05 16:49:11 -07:00
Treehugger Robot
5afe2d6869 Merge "Support including apk inside an apex" 2019-09-05 23:43:33 +00:00
Colin Cross
2ff22ae575 Merge "Bring back env flag to skip checkapi" 2019-09-05 22:55:33 +00:00
Colin Cross
d7227f99eb Support boringssl hash injection on binaries and make it transitive
Move handling the inject_bssl_hash property to a helper function,
and also treat it as set if any static libraries have it set.

Bug: 137267623
Test: m checkbuild
Change-Id: Icb12cfffb20797c807b410daffbf7fcccb1b1975
2019-09-05 15:30:05 -07:00
Elliott Hughes
c3233c291f Merge "Switch to toybox stat on macOS too." 2019-09-05 21:02:06 +00:00
Elliott Hughes
ef19e01f96 Switch to toybox stat on macOS too.
Bug: http://b/139450866
Test: builds
Change-Id: I97af607a311aea5f97544bd3ce1d532d999126ff
2019-09-05 10:01:37 -07:00
Xin Li
90aa0d9b30 DO NOT MERGE - Merge Android 10 into master
Bug: 139893257
Change-Id: I7c1b81ded862765968ef14d10ae76359e2972f27
2019-09-04 18:01:11 -07:00
Ivan Lozano
fc4d6ab32f Merge "Do not run Soong tests for Rust on non-Linux hosts."
am: 2be86f201c

Change-Id: Id7c02175c9e6ccb7a74d84e336c508fe4bc116b1
2019-09-04 14:07:14 -07:00
Treehugger Robot
2be86f201c Merge "Do not run Soong tests for Rust on non-Linux hosts." 2019-09-04 20:56:25 +00:00
Dan Willemsen
f80ef34c80 Merge "Rewrite depfile from sbox to stay reproducible"
am: e2ce551909

Change-Id: I2a51549dfb4419b9b6444d33104d35e655c82f4f
2019-09-04 12:38:05 -07:00
Dan Willemsen
e2ce551909 Merge "Rewrite depfile from sbox to stay reproducible" 2019-09-04 19:16:01 +00:00
Nikita Ioffe
8fbbdcd845 Use PathForModuleOutput instead of PathForPhony
am: 1acf6f9f6e

Change-Id: I39f05674e437f0c5e4c8ca28b295e78771f5840e
2019-09-04 08:23:28 -07:00
Nikita Ioffe
1acf6f9f6e Use PathForModuleOutput instead of PathForPhony
Later breaks some build flavours ¯\_(ツ)_/¯

Bug: 140467657
Test: soong_ui.bash --make-mode vts dist DIST_DIR=/tmp/dist-dir/ TARGET_PRODUCT=aosp_arm64 WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY=true BUILD_GOOGLE_VTS=true TARGET_BUILD_VARIANT=eng NATIVE_COVERAGE=true COVERAGE_PATHS="test/vts/hals/light" ENABLE_TREBLE=true
Change-Id: I0cb5754cb93551f2ed66d804f36019b037ccd871
2019-09-04 10:57:13 +00:00
Luca Stefani
d63ea0a98f Bring back env flag to skip checkapi
* This was removed while moving to soong

Change-Id: Ibb41838b891a8a7ede48e687e8da16f87ad0a57b
2019-09-04 12:20:15 +02:00
Sundong Ahn
e1f05aaf44 Support including apk inside an apex
New property "apps" is added to APEX soong module. This property
configure a list of APKs to package inside APEX payload. For each
android_app module package it's APK into /app/$(android_app module Name)
directory.

Bug: 139906763
Test: m -j
Change-Id: Ic6655f211951af08097c76e157a07ebc52425718
2019-09-04 12:10:00 +09:00
Yi Kong
6f326336f9 Merge "Create libgcc_stripped with llvm-objcopy"
am: e942e32f97

Change-Id: I5a445778632325f74bf52cb6cf1b1f446cdafcfa
2019-09-03 16:35:17 -07:00
Yi Kong
e942e32f97 Merge "Create libgcc_stripped with llvm-objcopy" 2019-09-03 23:12:02 +00:00
Yi Kong
38e5eacedc Merge "Re-enable tautological-unsigned-enum-zero-compare"
am: 47236f13fc

Change-Id: I4def4ff498f48dfff56709b1f8dd28fbe4fad408
2019-09-03 14:50:24 -07:00
Treehugger Robot
47236f13fc Merge "Re-enable tautological-unsigned-enum-zero-compare" 2019-09-03 21:29:54 +00:00
Ivan Lozano
c0083614f6 Do not run Soong tests for Rust on non-Linux hosts.
The Rust toolchain only supports Linux hosts, so skip Rust tests
that depend on host toolchains when building on other platforms.

Test: Tests still run on Linux hosts
Bug: 140435149
Change-Id: I298b52589ab5c6a7ec3acc4db1111596cd995d76
2019-09-03 13:57:36 -07:00
Yi Kong
a0119f8754 Create libgcc_stripped with llvm-objcopy
llvm-objcopy now implements '--regex' option, which allows it to replace
GNU objcopy for creating libgcc_stripped archieve.

Test: build
Bug: 131631155
Change-Id: Ie1733ac8e9b3765f7652a562406dcedb4735cc1a
2019-09-03 13:44:54 -07:00
Nikita Ioffe
9a7518779b Merge "apex.go: Add support for diffing content of APEX with whitelist file"
am: 3f3190fe4a

Change-Id: Ia4b86b97b5e16e5a3ae10e4f6231ee553ac2ac58
2019-09-03 08:20:07 -07:00
Nikita Ioffe
3f3190fe4a Merge "apex.go: Add support for diffing content of APEX with whitelist file" 2019-09-03 15:09:03 +00:00
Paul Duffin
7322b5271a Allow per test rules in neverallow_test.go
am: 115445b5d6

Change-Id: I6e7ce7fc42e2fbd186ed4e37fa362faf8cc30fac
2019-09-03 05:44:15 -07:00
Paul Duffin
db4fec9bfc [automerger skipped] Support multiple expected errors in neverallow_test.go
am: 91e3819335 -s ours
am skip reason: change_id Iafbadf12c6ffdc4d9128fcfe7f15792df5cfd020 with SHA1 b5af6204d3 is in history

Change-Id: Ib993eed4306417779861bcd2fa2a592e327dc1e5
2019-09-03 02:45:37 -07:00
Paul Duffin
115445b5d6 Allow per test rules in neverallow_test.go
Makes testing individual rules easier by allowing them to be specified
per test rather than having to add them to the global defaults.

Bug: 138428610
Test: m nothing
Change-Id: Ic65a55dee2a02b6d33254753c047295dd5804408
2019-09-03 10:33:29 +01:00
Paul Duffin
91e3819335 Support multiple expected errors in neverallow_test.go
Extracted some common code used by visibility_test.go and
neverallow_test.go into a new function CheckErrorsAgainstExpectations
in testing.go.

Bug: 138428610
Test: m nothing
Change-Id: I6996fa52968c387e38b4a67ffa59cd07c2d524e8
Merged-In: Iafbadf12c6ffdc4d9128fcfe7f15792df5cfd020
2019-09-03 10:33:29 +01:00
Nikita Ioffe
5d5ae761c5 apex.go: Add support for diffing content of APEX with whitelist file
So far a very basic version.

In case there is a diff, soong will emit an error message with a command
to resolve the diff. Example:

New unexpected files were added to com.android.apex.cts.shim.v3. To fix the build run following command:
system/apex/tools/update_whitelist.sh system/apex/shim/build/default_shim_whitelist.txt out/soong/.intermediates/system/apex/shim/build/com.android.apex.cts.shim.v3/android_common_com.android.apex.cts.shim.v3/com.android.apex.cts.shim.v3-content.txt

Test: m checkbuild
Bug: 139125405
Change-Id: I57e694f394c56105dc7363a684983605c7bf5e7d
2019-09-02 17:55:21 +01:00