Commit graph

24950 commits

Author SHA1 Message Date
Paul Duffin
4d38789695 Merge "Propagate vendor_available property through to sdk snapshot" am: 4964a5e000
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1398472

Change-Id: I913a8e3cfd7eebb0a53ecd591b1bf12f69fa00b2
2020-09-07 15:20:07 +00:00
Paul Duffin
4964a5e000 Merge "Propagate vendor_available property through to sdk snapshot" 2020-09-07 14:58:20 +00:00
Ulya Trafimovich
045e11ad0d Be more strict about unknown install <uses-library> paths.
Allow default install paths only for compatibility libraries. For other
libraries that are explicitly specified in `uses_libs` and
`optional_uses_libs` unknown install path should be an error.

Bug: 132357300
Test: lunch cf_x86_phone-userdebug && m
Change-Id: I2209c90a939a8aa46c42e13bb42d09c07e4d0895
2020-09-07 13:58:51 +01:00
Inseob Kim
5f58ff7839 Add vendor snapshot usage test
In addition to capture test, this adds vendor snapshot usage test to
ensure the snapshots of BOARD_VNDK_VERSION are used correctly.

Bug: 167642944
Test: m nothing
Change-Id: I200c95626479a2b2d982edd7488d816e01376734
2020-09-07 19:56:43 +09:00
Ulyana Trafimovich
99bd329274 Merge "Allow non-SDK Java libraries to masquerade as <uses-library>." am: bb3467d297
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1417188

Change-Id: If25aaa0174091e966cc5c6b16063b6486a7b4ab6
2020-09-07 10:23:53 +00:00
Ulyana Trafimovich
bb3467d297 Merge "Allow non-SDK Java libraries to masquerade as <uses-library>." 2020-09-07 09:49:07 +00:00
Mark Chien
288f40ba51 Merge "Include bpf program in APEXes" am: 66a0ae60f8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418308

Change-Id: I86983c1012615e95d1d9aac875a52e92248a17b8
2020-09-04 09:11:22 +00:00
Mark Chien
66a0ae60f8 Merge "Include bpf program in APEXes" 2020-09-04 08:58:21 +00:00
Treehugger Robot
da55e8208f Merge "Iterate <uses-library> in deterministic order in manifest_fixer." am: bfb98ece49
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418533

Change-Id: I42df02457960f99d3257d131524d8005e2c7a97e
2020-09-04 01:17:25 +00:00
Treehugger Robot
bfb98ece49 Merge "Iterate <uses-library> in deterministic order in manifest_fixer." 2020-09-04 00:45:48 +00:00
Treehugger Robot
48e2acaf99 Merge "Add imports_compile_dex to prebuilt_apis" am: cda9a92efb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418868

Change-Id: I29a69d3fd58d9bd7d02ad27fc5b9b9b54b633f63
2020-09-04 00:05:40 +00:00
Treehugger Robot
cda9a92efb Merge "Add imports_compile_dex to prebuilt_apis" 2020-09-03 23:50:17 +00:00
Bill Peckham
f3bf78650a Merge "Add exclude_from_vendor_snapshot property, related logic" am: e1359af34d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1416430

Change-Id: I89da13623f047a1651fb99b6a6ccc575cc75171c
2020-09-03 18:06:37 +00:00
Martin Stjernholm
837ee1a6df Symlink prebuilt binaries on host.
This means binaries will run from their source location and look up
shared libs relative to there.

Test: m nothing
Test: Set up a prebuilt binary with shared libs, check that it can
  be executed during build, and check that its symlinks get updated
  when a shared lib is touched.
Bug: 145934348
Change-Id: I1a600c7163ce0ec34ee8caf0ffe87fef4feb3064
2020-09-03 19:05:18 +01:00
Bill Peckham
e1359af34d Merge "Add exclude_from_vendor_snapshot property, related logic" 2020-09-03 17:52:29 +00:00
Paul Duffin
d1edbd4eed Propagate vendor_available property through to sdk snapshot
Test: m nothing
Change-Id: I68dcba111d290ae8a84c2bc023e1a4e0eaa43408
2020-09-03 18:49:35 +01:00
Paul Duffin
891e77641d Remove unnecessary methods/fields of DefaultsModule/Base am: 3f98d148df
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418390

Change-Id: Ib44fe28b451daa19ef9b7fec83fc549924ba5024
2020-09-03 15:41:27 +00:00
Paul Duffin
f2dc411692 Extract dist properties from commonProperties am: ed87513b0b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418389

Change-Id: I9a59d1a4154409a6a3d1efa590cccd2064b6c389
2020-09-03 15:18:46 +00:00
Ulya Trafimovich
d2c7ddc82a Iterate <uses-library> in deterministic order in manifest_fixer.
Bug: 132357300
Test: lunch cf_x86_phone-userdebug && m
Change-Id: Ideb7e0f7beae8c80561f841b8ce9129003f1aa96
2020-09-03 15:52:01 +01:00
Paul Duffin
3f98d148df Remove unnecessary methods/fields of DefaultsModule/Base
The commonProperties and defaultsVisibilityProperties fields are only
used as containers for default values for properties and only within
the InitDefaultsModule() and so can be removed and replaced with an
empty structure instead.

Test: m checkbuild and TH
Change-Id: Ic5038d6b84b33afdf4859ced08e59871b9cde4a2
2020-09-03 10:12:10 +01:00
Paul Duffin
ed87513b0b Extract dist properties from commonProperties
Common properties are automatically inherited from a parent module
(i.e. one that calls CreateModule()) to the child module that it
creates. This makes no sense for dist/dists properties so this change
extracts them into their own structure separate to the
commonProperties.

Test: m checkbuild and TreeHugger
Bug: 160448975
Change-Id: Icceb20455e13394dd3b3bce464fb9bb34882d6c3
2020-09-03 10:12:10 +01:00
Yi Kong
7daf77bbc6 Merge "Revert "Revert "[pgo] Return updated Flags after adding flags for PGO/AFDO""" am: 4f78c512d4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1418988

Change-Id: I73355f33044be0378e395f06f2d3b52eeed08f59
2020-09-03 07:41:57 +00:00
Yi Kong
4f78c512d4 Merge "Revert "Revert "[pgo] Return updated Flags after adding flags for PGO/AFDO""" 2020-09-03 07:25:24 +00:00
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