Commit Graph

24926 Commits

Author SHA1 Message Date
Ramy Medhat 16f23a4038 Check UseRBE is set before replacing any template with the RE version.
Test: presubmit
Change-Id: I6df58b4e700f0d231367af2710672d731d20a736
2020-09-03 01:29:49 -04:00
Colin Cross 6deda0a39a Merge "Revert "Create os and arch variants for GoBinaryTool modules"" am: 02789ab327
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1419428

Change-Id: I3d563ce07c76ae3d0200be599f7576d4253b3bcd
2020-09-03 04:31:55 +00:00
Colin Cross 02789ab327 Merge "Revert "Create os and arch variants for GoBinaryTool modules"" 2020-09-03 03:46:26 +00:00
Colin Cross d4bdabcfad Revert "Create os and arch variants for GoBinaryTool modules"
This reverts commit 1ec1255476.

Reason for revert: b/167632665, broke linux_bionic builds.

Change-Id: I544fb5fd8aab06efa5618f076af3032271d4020f
2020-09-03 03:45:42 +00:00
Treehugger Robot cab67c0dff Merge "AutoGen: Support NativeTest with vendor namespace." am: 52ddbe25f9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1399147

Change-Id: I1d18daede7426969383666263a2a3aef27a5bc37
2020-09-03 03:07:06 +00:00
Treehugger Robot 52ddbe25f9 Merge "AutoGen: Support NativeTest with vendor namespace." 2020-09-03 02:26:11 +00:00
Colin Cross 90d0500699 Merge changes I59b7a32a,Ida7bc75a am: 0329f2398c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1406259

Change-Id: I9b2b709c59630394aa528c64b4fbe60b52d50be5
2020-09-03 00:21:49 +00:00
Colin Cross 0329f2398c Merge changes I59b7a32a,Ida7bc75a
* changes:
  Only request image and version variations for device SDK dependencies
  Create os and arch variants for GoBinaryTool modules
2020-09-02 23:51:53 +00:00
Bill Peckham 945441c09a Add exclude_from_vendor_snapshot property, related logic
When building a vendor snapshot, the general rule the
build system uses to select a module for inclusion into
the vendor snapshot is if it's a framework module.
However, there are cases where a partner may modify the
framework module, thereby assuming control of that
module.

This change adds the exclude_from_vendor_snapshot
property allowing the partner to mark a module that
would normally be included in the vendor snapshot for
exclusion. This module is then built from source when
building the vendor image against the vendor snapshot.

Bug: 165705527
Test: m nothing
Test: build partner code against vendor snapshot
Change-Id: I6c5c15f13eeeb8f29717a4abd84b65fa72096889
2020-09-02 22:27:45 +00:00
Xin Li 5fc64a124a Skip RP1A.200720.011
Bug: 167588565
Merged-In: Ib829749836c9683032ef97642b3ffa7a87bf47b9
Change-Id: Ib144077325877e04ce4cf3287dad7b3f985a21f3
2020-09-02 12:01:25 -07:00
Xin Li 03a3afda71 Mark RP1A.200720.001 as merged
Bug: 167588565
Merged-In: I6d013916d33618dab06447fbfd7ee0d9e2d09d7a
Change-Id: Ib6257e70d91d5f22362fc91642a020b35899f9b3
2020-09-02 11:44:48 -07:00
Pirama Arumuga Nainar fe1da75972 Revert "Revert "[pgo] Return updated Flags after adding flags for PGO/AFDO""
This reverts commit 988ff8d149.

Reason for revert: RBE can now handle PGO profiles during remote linking.

Bug: http://b/162702246

Test: m ANDROID_PGO_INSTRUMENT=hwui hwuimacro and check hwuimacro has
      PGO instrumentation.

Change-Id: I724b53dc086923beeb6f4b8903136545d18f4ece
2020-09-02 17:44:06 +00:00
Liz Kammer 4e7f2607ed Add imports_compile_dex to prebuilt_apis
Allows specifying compile_dex for java_import modules generated by
prebuilt_apis.

Bug: 160455085
Test: m sdk_public_current_android
Change-Id: Id316ba740577b2c9c0522368c01072864cda6cca
2020-09-02 09:27:35 -07:00
Anton Hansson 847ca7514e Merge "Change sdk_library child visibility semantics" am: 3652018b83
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1416192

Change-Id: I6d013916d33618dab06447fbfd7ee0d9e2d09d7a
2020-09-02 15:56:58 +00:00
Anton Hansson 0518ac8741 [automerger skipped] Merge "java_sdk_library: Add annotations_enabled property" am: e0b81e4472 -s ours
am skip reason: Change-Id I8b23a959ce33716dfc4572488a1fd3f6bab73a17 with SHA-1 2ce1e81b3e is in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1315815

Change-Id: Icbffb94c11128d5b41b65b5332051bd918d50a9c
2020-09-02 15:51:14 +00:00
markchien 2f59ec98d1 Include bpf program in APEXes
bpf program is put to an APEX via 'bpfs' property. It is
placed under etc/bpf directory in it.

Fix: 167530625
Test: m
Change-Id: Ia36b486f0cffb619ecc4f7a318cde881abc5baf4
2020-09-02 22:18:25 +08:00
Anton Hansson 3652018b83 Merge "Change sdk_library child visibility semantics" 2020-09-02 14:13:49 +00:00
Anton Hansson e0b81e4472 Merge "java_sdk_library: Add annotations_enabled property" 2020-09-02 11:36:35 +00:00
Paul Duffin e22c2ab14b java_sdk_library: Add annotations_enabled property
Passes it through to droidstubs.

Bug: 155164730
Test: m droid
Change-Id: I8b23a959ce33716dfc4572488a1fd3f6bab73a17
Merged-In: I8b23a959ce33716dfc4572488a1fd3f6bab73a17
(cherry picked from commit 2ce1e81b3e)
2020-09-02 11:30:54 +01:00
Chih-hung Hsieh fb8c1af8c8 Merge "Keep only out file dependency rule in output .d files" am: 21928dbbdd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1399827

Change-Id: Iaa67b6dff322c15248c576cf08090cae36ef714e
2020-09-02 06:59:26 +00:00
Jooyung Han 0bff3eed82 Merge "apex: support prebuilt_firmware for vendor apexes" am: 3a92fbeaff
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1415952

Change-Id: Ie9c2305c074302145a648985ebb391286855cbcd
2020-09-02 06:58:51 +00:00
Chih-hung Hsieh 21928dbbdd Merge "Keep only out file dependency rule in output .d files" 2020-09-02 05:39:36 +00:00
Jooyung Han 4c92cad10e Merge commit '0703fd873fe2ed492266a4457a1e217971c2f4f0' into manual_merge_1e3d9fb376aaf1be6de1bd16a9004ccc95226ab0
Change-Id: I7115a50254e23e3f7d9cdab960c671195746978e
2020-09-02 14:19:18 +09:00
Jooyung Han 3a92fbeaff Merge "apex: support prebuilt_firmware for vendor apexes" 2020-09-02 04:17:43 +00:00
Treehugger Robot 6346ec0f46 Merge "Add compile_dex for java_import" am: e263af74db
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1392497

Change-Id: I9fbbd7e1f02a64f5e0ed9b583a61e64fd4306362
2020-09-02 02:02:32 +00:00
Treehugger Robot e263af74db Merge "Add compile_dex for java_import" 2020-09-02 01:23:54 +00:00
Ramy Medhat 8d4dc4aaec Merge "Fallback to /tmp when socket address is longer than max length." am: bca0d4c450
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1415289

Change-Id: I298743c59376d35a74c449bccf449d57cc8cd1bd
2020-09-01 23:02:24 +00:00
Ramy Medhat bca0d4c450 Merge "Fallback to /tmp when socket address is longer than max length." 2020-09-01 22:13:39 +00:00
Xin Li ca52d2ff53 Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master 2020-09-01 20:01:23 +00:00
Steve Kim 33c088e1b1 Merge "Revert "Remove create_stubs and checkapi from droiddoc"" am: b695937f12
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1417209

Change-Id: I6f5ba1c4ad714fa7c078709f4b4c300164ce57f6
2020-09-01 19:44:51 +00:00
Liz Kammer d6c31d274e Add compile_dex for java_import
Test: go java tests
Test: m
Bug: 160455085
Change-Id: I2db95dfe565e78b630007adc3360a58614d0127e
2020-09-01 12:34:08 -07:00
Steve Kim b695937f12 Merge "Revert "Remove create_stubs and checkapi from droiddoc"" 2020-09-01 19:11:47 +00:00
Steve Kim 3666c7023f Revert "Remove create_stubs and checkapi from droiddoc"
This reverts commit 3a55c91f9d.

Reason for revert: build failed. Guess this is the cause but needs to confirm. Creating a revert per instructions

Change-Id: I30f1c8cd63e5ab84dba5d21ed354a42695c24ec4
2020-09-01 17:58:01 +00:00
Liz Kammer 8e97d6caa0 Merge "Remove create_stubs and checkapi from droiddoc" am: 4297552423
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1401388

Change-Id: I12acc0ca9dfdd4fa1d7000cd1ee3dd9ca3559a5d
2020-09-01 16:57:31 +00:00
Ulya Trafimovich 21a7375205 Allow non-SDK Java libraries to masquerade as <uses-library>.
Extend usesLibraryProperties with a boolean is_uses_lib property and
move these properties from java.AndroidApp to java.Module to allow
java.Library modules set the new propery and be recognized as
<uses-library> by Soong.

Bug: 132357300
Test: lunch cf_x86_phone-userdebug && m
Change-Id: I01cd5e0da3dd543c1c0597249d37d0914b213ca7
2020-09-01 17:45:39 +01:00
Liz Kammer 4297552423 Merge "Remove create_stubs and checkapi from droiddoc" 2020-09-01 16:39:48 +00:00
Anton Hansson 944e77d219 Change sdk_library child visibility semantics
If specified, the more specific *_visibility attribute override the
visibility attribute.

This is a temporary solution local to java_sdk_library. Ideally this
should be applied to all modules that create child modules.

Bug: 165017290
Test: m
Change-Id: Ia8c5ae119623a83d8ac583c602320915bb8c7f33
2020-09-01 15:17:41 +01:00
Ramy Medhat d678bba6b6 Merge "Pass cpp linking implicit deps to RBE." am: 3618f0a02e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1414829

Change-Id: I30d07f85594f7ee04ab288dbb799eec8d62c23b0
2020-09-01 11:51:11 +00:00
Ramy Medhat 3618f0a02e Merge "Pass cpp linking implicit deps to RBE." 2020-09-01 11:19:28 +00:00
yangbill 5ec4555d22 AutoGen: Support NativeTest with vendor namespace.
Set the TEST_ROOT to /data/local/tmp/tests/vendor if LOCAL_VENDOR_MODULE or
LOCAL_USE_VNDK be set, if not, set to /data/local/tmp.

Bug: 138450837
Test: atest binderVendorDoubleLoadTest
Change-Id: I04acf12976dd24b9bf880a6775fa4f043a221001
2020-09-01 10:33:12 +08:00
Jooyung Han 0703fd873f apex: support prebuilt_firmware for vendor apexes
prebuilt_firmware module is one of many prebuilt_etc-like modules. When
it is soc-specific, it is installed in /vendor/firmware. Similarly, when
prebuilt_firmware is embeded in a vendor apex, installing it in
<apex>/firmware instead of <apex>/etc.

Bug: 162701747
Test: lunch sunfish-userdebug
      m && device boots && vibrator works
Change-Id: I00d28cde42259aaf8221e3897df77efc42b0c1ca
2020-09-01 10:45:13 +09:00
Treehugger Robot 01f7b2c24c Add rust_protobuf module. am: 588aae727b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1412889

Change-Id: I95a0c23468f781cb94a47942985d84ddf2d764e6
2020-09-01 01:05:10 +00:00
Treehugger Robot 588aae727b Add rust_protobuf module.
This adds a new SourceProvider module type to handle protobuf code
generation. See the new test for an example of how to call this.

Bug: 143953733
Test: New soong tests pass.
Test: Replacing genrules in crosvm with rust_protobuf modules.
Change-Id: Ie3117129cde37b8736bc18ee09bf5cde27c01c34
2020-08-31 14:05:39 -04:00
Liz Kammer 3a55c91f9d Remove create_stubs and checkapi from droiddoc
Test: m docs
Test: go java tests
Bug: 144248501
Bug: 143136634
Change-Id: Ic0da89332f3ed2e5e1bb36d00cb9cbd1f6282b45
2020-08-31 08:16:22 -07:00
Ivan Lozano ddd0bdb372 rust: Fix rust_bindgen implicits
rust_bindgen implicits currently include dependency-exported include
directories. This is incorrect, and causes issues when the include
directory is a generated directory.

Instead, remove the dependency-exported include directories from the
implicits list, and also add dependency-exported headers to the
implicits to handle these correctly.

Bug: 166779501
Test: Rust projects continue to build, test-case no longer failing.
Change-Id: Ia2da25de9e712b7306f19603dc9d14de6bac3fb3
2020-08-31 10:58:35 -04:00
Thiébaud Weksteen 019f272c2b Rename ccConfig to cc_config am: 682c9d7b25
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1414650

Change-Id: Ie95fe427cc9355c18e470c887aca831f46ee8ec3
2020-08-31 14:17:28 +00:00
Thiébaud Weksteen 9656838a64 Merge changes I94fd8bbc,I497dcdff,I1873a180 am: 416149e09b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1411849

Change-Id: Id1d836a546d04ebaa75a2dea325e01e016c8cb00
2020-08-31 08:22:12 +00:00
Thiébaud Weksteen 682c9d7b25 Rename ccConfig to cc_config
Follow up from aosp/1413495 to set a consistent name throughout the
package.

Test: m
Change-Id: Idafcd973e7d874cd97599ac419c2972a8a5cd0b4
2020-08-31 10:06:16 +02:00
Thiébaud Weksteen 416149e09b Merge changes I94fd8bbc,I497dcdff,I1873a180
* changes:
  rust: strip libraries and binaries
  rust: add ccToolchain to Module
  rust: enable use-android-relr-tags
2020-08-31 07:54:32 +00:00
Colin Cross 207037e03e Merge "Remove hack for platform availability of modules with missing apexes" am: 9c35c9ae63
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1414830

Change-Id: Ia9908c38ab39589f914d7361a38871c5c7117008
2020-08-31 04:51:05 +00:00